From nobody Sun May 24 19:33:19 2026 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2CBF2DCBE3 for ; Sat, 23 May 2026 14:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779546776; cv=none; b=Mvgi4rFEIuElF5MtZBMTMZs8cBMT78Rnu8ATX/qwuVKqpmQJ0dnleMX+AUMFx37kBAyteZfRRnMUsiA14jFcB3NioASMrFp9JZxfYCtBrvD4dUfHfywImAK8je5wOooii7zIw576UYvgCR2LxCgBffk8CHrRjx6fjC2DFI25Pn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779546776; c=relaxed/simple; bh=FJ2NvquqsOVLxpxqr4TmzmMr3EuyXiQiCVyAvDUqTnA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YGrkfbEPUH7f0pCMmCkKHJ1PKigG3iiMDtpx397T6NzZCzZQEqZu1I89wotT6+bGlXTOvu9Kh0OHQQfPV8eBGCdmFdPOrt6bWSz8b9RzcVGeKnfI1CsChyGDSmbbH+bJF8Em4yIZ4qv6pAQm+ULiWqfWXEI/uy6sCvuNG9gLlcs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pZUMtojX; arc=none smtp.client-ip=74.125.82.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pZUMtojX" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2f03d6cf77bso8536019eec.0 for ; Sat, 23 May 2026 07:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779546773; x=1780151573; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bW1xa01RcVBDp9rxJa1g3HLHeABv0J4kQClbtMfYkqc=; b=pZUMtojXu/5YU62R1OVcZKciuDZELJax1LKaYEaj2u1ErUO2onXkrNx5RTDX1LTVrW 3svvZqB3x6ez39jFqgpIwQWlnLcp9GRnZFyxCa4b01aMTCKPM2SZblmwEJuv9sVslowJ TYxnV811LMibaTorgFSNgswjPh82uJU5vRLyZ61JoA3771kshRyKSpXh2PuPtwAzmaxc K0U4rcOH5n20UKckUcLonA5bXpY7HyAhkBs3gb04AMhmp82LRhXrzMl/Aruh0h9WwhCp Mb5eX9cDETl7qwzl4O0MR0/te3EUd6hfi8w4VVqL6w4BWgc7dOTF7qyP+4GjOgeYVNza hWMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779546773; x=1780151573; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bW1xa01RcVBDp9rxJa1g3HLHeABv0J4kQClbtMfYkqc=; b=YGoIN1MPUHmkq4LnAPA9X0SMsDI8Hlj4E2GBW1KZsU/KJn15VVbTmq045qttUGWAFh LxPY1GAHKVt2keat8oRGGwv0jcD+2tqWvBkNNProM9lpcHR1Ce9b55qaEIgJ94G9+Ljg SokD4jDGM+aAy+PdGhFuRNtEFDqQlug/MqOBj6h6+Pdy2CMyLfmPFP0dZ38mIqgpWk+k MU8ZLXBSQpr1xHM8q5imZiyL5bO4zFi3diswOCr2SnUGer8XQdcO4eZ6rPm+gkVjH10l tjv7q3cOpNEeO+V9ZNgHx+z3CesuVtIs8scLnFt4KnD4NGfDxplIam8UAwEvwvTXEuol Hh+w== X-Forwarded-Encrypted: i=1; AFNElJ9orOc5dKDSX/mLZ03f9Oj4xvjuab0VWd2KVx5YW2G00lXe5ltzoj8q718CcpI4ZPxPfVCIG+eCWw6j3pA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6G765eH1+NsYu1JYBFQOIvvFW2M5htECj2sFMYF33bPU+HSiO BbWCxOaY6Fo/mDpsX2TG0MxJ/MEBQPtrNS4ylVxWhjjJGmVeHRMprd5d X-Gm-Gg: Acq92OGEfReiMW8c9EnSYme0nVfpCFPcNEm/Web+NiZItds2HbGABzRuALvIoSMdjjx kJyNd433KStbtiIy+u95Cm3teaNsgjneq7v0qwQPgRKdjHHm9hHgPMdk/n0iwonr4+b4sbX3pJK uS0lf59aMYsjXjCyPSpIPi7k8iheJTQg2KdmR4hCoCT0DFsQ9sPrbrki9Kl3IkWfhHx8YJK8WX1 FcEpj+lkimNQtwn9OsdCFhoJkhSoa1WPPz9Gxuxsl9bajjqx5s94cPoORvlXtQpK5y658gBLXEt PJsfw/2ws62T5Vtnp73KTluKsiEyOKjfHGLTyZJ56AkXZ+3BQ1SUzMll/pCxK6vymvDcZ+Uh3dG G8uZXxy4cBgCddquCL0xxN/3y0tF+9X37ni0iKZGp5NwlkK/voZVb88aoINzDs0hp0l3+us8gyt s87R4nEKiv2XLIRInFeYws3GiFCWE4LYwdaA== X-Received: by 2002:a05:7300:f196:b0:2d9:6f2f:9f6f with SMTP id 5a478bee46e88-304491d13f9mr3468524eec.24.1779546772574; Sat, 23 May 2026 07:32:52 -0700 (PDT) Received: from localhost.localdomain ([148.135.103.3]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-304522314a4sm3415815eec.18.2026.05.23.07.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2026 07:32:52 -0700 (PDT) From: Qi Tang To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, David Ahern , Simon Horman Cc: willemdebruijn.kernel@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Qi Tang , stable@vger.kernel.org Subject: [PATCH net v5] ipv6: validate extension header length before copying to cmsg Date: Sat, 23 May 2026 22:32:45 +0800 Message-ID: <20260523143245.2281415-1-tpluszz77@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ip6_datagram_recv_specific_ctl() builds IPV6_{HOPOPTS,DSTOPTS,RTHDR} cmsgs (and their IPV6_2292* legacy counterparts) by trusting the on-wire hdrlen byte (ptr[1]) when computing the put_cmsg() length. The length was validated only at parse time (ipv6_parse_hopopts(), etc.). An nftables payload-write expression can rewrite hdrlen after parsing and before the skb reaches recvmsg; the write itself is in-bounds but put_cmsg() then reads up to ((hdrlen+1) << 3) =3D 2040 bytes from an 8-byte header. nftables is reachable from an unprivileged user namespace, so this is an unprivileged slab-out-of-bounds read: BUG: KASAN: slab-out-of-bounds in put_cmsg+0x3ac/0x540 put_cmsg+0x3ac/0x540 udpv6_recvmsg+0xca0/0x1250 sock_recvmsg+0xdf/0x190 ____sys_recvmsg+0x1b1/0x620 Add ipv6_get_exthdr_len() which validates that at least two bytes are accessible before reading the hdrlen field, then checks the computed length against skb_tail_pointer(skb), returning 0 on failure. Extension headers are kept in the linear skb area by pskb_may_pull() during input, so skb_tail_pointer() is the correct bound. Use ipv6_get_exthdr_len() at all non-AH call sites: the five standalone cmsg blocks (HbH, 2292HbH, 2292DSTOPTS x2, 2292RTHDR) and the three standard cases in the extension-header walk loop (DSTOPTS, ROUTING, default). AH retains an inline bounds check because its length formula differs ((ptr[1]+2)<<2). The walk loop also gets a pre-read bounds check at the top to validate ptr before any case accesses ptr[0] or ptr[1]. When the walk loop detects a corrupted header, return from the function instead of continuing to process later socket options. Cc: stable@vger.kernel.org Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Qi Tang Reviewed-by: Willem de Bruijn --- Changes v4 -> v5 (Jakub Kicinski): - Switch (ptr + len <=3D tail) to (len <=3D tail - ptr) form in ipv6_get_exthdr_len() to avoid pointer arithmetic concerns. Changes v3 -> v4 (Paolo Abeni / Sashiko): - Validate ptr + 2 <=3D skb_tail_pointer(skb) before reading ptr[1] in ipv6_get_exthdr_len() - Add matching pre-read bounds check at the top of the walk loop Changes v2 -> v3: - Resend as new thread (v2 was incorrectly sent as reply to v1) Changes v1 -> v2 (Paolo Abeni): - Factor repeated bounds-check + put_cmsg into ipv6_get_exthdr_len() - Return from the function on corrupted walk-loop entry instead of goto + empty label v4: https://lore.kernel.org/netdev/20260514035802.1540395-1-tpluszz77@gmail= .com/ v3: https://lore.kernel.org/netdev/20260423103238.3987364-1-tpluszz77@gmail= .com/ v2: https://lore.kernel.org/netdev/20260423102255.3752004-1-tpluszz77@gmail= .com/ v1: https://lore.kernel.org/netdev/20260419150344.624673-1-tpluszz77@gmail.= com/ net/ipv6/datagram.c | 54 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 972bf0426d599..f9ee1bf97f206 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -617,6 +617,18 @@ void ip6_datagram_recv_common_ctl(struct sock *sk, str= uct msghdr *msg, } } =20 +static u16 ipv6_get_exthdr_len(const struct sk_buff *skb, const u8 *ptr) +{ + u16 len; + + if (ptr + 2 > skb_tail_pointer(skb)) + return 0; + + len =3D (ptr[1] + 1) << 3; + + return (len <=3D skb_tail_pointer(skb) - ptr) ? len : 0; +} + void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) { @@ -643,7 +655,10 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, s= truct msghdr *msg, /* HbH is allowed only once */ if (np->rxopt.bits.hopopts && (opt->flags & IP6SKB_HOPBYHOP)) { u8 *ptr =3D nh + sizeof(struct ipv6hdr); - put_cmsg(msg, SOL_IPV6, IPV6_HOPOPTS, (ptr[1]+1)<<3, ptr); + u16 len =3D ipv6_get_exthdr_len(skb, ptr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_HOPOPTS, len, ptr); } =20 if (opt->lastopt && @@ -664,26 +679,37 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, = struct msghdr *msg, unsigned int len; u8 *ptr =3D nh + off; =20 + if (ptr + 2 > skb_tail_pointer(skb)) + return; + switch (nexthdr) { case IPPROTO_DSTOPTS: nexthdr =3D ptr[0]; - len =3D (ptr[1] + 1) << 3; + len =3D ipv6_get_exthdr_len(skb, ptr); + if (!len) + return; if (np->rxopt.bits.dstopts) put_cmsg(msg, SOL_IPV6, IPV6_DSTOPTS, len, ptr); break; case IPPROTO_ROUTING: nexthdr =3D ptr[0]; - len =3D (ptr[1] + 1) << 3; + len =3D ipv6_get_exthdr_len(skb, ptr); + if (!len) + return; if (np->rxopt.bits.srcrt) put_cmsg(msg, SOL_IPV6, IPV6_RTHDR, len, ptr); break; case IPPROTO_AH: nexthdr =3D ptr[0]; len =3D (ptr[1] + 2) << 2; + if (ptr + len > skb_tail_pointer(skb)) + return; break; default: nexthdr =3D ptr[0]; - len =3D (ptr[1] + 1) << 3; + len =3D ipv6_get_exthdr_len(skb, ptr); + if (!len) + return; break; } =20 @@ -705,19 +731,31 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, = struct msghdr *msg, } if (np->rxopt.bits.ohopopts && (opt->flags & IP6SKB_HOPBYHOP)) { u8 *ptr =3D nh + sizeof(struct ipv6hdr); - put_cmsg(msg, SOL_IPV6, IPV6_2292HOPOPTS, (ptr[1]+1)<<3, ptr); + u16 len =3D ipv6_get_exthdr_len(skb, ptr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_2292HOPOPTS, len, ptr); } if (np->rxopt.bits.odstopts && opt->dst0) { u8 *ptr =3D nh + opt->dst0; - put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, (ptr[1]+1)<<3, ptr); + u16 len =3D ipv6_get_exthdr_len(skb, ptr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, len, ptr); } if (np->rxopt.bits.osrcrt && opt->srcrt) { struct ipv6_rt_hdr *rthdr =3D (struct ipv6_rt_hdr *)(nh + opt->srcrt); - put_cmsg(msg, SOL_IPV6, IPV6_2292RTHDR, (rthdr->hdrlen+1) << 3, rthdr); + u16 len =3D ipv6_get_exthdr_len(skb, (u8 *)rthdr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_2292RTHDR, len, rthdr); } if (np->rxopt.bits.odstopts && opt->dst1) { u8 *ptr =3D nh + opt->dst1; - put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, (ptr[1]+1)<<3, ptr); + u16 len =3D ipv6_get_exthdr_len(skb, ptr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, len, ptr); } if (np->rxopt.bits.rxorigdstaddr) { struct sockaddr_in6 sin6; --=20 2.47.3