diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
commit | ffc4aa8f521606f63f59ff708f49780172909e94 (patch) | |
tree | 274944bdc4c317e54faa95636c9f1771d8d51b43 /net/tipc/socket.c | |
parent | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff) | |
parent | 9ca1d50fa959cda1f04f43275f7930a70f1a631e (diff) |
Merge tag 'v4.4.14' into linux-linaro-lsk-v4.4lsk-v4.4-16.06
This is the 4.4.14 stable release
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index e53003cf7703..9b713e0ce00d 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2814,6 +2814,9 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb) if (err) return err; + if (!attrs[TIPC_NLA_SOCK]) + return -EINVAL; + err = nla_parse_nested(sock, TIPC_NLA_SOCK_MAX, attrs[TIPC_NLA_SOCK], tipc_nl_sock_policy); |