From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 22AFA37BE71 for ; Thu, 23 Apr 2026 10:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776940372; cv=none; b=NvZUN2ShExf6XhRCFmr+iX2YkY08BOoExFczS8myc32oJxcTSZIndw7nseKZZp5Bg0B+N/jccUWgL70+Jz7wduocGh5AZrviwg6RI4QAUkXhZ+MwRFTsCdrCmWFCUo/49o2zhXDIq5zuZXe9rjSPNzzGEqJBoa2FHhB1/8/F5y8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776940372; c=relaxed/simple; bh=8UbIf2uSVqc7izxQmCopqDfeYI4eb4iDEozOw0bmOMY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Rq1vTwGj06FIpEyYgQeSI/k/Bg4l8GME5+rP+pmqGcWy1xTfztObGnnor9K+WObRq32NKyhZdpKeKLbEffUH5ClivluXjM+/3CKSTlQLQUsZga7zmj/eMPRif/Hod4mdAlr1cxjMe3Y66KHqr1ZucAeVVUN6mQ7k3zFvhZYWwYM= 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=eNCP7jh/; arc=none smtp.client-ip=209.85.214.181 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="eNCP7jh/" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2b4650d5f5cso24234795ad.0 for ; Thu, 23 Apr 2026 03:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776940369; x=1777545169; 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=NIBU6hPj55m3UPQo8Z53Iik1F/p/LDB+WPBA/j4Ee7g=; b=eNCP7jh/9GxuMmiGqfDnCAKB0wdPm9YQ30kIDmU5RWKGa7l6RsNnbcXytwrpkz1uUJ R4nm2oEgyzWdHSVi2Ga7jJB/Pxt7ErnchDvGQlkNdHZ1qf+nRXsV27OK2Jomdy8NlyHx u48HBBvPO/EF0S67NbomSjtYrzYInZBHnskwIdNhNe7Af7ENxBncmiwMRQa0cLnp8Bcu CE2+n27U/nL5MKYmY6FsVYCPFwyqJ3sEficqLDDQHmkmWLSa3kRTSvfB+bu67V813IRJ UpoiP4hCkM/2uNXLlUYj/ywi2EzJ4MWvzSL4F899I0IPDKFe7dO+a1293GJN005akzfz xFWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776940369; x=1777545169; 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=NIBU6hPj55m3UPQo8Z53Iik1F/p/LDB+WPBA/j4Ee7g=; b=R3nY4dfcNltYuFYZgwUMKw+1x8AqCBcAStXsdZJYd26/s7A4G4klkj58oW96zd/b9+ HCmc+X7NvQ0BqEa7+OhsG1CjzxyaRQzSyxogzcTXh8ittOy77VBhvQWYEDVNWRWMyB85 p/wNhXCtvNkbPFPNaRDu0oL+jC6fLMLb8b+3MnAybWxLc3UYSAfrfMpxqd9V6tqHHgu3 FXlweWqRMjPkcGuQ8OX3wcDib3bRjpmHyjHzyp8QoLnV5NAdKUiJTzPAL5OrOmtOaj8a ZHPIX6HOHb4p8GaPFOQlbGSqUYrGDRmeJ8cV2aVH7cf+y2a0MEN0FVYUsdR7PdVYAUYj AKlg== X-Gm-Message-State: AOJu0Yxh8FhDdkOcD2c70rgAkeCr44+GQzX942zFkB8iqsqZ0tOOupt5 HIGsMfDY3Ws3XOR4Gb8v629GYun8ev/TqcQyMjJFku6n+il7rPZz5Bww X-Gm-Gg: AeBDiesvTo5gmSOrNM8gQ+4DH75mqTqLQxe/ymzBJ+NPHdxlPbmZqoDKubZTA9F33dM Rvylahz0ZjDFItZ3hOZm6DCk/I6iRArj/HF+EHfsoP6vM1FUI9p8xPCowH0U2ru+RsNzI+JsTpB NySGrdTnv+vy9PKO6b9WxDS0YW/SEeAU8tE2Uwet5zKJ+h8t+M0+I/w/sd4VtkthOjN4ZEP+PdI LxXiBxkwgOYJtSmO2/hYpXpUaWHIMrMFUF9UugnDrIcwGcCikML5cDYuurAM1HLUF5S02ITewTb ozmT9iUqJyAMXROsGM9UNomsB8BkMQkOd+HwLKMN4p3dZNfgJBgPbOHMC0yNeNayvwUDzgynkoj 7+Sv8G1jLsJPh/9f+0l8QwQ1Qj6DRlUC/sUCgY04//9fhP6flgu5rlNo+kHhWUaRN+v2to3Iu4e hw70BFFxm+FOf2xkQHluDBhFRcM8YRWltOnN7slcokvcqDtgHiGVP2 X-Received: by 2002:a17:903:1b6f:b0:2b2:4d08:9e02 with SMTP id d9443c01a7336-2b5f9f3c677mr266049425ad.21.1776940369276; Thu, 23 Apr 2026 03:32:49 -0700 (PDT) Received: from teatimelab.tailcd024.ts.net ([148.135.103.3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab0cdbbsm189358425ad.48.2026.04.23.03.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 03:32:48 -0700 (PDT) From: Qi Tang To: "David S . Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Qi Tang Subject: [PATCH net v3] ipv6: validate extension header length before copying to cmsg Date: Thu, 23 Apr 2026 18:32:38 +0800 Message-ID: <20260423103238.3987364-1-tpluszz77@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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) = 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 computes the extension header length and validates it 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). When the walk loop detects a corrupted header, return from the function instead of continuing to process later socket options. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Qi Tang --- 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 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 | 46 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 972bf0426d59..0a7b74d5f402 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -617,6 +617,13 @@ void ip6_datagram_recv_common_ctl(struct sock *sk, struct msghdr *msg, } } +static u16 ipv6_get_exthdr_len(const struct sk_buff *skb, const u8 *ptr) +{ + u16 len = (ptr[1] + 1) << 3; + + return (ptr + len <= skb_tail_pointer(skb)) ? len : 0; +} + void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) { @@ -643,7 +650,10 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, /* HbH is allowed only once */ if (np->rxopt.bits.hopopts && (opt->flags & IP6SKB_HOPBYHOP)) { u8 *ptr = nh + sizeof(struct ipv6hdr); - put_cmsg(msg, SOL_IPV6, IPV6_HOPOPTS, (ptr[1]+1)<<3, ptr); + u16 len = ipv6_get_exthdr_len(skb, ptr); + + if (len) + put_cmsg(msg, SOL_IPV6, IPV6_HOPOPTS, len, ptr); } if (opt->lastopt && @@ -667,23 +677,31 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, switch (nexthdr) { case IPPROTO_DSTOPTS: nexthdr = ptr[0]; - len = (ptr[1] + 1) << 3; + len = 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 = ptr[0]; - len = (ptr[1] + 1) << 3; + len = 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 = ptr[0]; len = (ptr[1] + 2) << 2; + if (ptr + len > skb_tail_pointer(skb)) + return; break; default: nexthdr = ptr[0]; - len = (ptr[1] + 1) << 3; + len = ipv6_get_exthdr_len(skb, ptr); + if (!len) + return; break; } @@ -705,19 +723,31 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, } if (np->rxopt.bits.ohopopts && (opt->flags & IP6SKB_HOPBYHOP)) { u8 *ptr = nh + sizeof(struct ipv6hdr); - put_cmsg(msg, SOL_IPV6, IPV6_2292HOPOPTS, (ptr[1]+1)<<3, ptr); + u16 len = 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 = nh + opt->dst0; - put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, (ptr[1]+1)<<3, ptr); + u16 len = 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 = (struct ipv6_rt_hdr *)(nh + opt->srcrt); - put_cmsg(msg, SOL_IPV6, IPV6_2292RTHDR, (rthdr->hdrlen+1) << 3, rthdr); + u16 len = 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 = nh + opt->dst1; - put_cmsg(msg, SOL_IPV6, IPV6_2292DSTOPTS, (ptr[1]+1)<<3, ptr); + u16 len = 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; -- 2.47.3