From: Dongliang Mu <mudongliangabcd@gmail.com>
To: Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Dongliang Mu <mudongliangabcd@gmail.com>,
syzbot+b9cfd1cc5d57ee0a09ab@syzkaller.appspotmail.com,
stable@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] net: xfrm: fix bug in ipcomp_free_scratches
Date: Mon, 16 Aug 2021 15:38:29 +0800 [thread overview]
Message-ID: <20210816073832.199701-1-mudongliangabcd@gmail.com> (raw)
In ipcomp_alloc_scratches, if the vmalloc fails, there leaves a NULL
pointer. However, ipcomp_free_scratches does not check the per_pcu_ptr
pointer when invoking vfree.
Fix this by adding a sanity check before vfree.
Call Trace:
ipcomp_free_scratches+0xbc/0x160 net/xfrm/xfrm_ipcomp.c:203
ipcomp_free_data net/xfrm/xfrm_ipcomp.c:312 [inline]
ipcomp_init_state+0x77c/0xa40 net/xfrm/xfrm_ipcomp.c:364
ipcomp6_init_state+0xc2/0x700 net/ipv6/ipcomp6.c:154
__xfrm_init_state+0x995/0x15c0 net/xfrm/xfrm_state.c:2648
xfrm_init_state+0x1a/0x70 net/xfrm/xfrm_state.c:2675
pfkey_msg2xfrm_state net/key/af_key.c:1287 [inline]
pfkey_add+0x1a64/0x2cd0 net/key/af_key.c:1504
pfkey_process+0x685/0x7e0 net/key/af_key.c:2837
pfkey_sendmsg+0x43a/0x820 net/key/af_key.c:3676
sock_sendmsg_nosec net/socket.c:703 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:723
Reported-by: syzbot+b9cfd1cc5d57ee0a09ab@syzkaller.appspotmail.com
Cc: stable@vger.kernel.org
Fixes: 6fccab671f2f ("ipsec: ipcomp - Merge IPComp impl")
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
net/xfrm/xfrm_ipcomp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index cb40ff0ff28d..9588ac05ab27 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -199,8 +199,11 @@ static void ipcomp_free_scratches(void)
if (!scratches)
return;
- for_each_possible_cpu(i)
- vfree(*per_cpu_ptr(scratches, i));
+ for_each_possible_cpu(i) {
+ void *scratch = *per_cpu_ptr(scratches, i);
+ if (!scratch)
+ vfree(scratch);
+ }
free_percpu(scratches);
}
--
2.25.1
next reply other threads:[~2021-08-16 7:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 7:38 Dongliang Mu [this message]
2021-08-16 7:53 ` [PATCH] net: xfrm: fix bug in ipcomp_free_scratches Herbert Xu
2021-08-16 9:35 ` Dongliang Mu
2021-08-16 11:36 ` Dongliang Mu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210816073832.199701-1-mudongliangabcd@gmail.com \
--to=mudongliangabcd@gmail.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=syzbot+b9cfd1cc5d57ee0a09ab@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox