2024-03-13 13:24:12

by Mikhail Lobanov

Subject: [PATCH] x_25: Adding a null pointer dereference check to the x25_accept() function

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 <[email protected]>
---
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

2024-03-13 14:23:53

by Eric Dumazet

Subject: Re: [PATCH] x_25: Adding a null pointer dereference check to the x25_accept() function

On Wed, Mar 13, 2024 at 2:23 PM Mikhail Lobanov <[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> 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);

skb can not be NULL at this point, we hold the socket lock.

Otherwise the bug would be in x25_wait_for_data()

> rc = -EINVAL;
> - if (!skb->sk)
> + if (!skb || !skb->sk)
> goto out2;
> newsk = skb->sk;
> sock_graft(newsk, newsock);
> --
> 2.43.0
>