lkml.org 
[lkml]   [2020]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] net/x25: Fix null-ptr-deref in x25_connect
From
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.

\
 
 \ /
  Last update: 2020-09-29 03:44    [W:0.044 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site