summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorSowmini Varadhan <sowmini.varadhan@oracle.com>2017-07-06 08:15:07 -0700
committerDavid S. Miller <davem@davemloft.net>2017-07-08 11:16:16 +0100
commit0ffdaf5b41cf4435ece14d1d3e977ce69012a20d (patch)
tree606445d216e1fb481b1d6e8d5f1fb264d41fa4f9 /include/net
parent0933a578cd55b02dc80f219dc8f2efb17ec61c9a (diff)
downloadlinux-stable-0ffdaf5b41cf4435ece14d1d3e977ce69012a20d.tar.gz
linux-stable-0ffdaf5b41cf4435ece14d1d3e977ce69012a20d.tar.bz2
linux-stable-0ffdaf5b41cf4435ece14d1d3e977ce69012a20d.zip
net/sock: add WARN_ON(parent->sk) in sock_graft()
sock_graft() unilaterally sets up parent->sk based on the assumption that the existing parent->sk is null. If this condition is not true, then the existing parent->sk would be leaked, so add a WARN_ON() to alert callers who may fall in this category. Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 48e4d5c38f85..8c85791fc196 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1697,6 +1697,7 @@ static inline void sock_orphan(struct sock *sk)
static inline void sock_graft(struct sock *sk, struct socket *parent)
{
+ WARN_ON(parent->sk);
write_lock_bh(&sk->sk_callback_lock);
sk->sk_wq = parent->wq;
parent->sk = sk;