openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: Fix one possible memleak in ip_setup_cork 

It would allocate memory in this function when the cork->opt is NULL. But
the memory isn't freed if failed in the latter rt check, and return error
directly. It causes the memleak if its caller is ip_make_skb which also
doesn't free the cork->opt when meet a error.

Now move the rt check ahead to avoid the memleak.

Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gao Feng 2018-04-16 10:16:45 +08:00 committed by David S. Miller
parent 5171b37d95
commit 9783ccd0f2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/ip_output.c
View File

@ -1109,6 +1109,10 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,
struct ip_options_rcu *opt; struct ip_options_rcu *opt;
struct rtable *rt; struct rtable *rt;
rt = *rtp;
if (unlikely(!rt))
return -EFAULT;
/* /*
* setup for corking. * setup for corking.
*/ */
@ -1124,9 +1128,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,
cork->flags |= IPCORK_OPT; cork->flags |= IPCORK_OPT;
cork->addr = ipc->addr; cork->addr = ipc->addr;
} }
rt = *rtp;
if (unlikely(!rt))
return -EFAULT;
/* /*
* We steal reference to this route, caller should not release it * We steal reference to this route, caller should not release it
*/ */