diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2019-06-27 14:30:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:27:18 +0200 |
commit | f6a961daa874a2ab7f48296028bc9b76de78e71f (patch) | |
tree | 760a8a0403812af185140853b425f68d2a499f2b /net | |
parent | bd32c5b377a642e40660d609014f1b1bfe8e1e8b (diff) | |
download | linux-stable-f6a961daa874a2ab7f48296028bc9b76de78e71f.tar.gz linux-stable-f6a961daa874a2ab7f48296028bc9b76de78e71f.tar.bz2 linux-stable-f6a961daa874a2ab7f48296028bc9b76de78e71f.zip |
netrom: fix a memory leak in nr_rx_frame()
[ Upstream commit c8c8218ec5af5d2598381883acbefbf604e56b5e ]
When the skb is associated with a new sock, just assigning
it to skb->sk is not sufficient, we have to set its destructor
to free the sock properly too.
Reported-by: syzbot+d6636a36d3c34bd88938@syzkaller.appspotmail.com
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/netrom/af_netrom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 86b87925ef34..96740d389377 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -869,7 +869,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) unsigned short frametype, flags, window, timeout; int ret; - skb->sk = NULL; /* Initially we don't know who it's for */ + skb_orphan(skb); /* * skb->data points to the netrom frame start @@ -968,6 +968,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) window = skb->data[20]; skb->sk = make; + skb->destructor = sock_efree; make->sk_state = TCP_ESTABLISHED; /* Fill in his circuit details */ |