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:28:34 +0200 |
| commit | 897bcee6a1292b2a5d4e731ec5f12c6b97309465 (patch) | |
| tree | 551734f9c59774070001078dd4c91e816255e4b5 | |
| parent | 961a727f2c1056195f8293db728d0ea9cf7c961d (diff) | |
| download | linux-stable-897bcee6a1292b2a5d4e731ec5f12c6b97309465.tar.gz linux-stable-897bcee6a1292b2a5d4e731ec5f12c6b97309465.tar.bz2 linux-stable-897bcee6a1292b2a5d4e731ec5f12c6b97309465.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>
| -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 71ffd1a6dc7c..f11b6747e18c 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -872,7 +872,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 @@ -971,6 +971,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 */ |