summaryrefslogtreecommitdiffstats
path: root/net/netrom
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2019-06-27 14:30:58 -0700
committerDavid S. Miller <davem@davemloft.net>2019-07-01 19:00:52 -0700
commitc8c8218ec5af5d2598381883acbefbf604e56b5e (patch)
tree95b451690c50a0b20610a957cec9d64551a38c3a /net/netrom
parent2e60546368165c2449564d71f6005dda9205b5fb (diff)
downloadlinux-c8c8218ec5af5d2598381883acbefbf604e56b5e.tar.gz
linux-c8c8218ec5af5d2598381883acbefbf604e56b5e.tar.bz2
linux-c8c8218ec5af5d2598381883acbefbf604e56b5e.zip
netrom: fix a memory leak in nr_rx_frame()
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>
Diffstat (limited to 'net/netrom')
-rw-r--r--net/netrom/af_netrom.c3
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 */