Commit 897bcee6 authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman

netrom: fix a memory leak in nr_rx_frame()

[ Upstream commit c8c8218e ]

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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 961a727f
...@@ -872,7 +872,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) ...@@ -872,7 +872,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
unsigned short frametype, flags, window, timeout; unsigned short frametype, flags, window, timeout;
int ret; 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 * skb->data points to the netrom frame start
...@@ -971,6 +971,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) ...@@ -971,6 +971,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
window = skb->data[20]; window = skb->data[20];
skb->sk = make; skb->sk = make;
skb->destructor = sock_efree;
make->sk_state = TCP_ESTABLISHED; make->sk_state = TCP_ESTABLISHED;
/* Fill in his circuit details */ /* Fill in his circuit details */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment