From: Martin Schiller <ms@dev.tdt.de>
To: David Miller <davem@davemloft.net>
Cc: andrew.hendry@gmail.com, kuba@kernel.org, edumazet@google.com,
xiyuyang19@fudan.edu.cn, linux-x25@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net/x25: Fix null-ptr-deref in x25_connect
Date: Tue, 29 Sep 2020 06:52:12 +0200 [thread overview]
Message-ID: <162dd41ee6717ad46e0a37003d922ea1@dev.tdt.de> (raw)
In-Reply-To: <20200928.184326.1754311969939569006.davem@davemloft.net>
On 2020-09-29 03:43, David Miller wrote:
> From: Martin Schiller <ms@dev.tdt.de>
> Date: Mon, 28 Sep 2020 11:23:27 +0200
>
>> diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
>> index 0bbb283f23c9..0524a5530b91 100644
>> --- a/net/x25/af_x25.c
>> +++ b/net/x25/af_x25.c
>> @@ -820,7 +820,7 @@ static int x25_connect(struct socket *sock, struct
>> sockaddr *uaddr,
>>
>> rc = x25_wait_for_connection_establishment(sk);
>> if (rc)
>> - goto out_put_neigh;
>> + goto out;
>
> If x25_wait_for_connection_establishment() returns because of an
> interrupting
> signal, we are not going to call x25_disconnect().
>
> The case you are fixing only applies _sometimes_ when
> x25_wait_for_connection_establishment() returns. But not always.
>
> That neighbour has to be released at this spot otherwise.
OK, thanks for the hint. So I think the simplest solution would be to
check
that x25->neighbour is != NULL like this:
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 0bbb283f23c9..046d3fee66a9 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -825,7 +825,7 @@ static int x25_connect(struct socket *sock, struct
sockaddr *uaddr,
sock->state = SS_CONNECTED;
rc = 0;
out_put_neigh:
- if (rc) {
+ if (rc && x25->neighbour) {
read_lock_bh(&x25_list_lock);
x25_neigh_put(x25->neighbour);
x25->neighbour = NULL;
--
What do you think?
If that would be OK, I'll send a v2 of the Patch.
- Martin
prev parent reply other threads:[~2020-09-29 4:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 9:23 [PATCH] net/x25: Fix null-ptr-deref in x25_connect Martin Schiller
2020-09-29 1:43 ` David Miller
2020-09-29 4:52 ` Martin Schiller [this message]
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=162dd41ee6717ad46e0a37003d922ea1@dev.tdt.de \
--to=ms@dev.tdt.de \
--cc=andrew.hendry@gmail.com \
--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=netdev@vger.kernel.org \
--cc=xiyuyang19@fudan.edu.cn \
/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).