aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-06-27 12:18:04 +0800
committerAlex Shi <alex.shi@linaro.org>2016-06-27 12:18:04 +0800
commitfb8ebda5d99fe5f3aa39fd80828a0950d4c6fc47 (patch)
tree3ef7627bb093145c34b91daa1956557d7a985aac /net/tipc/socket.c
parent9b0440e3b29f5f5340c247ac9699c53f585fa680 (diff)
parentffc4aa8f521606f63f59ff708f49780172909e94 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-16.06-android
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c3
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);