From: Mikhail Lobanov <m.lobanov@rosalinux.ru>
To: Martin Schiller <ms@dev.tdt.de>
Cc: Mikhail Lobanov <m.lobanov@rosalinux.ru>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] x_25: Adding a null pointer dereference check to the x25_accept() function
Date: Wed, 13 Mar 2024 09:22:08 -0400 [thread overview]
Message-ID: <20240313132214.48716-1-m.lobanov@rosalinux.ru> (raw)
To avoid the problem of dereferencing the null pointer in the x25_accept()
function, you need to add an additional check that the pointer skb is
not equal to NULL.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Mikhail Lobanov <m.lobanov@rosalinux.ru>
---
net/x25/af_x25.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index f7a7c7798c3b..91bc5994cef6 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -896,7 +896,7 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags,
goto out2;
skb = skb_dequeue(&sk->sk_receive_queue);
rc = -EINVAL;
- if (!skb->sk)
+ if (!skb || !skb->sk)
goto out2;
newsk = skb->sk;
sock_graft(newsk, newsock);
--
2.43.0
next reply other threads:[~2024-03-13 13:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 13:22 Mikhail Lobanov [this message]
2024-03-13 14:13 ` [PATCH] x_25: Adding a null pointer dereference check to the x25_accept() function Eric Dumazet
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=20240313132214.48716-1-m.lobanov@rosalinux.ru \
--to=m.lobanov@rosalinux.ru \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-x25@vger.kernel.org \
--cc=ms@dev.tdt.de \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).