diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2018-04-07 03:54:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-08 18:34:29 +0200 |
| commit | e41f0548473eb7b6499bd8482474e30ae6d31220 (patch) | |
| tree | 4704a448a00e5ab58d5b5972a6a47629ea8df610 /net/tipc/diag.c | |
| parent | sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6 (diff) | |
| download | linux-e41f0548473eb7b6499bd8482474e30ae6d31220.tar.xz linux-e41f0548473eb7b6499bd8482474e30ae6d31220.zip | |
tipc: use the right skb in tipc_sk_fill_sock_diag()
Commit 4b2e6877b879 ("tipc: Fix namespace violation in tipc_sk_fill_sock_diag")
tried to fix the crash but failed, the crash is still 100% reproducible
with it.
In tipc_sk_fill_sock_diag(), skb is the diag dump we are filling, it is not
correct to retrieve its NETLINK_CB(), instead, like other protocol diag,
we should use NETLINK_CB(cb->skb).sk here.
Reported-by: <syzbot+326e587eff1074657718@syzkaller.appspotmail.com>
Fixes: 4b2e6877b879 ("tipc: Fix namespace violation in tipc_sk_fill_sock_diag")
Fixes: c30b70deb5f4 (tipc: implement socket diagnostics for AF_TIPC)
Cc: GhantaKrishnamurthy MohanKrishna <mohan.krishna.ghanta.krishnamurthy@ericsson.com>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/diag.c')
| -rw-r--r-- | net/tipc/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/diag.c b/net/tipc/diag.c index 46d9cd62f781..aaabb0b776dd 100644 --- a/net/tipc/diag.c +++ b/net/tipc/diag.c @@ -59,7 +59,7 @@ static int __tipc_add_sock_diag(struct sk_buff *skb, if (!nlh) return -EMSGSIZE; - err = tipc_sk_fill_sock_diag(skb, tsk, req->tidiag_states, + err = tipc_sk_fill_sock_diag(skb, cb, tsk, req->tidiag_states, __tipc_diag_gen_cookie); if (err) return err; |