diff options
| author | Richard Alpe <richard.alpe@ericsson.com> | 2016-05-16 11:14:54 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 23:07:28 -0400 |
| commit | 49956430d3d55b47e4a2d2f5f777d641cae137d6 (patch) | |
| tree | f998e27ce33721061432c01d152e1f73d222954e | |
| parent | 186e7c38727f7a9fecbf238bbff9675e83842a99 (diff) | |
| download | linux-stable-49956430d3d55b47e4a2d2f5f777d641cae137d6.tar.gz linux-stable-49956430d3d55b47e4a2d2f5f777d641cae137d6.tar.bz2 linux-stable-49956430d3d55b47e4a2d2f5f777d641cae137d6.zip | |
tipc: check nl sock before parsing nested attributes
[ Upstream commit 45e093ae2830cd1264677d47ff9a95a71f5d9f9c ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 20cc6df07157..d41d424b9913 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2804,6 +2804,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); |