summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRichard Alpe <richard.alpe@ericsson.com>2016-05-16 11:14:54 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-16 21:58:54 -0400
commit45e093ae2830cd1264677d47ff9a95a71f5d9f9c (patch)
tree72b47612fec35cff7626247e1e28c99715b31cbd /net
parent77f57761466e9aef2b57acf8ce07df11bf360e34 (diff)
downloadlinux-45e093ae2830cd1264677d47ff9a95a71f5d9f9c.tar.gz
linux-45e093ae2830cd1264677d47ff9a95a71f5d9f9c.tar.bz2
linux-45e093ae2830cd1264677d47ff9a95a71f5d9f9c.zip
tipc: check nl sock before parsing nested attributes
Make sure the socket for which the user is listing publication exists before parsing the socket netlink attributes. Prior to this patch a call without any socket caused a NULL pointer dereference in tipc_nl_publ_dump(). Tested-and-reported-by: Baozeng Ding <sploving1@gmail.com> Signed-off-by: Richard Alpe <richard.alpe@ericsson.com> Acked-by: Jon Maloy <jon.maloy@ericsson.cm> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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 12628890c219..3b7a79991d55 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2853,6 +2853,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);