[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250602213310.2519903-1-kuni1840@gmail.com>
Date: Mon, 2 Jun 2025 14:32:35 -0700
From: Kuniyuki Iwashima <kuni1840@...il.com>
To: rafalbilkowski@...il.com
Cc: alex.aring@...il.com,
davem@...emloft.net,
dsahern@...nel.org,
edumazet@...gle.com,
kuba@...nel.org,
linux-kernel@...r.kernel.org,
netdev@...r.kernel.org,
pabeni@...hat.com
Subject: Re: [PATCH] ipv6: ndisc: fix potential out-of-bounds read in ndisc_router_discovery()
From: Rafal Bilkowski <rafalbilkowski@...il.com>
Date: Mon, 2 Jun 2025 08:58:26 +0200
> This patch adds a length check at the start of ndisc_router_discovery()
I think it already has the check.
---8<---
optlen = (skb_tail_pointer(skb) - skb_transport_header(skb)) -
sizeof(struct ra_msg);
...
if (optlen < 0)
return SKB_DROP_REASON_PKT_TOO_SMALL;
---8<---
> to prevent a potential out-of-bounds read if a short packet is received.
> Without this check, the function may dereference memory outside the
> buffer.
Do you have a KMSAM splat ?
>
> Fixes: 8610c7c6e3bd ("net: ipv6: add support for rpl sr exthdr")
> Signed-off-by: Rafal Bilkowski <rafalbilkowski@...il.com>
> ---
> net/ipv6/ndisc.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index 8d853971f2f6..bdaac5a195d6 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -1235,6 +1235,10 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
>
> static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
> {
> + // Check if the buffer contains enough data for the struct ra_msg
> + if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(struct ra_msg)))
> + return SKB_DROP_REASON_PKT_TOO_SMALL;
Please run checkpatch.pl. We don't add code before variable declarations.
Also, the skb is linearized in ndisc_rcv().
> +
> struct ra_msg *ra_msg = (struct ra_msg *)skb_transport_header(skb);
> bool send_ifinfo_notify = false;
> struct neighbour *neigh = NULL;
> --
> 2.43.0
Powered by blists - more mailing lists