From: Jia-Ju Bai <baijiaju1990@gmail.com>
To: steffen.klassert@secunet.com, herbert@gondor.apana.org.au,
davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Jia-Ju Bai <baijiaju1990@gmail.com>
Subject: [PATCH] net: key: af_key: Fix possible null-pointer dereferences in pfkey_send_policy_notify()
Date: Wed, 24 Jul 2019 17:35:09 +0800 [thread overview]
Message-ID: <20190724093509.1676-1-baijiaju1990@gmail.com> (raw)
In pfkey_send_policy_notify(), there is an if statement on line 3081 to
check whether xp is NULL:
if (xp && xp->type != XFRM_POLICY_TYPE_MAIN)
When xp is NULL, it is used by key_notify_policy() on line 3090:
key_notify_policy(xp, ...)
pfkey_xfrm_policy2msg_prep(xp) -- line 2211
pfkey_xfrm_policy2msg_size(xp) -- line 2046
for (i=0; i<xp->xfrm_nr; i++) -- line 2026
t = xp->xfrm_vec + i; -- line 2027
key_notify_policy(xp, ...)
xp_net(xp) -- line 2231
return read_pnet(&xp->xp_net); -- line 534
Thus, possible null-pointer dereferences may occur.
To fix these bugs, xp is checked before calling key_notify_policy().
These bugs are found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
net/key/af_key.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/key/af_key.c b/net/key/af_key.c
index b67ed3a8486c..ced54144d5fd 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3087,6 +3087,8 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
case XFRM_MSG_DELPOLICY:
case XFRM_MSG_NEWPOLICY:
case XFRM_MSG_UPDPOLICY:
+ if (!xp)
+ break;
return key_notify_policy(xp, dir, c);
case XFRM_MSG_FLUSHPOLICY:
if (c->data.type != XFRM_POLICY_TYPE_MAIN)
--
2.17.0
next reply other threads:[~2019-07-24 9:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 9:35 Jia-Ju Bai [this message]
2019-07-26 9:45 ` Steffen Klassert
2019-07-26 20:15 ` Jeremy Sowden
2019-07-27 8:32 ` Steffen Klassert
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=20190724093509.1676-1-baijiaju1990@gmail.com \
--to=baijiaju1990@gmail.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.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
all inboxes | Powered by JetHome®