From nobody Fri Oct 2 08:25:15 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012045.outbound.protection.outlook.com [52.101.53.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A569F3FCB2C; Mon, 3 Aug 2026 11:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756346; cv=fail; b=apenUrd2f/BKhyJer6Tt9qIa7CfWHfifrTS7jeMqMyWzKzbZhY4di3lhMvX1WeP9M26Ym2241qdecZpAgX3G0pm2XLsuLWilfkpENB5Gqoj4URPnR9BimQZYHLF7IuLC8OeP4hS2/akJ+XKF4+ppaw6PMOhJBD904b8qfLKPQeo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756346; c=relaxed/simple; bh=S/C0jxqid/DI6K8aM3dzz7cRcHNweovqUdx0IFhDFeQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TQCHXmPZVnnktjgJNBF+zzY6u6Qs8KthfbKZ6bqU9SOWEVltlECpFNi0fj/j+NJO6087q180x4O7YMRv+UKaCDR64hguRfg1MLJ5vmR3PCwbRJqfEO0k166zFMBA0CMFCLib7SWw0dD3I6+ahU4ZmOxaQjNy8VdUOyC7avbI4V0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=WDUZjqQy; arc=fail smtp.client-ip=52.101.53.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="WDUZjqQy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PyodJAIjn+EN/ZE50m9URR138fktib/u53vXyM1VWUy1h0YX34LdyAJwLMxsfvky9OGFmFRf04TXxDuu1c5kmZ56ovmbMZ8qVss4E5cbGaSrtWS8i1c8De5j+HgB4I/Ny+7pUehdZlb15hEl5el/8fWrqR/NWqchsyX7Lu3d4+w6XcwEI+23EbcFXuzUP4aiQFtYgfFtwWVcGcVnI3HpzXnOEaxw818t5JFJyeL90hDEBkIbD29qw1HVXZdS8UiAxTyJ8xkdzDzpluavgyA8ldHq4lxf74dd1WnhJiRQn+ry3U+T7+d7Uk03nCFWE36h3wIymmOGdc+CkANBImSqFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n1FQSqiCe4Chh7xPc+dCuUrByWlhJLcOONkFNzskHs4=; b=Er2fYISwu9PQi35MbBE8utdu+/ymAEsAN6/1Wsu2mfc0ei8chEkHH49gVsPaNeoJK2FPfvxvjeXRVQcD9HxL8AXKI7dvwigLu6BbmbDKVAj/CiQXvDjnKofEuuV2uGxUwBwGdc/GCIDXImtz6HAkWZ+HHs7gPFFIRxg+u+55IqMTEQ9jG7uDOkekYX/CrAvbAR25fS32EWJ73Ly6q0a2ITeeFaPuP4i4EaxHJvbqUnE2a7zxlUEdkHH9bnYF8wMUF9CIljecUmnsyKMTXz6iDpxkLM/f8uI22azQOUMBvijsB89aoPmANJATMUq8oCcHI3MYrFeEnRYhIIDfEt8cog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n1FQSqiCe4Chh7xPc+dCuUrByWlhJLcOONkFNzskHs4=; b=WDUZjqQyX+lG6b0FR2BIb/Gw45P2nSj6/ONnNvRTDeSvRHPnIVo5o0d5YpWZUmFcFTBxdsHLfeYGRdXmC0QUR9TgKmf10nN1OUKVLWe5vapxA9IzGrDflX28z4M+Jak8zj1mUIeYvevQX4ItL9odiYxYkudYyYpOXUXcri9THZ9EsQCV3kJfGrZoKW+0Xfkk5Qk78w6TLVdGxg7VOcCDaVPoTxCKKhj4YUiGWhBNtsRR6YX5BvxKinWM8qO3KeHAX/VymN/oQgAtvdBEbQhzzN9A+hZn+SAmbNPpUjvWEFIMZPXMnTE8UW6+/kZHY6hBFpPlonaW9rXRjW3IORSPnw== Received: from BN9PR03CA0749.namprd03.prod.outlook.com (2603:10b6:408:110::34) by LV0PR12MB999093.namprd12.prod.outlook.com (2603:10b6:408:32e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.18; Mon, 3 Aug 2026 11:25:41 +0000 Received: from BN1PEPF00004685.namprd03.prod.outlook.com (2603:10b6:408:110:cafe::13) by BN9PR03CA0749.outlook.office365.com (2603:10b6:408:110::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.17 via Frontend Transport; Mon, 3 Aug 2026 11:25:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004685.mail.protection.outlook.com (10.167.243.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.8 via Frontend Transport; Mon, 3 Aug 2026 11:25:41 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:28 -0700 Received: from dev-r-vrt-155.mtr.labs.mlnx (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:24 -0700 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net-next v2 1/5] bridge: Use direct pointer in br_is_nd_neigh_msg() Date: Mon, 3 Aug 2026 14:25:01 +0300 Message-ID: <20260803112505.613873-2-danieller@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260803112505.613873-1-danieller@nvidia.com> References: <20260803112505.613873-1-danieller@nvidia.com> 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 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004685:EE_|LV0PR12MB999093:EE_ X-MS-Office365-Filtering-Correlation-Id: 49f04d08-66ba-4dcf-ea05-08def151f381 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700016|23010399003|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: JpGF031hLcr5D927rKs6naqano5qUKXAlveyrdlaXISOPJEPZ4nX89JRy6zhMufoEHaMHzHDz18k+DKiNYwgrbFf/xNutgupAEog61xGAZHFZ9VsmeRNop5qLYEByX+woYqjqukdxKN2PEgg7EXXXbcsLb+QeslFpkURp9GGyzNihPsHsraL8TWDlFNcZceBkyiRoIgiAgAjPAHkxAfx/qcCSew1asmMJHrXaWvgJLKSVWI22E9JO4GifgMyN/J26rFsceEanHpUtrDIPUICgbYK0+NNjF2TPIXNPQFeD3ocdw+S+mW0z96YjfMFfcCcSQK3dA+k78CPpgn5UByxZR8iVERb8yjFf87cPsYqe+6cLgMeVgv6rPQcnB86iHC2duhloBc8WmU8ab4sziMuxllSphte7MhGRmlobn7jtnu2nMgGDVxMUrLGcmZa/kWOl5YCjt/MEz6sEsGegAHygXaNlNJEQz0ocG4aXCMUBmmUe/l2+KqypFHQmdR8Mf6lVQDqa2M7PQ3FE8Eze9qVigCkk5VpVQoPq6TI6E+eipRCLMIBXZQjHTXl/2/um7tea23pRRgbrKWkokyYdOazHMLnvfwLZdtTtUZiH8/vWPxcZqio9830YoA9N7Y5Xt2a6gMJ3ZaB3CUAIAUN2udTmj0tnrTFf/XMIRmbhDl6mIVvHRiXkiiQsZ3TP4nylyC5oT6Eiu27VrEGz+/Eo+V1CA== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(36860700016)(23010399003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: obApSBVvR5LLSLDhG1TgRBBdSVVeUiwB0rR+7i89ZW4LWUH9XQgIXy1shvTvfqbiLpUbx3dURfBCAMoUMKREGrElRlvrRQ7GUViikZg+tooCkCMOtSRRMQuF4UGITlMwHdguhN5nmqIGalPw+67akAJ0NqOhJNlb1mogGLLiCPSZuAQtAna0MwfEh42p3D1NuOw6e7TIa1YJMMvJY8hkzW08SLpUNXfy8CL5ndzLjw/a2xBTLAvo4cEWliVAO0c5BVfwPZISxRvrmQsLLITIr+uvpIVWoZKG2raPjoXRt8eoS6bDlsiivR6Oep1+BUPaxi8+lioV9eUgAugy+IOBXsNXtQ4fTVBxCJzIS63r5siOfzS77uqN3+HcS6LonR5V/5rJswC9vX2LRjAHAu4zzsjc8kx0c0e9nWJ+1D21vtZIdsZS9GpVHIc+IO+mIlnn X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 11:25:41.1214 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49f04d08-66ba-4dcf-ea05-08def151f381 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004685.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV0PR12MB999093 Content-Type: text/plain; charset="utf-8" Both callers of br_is_nd_neigh_msg() already call pskb_may_pull() to ensure sizeof(struct ipv6hdr) + sizeof(struct nd_msg) bytes are in the linear area before invoking this function. The skb_header_pointer() call and its fallback buffer are therefore unnecessary. Replace skb_header_pointer() with a direct cast to ipv6_hdr(skb) + 1 and drop the now-unused 'msg' parameter and its corresponding stack buffer from all callers. Reviewed-by: Petr Machata Acked-by: Nikolay Aleksandrov Signed-off-by: Danielle Ratson --- net/bridge/br_arp_nd_proxy.c | 9 ++------- net/bridge/br_device.c | 4 ++-- net/bridge/br_input.c | 4 ++-- net/bridge/br_private.h | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index 23eb6931a2b4..db08c3272001 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -234,14 +234,9 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, str= uct net_bridge *br, #endif =20 #if IS_ENABLED(CONFIG_IPV6) -struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb, struct nd_msg= *msg) +struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb) { - struct nd_msg *m; - - m =3D skb_header_pointer(skb, skb_network_offset(skb) + - sizeof(struct ipv6hdr), sizeof(*msg), msg); - if (!m) - return NULL; + struct nd_msg *m =3D (struct nd_msg *)(ipv6_hdr(skb) + 1); =20 if (m->icmph.icmp6_code !=3D 0 || (m->icmph.icmp6_type !=3D NDISC_NEIGHBOUR_SOLICITATION && diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index e7f343ab22d3..ff55dab73632 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -80,9 +80,9 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_d= evice *dev) pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)) && ipv6_hdr(skb)->nexthdr =3D=3D IPPROTO_ICMPV6) { - struct nd_msg *msg, _msg; + struct nd_msg *msg; =20 - msg =3D br_is_nd_neigh_msg(skb, &_msg); + msg =3D br_is_nd_neigh_msg(skb); if (msg) br_do_suppress_nd(skb, br, vid, NULL, msg); } diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index ddb8f002a40e..d87a5f9fa92b 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -176,9 +176,9 @@ int br_handle_frame_finish(struct net *net, struct sock= *sk, struct sk_buff *skb pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)) && ipv6_hdr(skb)->nexthdr =3D=3D IPPROTO_ICMPV6) { - struct nd_msg *msg, _msg; + struct nd_msg *msg; =20 - msg =3D br_is_nd_neigh_msg(skb, &_msg); + msg =3D br_is_nd_neigh_msg(skb); if (msg) br_do_suppress_nd(skb, br, vid, p, msg); } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 4cf8b1ab9047..e31439cb4420 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -2367,7 +2367,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, st= ruct net_bridge *br, u16 vid, struct net_bridge_port *p); void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br, u16 vid, struct net_bridge_port *p, struct nd_msg *msg); -struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb, struct nd_msg= *m); +struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb); bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid= ); bool br_is_neigh_forward_grat_enabled(const struct net_bridge_port *p, u16= vid); #endif --=20 2.54.0 From nobody Fri Oct 2 08:25:15 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013066.outbound.protection.outlook.com [40.93.201.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F8093FE658; Mon, 3 Aug 2026 11:25:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756354; cv=fail; b=fntMt9kiTMXVt5Zdg0Y271B9Mvdjm1p6mdPakrZ7nun2G6dcxG/eVe+t9YiGj0dFEKVxatoWabWR8K0+f043ZY8V2nqxs/rO7jYEJvldT8XatVb8Jp8W8cOvYgSiQI5nnOL1/VpcPYvlVR3yBxb2CXHa8qJKCr9FKQVqZ96CG/I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756354; c=relaxed/simple; bh=83MwDv0nWH8CHIwKB9Duachby2/ULdRktnNChBa5nCc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CWdSTHl5zqh/qsZhRqXIAkbsGbnKNrRoin1JeLJh+M7nmm3/zfUTuR8vase0xe6k0+7R+mozY45pp4dkDU0Xv9IP1GnP8j68zwX7akLIqB3VXxajDT46DsA1jmpCRV/X904f7sW+q6AdhnJU5tjLoJIkmpp94m8JwMnDZgaMr/g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=O/W6pea0; arc=fail smtp.client-ip=40.93.201.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="O/W6pea0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bSsl7eiVK2LQ5IKhIyh/faJkBY9NegCGo59Nd+YIAKhi/zZ6Hj4EBRPeGa/7nXup5/A3iWPoMhEtEPiQAD4SMDUl3jY0ow8BNd6CtYribS+p9jaVeLn7VYu3twf1wSrWdGE8jKkIUhXFfljaldeMyGVeg/K7DKrTdiVhflY0NhLxBClduQikbRvrPwz43ucUAIoee9ZEaABHQYTe9NE4xxe7FWrce0vb4f2lEttdtBuXdYXBOcIFfeAO+YykSG9Ti7YcLc4KMTM/UW6ZDjEV8QVKtqF78LWCfrYFDGUx2nSKRARY1HRKgh8Pa0MaYzK/bSRdNgkDoET/zLtWp2+E5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tXmOSz6Ur7jkTUHVZ47kDsNsZULxtmyOw0XVN1hN8f4=; b=gcQOgUpFqh0DWf/ZIDzBa8YjcjBWJMwfqZD8HRMmCOy5jsmXM4XnTi5xMWr852V77uC0G+GMe0aA+uelmGBGKAl+Ae6XDWrMDjENqGLIogbYj7AuigzjHJyidBya71l8RKWNlzQCaGucTAX+O3TdJhX0KfPC2gSULfr0TP9Qf+ay+thTIiXnvdpebIwZs3X0EUf7zBdgTfQtuRA0Yd6MhBMvNNQjTVb/hv9WW5ShXUO5vN7X65uykxDGsksa1JlMVIX+7YKETY6yiTTkMYvk+p8rox9TKB31hDjB3+VSEXsX8tIh+bIZFkmMxm5Srs9SJs2wAciNpOArpJQqncYXew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tXmOSz6Ur7jkTUHVZ47kDsNsZULxtmyOw0XVN1hN8f4=; b=O/W6pea0B+uJ2hw3lJR9Pi12xB9ZOJjspB0sr0W3Z7GekDkMdcUPlf3b6J07ciO+lVjlC8DJ0g781wgRbFjJEHCbiYDNc8g2HQFmpb4BIz2Cp7C180zD80D6WAmvZLq8eYgJIYBydQj+aJYFOo8KWnTYaQkwji54MYWOW8eNIem9N76wz1tjhlwmHoZCsKYNfPUrv6ekJGTX3Pj/zzjCtHqSnv8/sW8lF88mY5MJOZ9CQSA/Z/vLz+72u45d10j/wsEKrhxQDtWKMdcr7SN43XeU87E6OWib3BsxOApTwZUsU3F59cnz7PseG9BPEUMisNxFuLP6Xu8nvjt4DPJKHw== Received: from BN0PR07CA0028.namprd07.prod.outlook.com (2603:10b6:408:141::27) by MN2PR12MB4456.namprd12.prod.outlook.com (2603:10b6:208:266::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.15; Mon, 3 Aug 2026 11:25:48 +0000 Received: from BN1PEPF00004680.namprd03.prod.outlook.com (2603:10b6:408:141:cafe::a) by BN0PR07CA0028.outlook.office365.com (2603:10b6:408:141::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.17 via Frontend Transport; Mon, 3 Aug 2026 11:25:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004680.mail.protection.outlook.com (10.167.243.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.8 via Frontend Transport; Mon, 3 Aug 2026 11:25:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:33 -0700 Received: from dev-r-vrt-155.mtr.labs.mlnx (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:28 -0700 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net-next v2 2/5] ipv6: ndisc: Add ndisc_check_ns_na() validation helper Date: Mon, 3 Aug 2026 14:25:02 +0300 Message-ID: <20260803112505.613873-3-danieller@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260803112505.613873-1-danieller@nvidia.com> References: <20260803112505.613873-1-danieller@nvidia.com> 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 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004680:EE_|MN2PR12MB4456:EE_ X-MS-Office365-Filtering-Correlation-Id: 862d7fb4-00f8-4a13-07f0-08def151f7ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|1800799024|23010399003|82310400026|376014|7416014|10067099003|11063799006|56012099006|18002099003|22082099003|6133799003; X-Microsoft-Antispam-Message-Info: Jago7OUvGFM00bKdEyKMIgPyvi06QN2Vko6yX7ESCJLIUvponXO8CFZz025FOQvYfyG8QVXgJqOMDtaYxoeIbUAnnT4jyaxTeQHlLAShb0V/E4x+cGt2TTazwix2GO71XqpXl8pXGw2efbsTewnVYbOOamkj6U1U2Gz/7KleyDfuv9EoMVe4EF0ey06+qC1tgnBCvxpjTIWmO4GjNfc4fMxrdAPYx/anCcFbF7wyvtCVKJ41yRfM472DttyXA122Sh8Xk0NyJJtU2qIjrlIOmdhNcUG93rtIqrVfOIKLEPqCEYo9zb1O9NbF4ggqxLlXvh0JBNK1j6a0qDf9aWvByGynH8fBsR9nN7IdNa9SP6v/N124FApLOyyA70C5smCKRomfTMzsoYzN1dhKcTjKJuIyU/XvOXPVcmZ67/ZmdVV9L+DO7IqhTP1vGxb3RBp+VlzoVapG2OSta92RwWu5g9r6WN8tDusO7qyN4bPGzY2NtMbUNET/j0TbIcDgWlVeyqg9S4fU/PEvrTfqJFBUSbuWZEPO3+UnvMNU6TTqrKtBz+ua6P22DYJU3ZgLoYFB+/YCi+il06FI0ttx10fOLNg7bm85F/H+NsCks1hbVKLrWssGqT2S3NZJMGZWyS0un7eIEV5HC7MS1DBy9x6WI2ixqFhGSN4oML5LqksJG7q6ONC3M8UoOdXoFrImFPCjpzC78CtpKwlcw5gXa3rUfQ== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700016)(1800799024)(23010399003)(82310400026)(376014)(7416014)(10067099003)(11063799006)(56012099006)(18002099003)(22082099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cTKVC47sPIPK8a/3akYyJajTmFw3PeX5cb5txX0Pdcs5rnGAMhMy/n0imTXV17eGabRZHvUQyFQuqA58VJQKbC42kHPAadKjs/0csPHpeqP16W59QwZ1OTCjowFJ7itiAQspMo3g5q786g5QyWTogdG0f+aPoFDDt2dsovMzKTWBGMtiAF9wlmy+gyNT7aQhZiiqp/ctYxjkRS1MRx4H3NYrmrgQZtJmFxcObvUK0W4PwtpcLYnHGe5rIR+lb9QljtliWgvcDyyzV/9g2Hvjnz8Ei997y8stL8swcDCRgsb1u0mww8U4gAnh66qU1ajfIZGJo9cub+g6MH9fwF7pV+lL4qcM7kBUOCAHHBLF3GQNDW/4rOyshWyMK8RcO/sM3Se8/dBbpr8aTz8sp2oyh87m/N47Pfpveb/z6JeuUAcZ12xg4F4QftrtsAUFzlgb X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 11:25:48.1057 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 862d7fb4-00f8-4a13-07f0-08def151f7ab X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004680.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4456 Content-Type: text/plain; charset="utf-8" Add ndisc_check_ns_na(), a standalone NS/NA packet validator modeled after ipv6_mc_check_mld(). It performs the RFC 4861 section 7.1.1 (Neighbor Solicitation) and 7.1.2 (Neighbor Advertisement) mandatory checks that are relevant for software operating at the bridge level, where packets bypass the normal IPv6 stack path: - Hop Limit must be 255 (packet was not forwarded by a router) - ICMPv6 checksum is valid - ICMP Code is 0 - ICMP length is at least 24 octets (sizeof(struct nd_msg)) - Target Address must not be a multicast address - All included options have a length that is greater than zero - NS/DAD: destination must be a solicited-node multicast address - NS/DAD: no Source Link-Layer Address option when source is unspecified - NA: Solicited flag must be 0 when IP Destination is multicast On success the function sets the skb transport header and returns 0, matching the convention of ipv6_mc_check_mld(). Reviewed-by: Petr Machata Acked-by: Nikolay Aleksandrov Signed-off-by: Danielle Ratson --- Notes: v2: * Use EXPORT_SYMBOL_GPL() instead of EXPORT_SYMBOL() to export ndisc_check_ns_na(). include/net/ndisc.h | 2 + net/ipv6/Makefile | 2 +- net/ipv6/ndisc_snoop.c | 190 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 net/ipv6/ndisc_snoop.c diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 3da1a6f8d3f9..9e5379ad2d8e 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -430,6 +430,8 @@ void ndisc_update(const struct net_device *dev, struct = neighbour *neigh, const u8 *lladdr, u8 new, u32 flags, u8 icmp6_type, struct ndisc_options *ndopts); =20 +int ndisc_check_ns_na(struct sk_buff *skb); + /* * IGMP */ diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 5b0cd6488021..cf5e01f83ce3 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -51,7 +51,7 @@ obj-$(subst m,y,$(CONFIG_IPV6)) +=3D inet6_hashtables.o =20 ifneq ($(CONFIG_IPV6),) obj-$(CONFIG_NET_UDP_TUNNEL) +=3D ip6_udp_tunnel.o -obj-y +=3D mcast_snoop.o +obj-y +=3D mcast_snoop.o ndisc_snoop.o obj-$(CONFIG_TCP_AO) +=3D tcp_ao.o endif =20 diff --git a/net/ipv6/ndisc_snoop.c b/net/ipv6/ndisc_snoop.c new file mode 100644 index 000000000000..fa86528d5cfe --- /dev/null +++ b/net/ipv6/ndisc_snoop.c @@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include +#include + +static int ndisc_check_ip6hdr(struct sk_buff *skb) +{ + const struct ipv6hdr *ip6h; + unsigned int offset, len; + + offset =3D skb_network_offset(skb) + sizeof(*ip6h); + if (!pskb_may_pull(skb, offset)) + return -EINVAL; + + ip6h =3D ipv6_hdr(skb); + + if (ip6h->version !=3D 6) + return -EINVAL; + + if (ip6h->nexthdr !=3D IPPROTO_ICMPV6) + return -ENOMSG; + + /* RFC 4861 7.1.1 / 7.1.2: must not have been forwarded by a router */ + if (ip6h->hop_limit !=3D 255) + return -EINVAL; + + len =3D offset + ntohs(ip6h->payload_len); + if (skb->len < len || len <=3D offset) + return -EINVAL; + + skb_set_transport_header(skb, offset); + + return 0; +} + +static __sum16 ndisc_validate_checksum(struct sk_buff *skb) +{ + return skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo); +} + +static int ndisc_check_icmpv6(struct sk_buff *skb) +{ + unsigned int len =3D skb_transport_offset(skb) + sizeof(struct icmp6hdr); + unsigned int transport_len =3D ipv6_transport_len(skb); + struct sk_buff *skb_chk; + struct icmp6hdr *hdr; + + if (!pskb_may_pull(skb, len)) + return -EINVAL; + + /* RFC 4861 7.1.1 / 7.1.2: the ICMPv6 checksum must be valid */ + skb_chk =3D skb_checksum_trimmed(skb, transport_len, + ndisc_validate_checksum); + if (!skb_chk) + return -EINVAL; + + if (skb_chk !=3D skb) + kfree_skb(skb_chk); + + /* RFC 4861 7.1.1 / 7.1.2: Code must be 0 */ + hdr =3D (struct icmp6hdr *)skb_transport_header(skb); + if (hdr->icmp6_code !=3D 0) + return -EINVAL; + + return 0; +} + +static int ndisc_check_options(struct sk_buff *skb, unsigned int opts_len, + bool reject_slla) +{ + unsigned int offset =3D skb_transport_offset(skb) + sizeof(struct nd_msg); + struct nd_opt_hdr *opt, _opt; + + while (opts_len > 0) { + if (opts_len < sizeof(*opt)) + return -EINVAL; + + opt =3D skb_header_pointer(skb, offset, sizeof(_opt), &_opt); + if (!opt) + return -EINVAL; + + /* RFC 4861 7.1.1 / 7.1.2: all option lengths must be > 0 */ + if (!opt->nd_opt_len) + return -EINVAL; + + /* RFC 4861 7.1.1: DAD NS must not contain a source link-layer + * address option + */ + if (reject_slla && opt->nd_opt_type =3D=3D ND_OPT_SOURCE_LL_ADDR) + return -EINVAL; + + if (opt->nd_opt_len * 8 > opts_len) + return -EINVAL; + + offset +=3D opt->nd_opt_len * 8; + opts_len -=3D opt->nd_opt_len * 8; + } + + return 0; +} + +static int ndisc_check_nd_msg(struct sk_buff *skb) +{ + unsigned int len =3D skb_transport_offset(skb) + sizeof(struct nd_msg); + unsigned int transport_len =3D ipv6_transport_len(skb); + bool reject_slla =3D false; + const struct nd_msg *msg; + + if (!pskb_may_pull(skb, len)) + return -EINVAL; + + /* RFC 4861 7.1.1 / 7.1.2: ICMP length is at least sizeof(nd_msg) */ + if (transport_len < sizeof(struct nd_msg)) + return -EINVAL; + + msg =3D (struct nd_msg *)skb_transport_header(skb); + + /* RFC 4861 7.1.1 / 7.1.2: Target Address must not be a + * multicast address + */ + if (ipv6_addr_is_multicast(&msg->target)) + return -EINVAL; + + switch (msg->icmph.icmp6_type) { + case NDISC_NEIGHBOUR_SOLICITATION: + if (ipv6_addr_any(&ipv6_hdr(skb)->saddr)) { + /* RFC 4861 7.1.1: DAD NS destination must be a + * solicited-node multicast address + */ + if (!ipv6_addr_is_solict_mult(&ipv6_hdr(skb)->daddr)) + return -EINVAL; + /* RFC 4861 7.1.1: DAD NS must not contain a source + * link-layer address option + */ + reject_slla =3D true; + } + break; + case NDISC_NEIGHBOUR_ADVERTISEMENT: + /* RFC 4861 7.1.2: Solicited flag must be 0 for + * multicast destinations + */ + if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr) && + msg->icmph.icmp6_solicited) + return -EINVAL; + break; + default: + return -ENODATA; + } + + return ndisc_check_options(skb, transport_len - sizeof(struct nd_msg), + reject_slla); +} + +/** + * ndisc_check_ns_na - validate an NS/NA packet and set its transport head= er + * @skb: the skb to validate + * + * Validates an IPv6 packet for compliance with RFC 4861 sections 7.1.1 + * (Neighbor Solicitation) and 7.1.2 (Neighbor Advertisement). If valid, + * sets the skb transport header. + * + * Caller needs to set the skb network header. + * + * Return: + * * 0 - valid NS/NA; the skb transport header has been set. + * * -EINVAL - a broken packet was detected, i.e. it violates some + * internet standard. + * * -ENOMSG - IP header validation succeeded but it is not an ICMPv6 + * packet. + * * -ENODATA - IP+ICMPv6 header validation succeeded but it is not a + * Neighbor Solicitation or Neighbor Advertisement. + */ +int ndisc_check_ns_na(struct sk_buff *skb) +{ + int ret; + + ret =3D ndisc_check_ip6hdr(skb); + if (ret < 0) + return ret; + + ret =3D ndisc_check_icmpv6(skb); + if (ret < 0) + return ret; + + return ndisc_check_nd_msg(skb); +} +EXPORT_SYMBOL_GPL(ndisc_check_ns_na); --=20 2.54.0 From nobody Fri Oct 2 08:25:15 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010070.outbound.protection.outlook.com [52.101.193.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5086E400965; Mon, 3 Aug 2026 11:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756363; cv=fail; b=EGJslehMwdrEY6qLY9rbVo48S+DR180Jy0so9TafzO9/bIbwnyqCG+vo9X6up5e9KVbL+e+kj0Gq3qZ+p0n2mn5M5RY01NaGskytovNcWZ9kEQe/iRoIOMijA6Uix7cfIGyW673sOrR90HUJ9irwfrElcVWQ16wc2dxtiYEmTAg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756363; c=relaxed/simple; bh=PsQWzvP+nZV9Ftvna2MqXGK2ppxZhIkD6HtY9y4bBJ4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G5nWkszw39ZSVH/ML3G5tQsiMNP3u4Li+f5BIIhXcvp1MSRsp/YoWppkEXotVJEr/sKWG3oc5U6OJAC902UGsGfFckkmC6ZX/VxCeb8vpptE1u4gzFV2sQFMLH5Zgw45ZQvLhcblGmT/RwLRcfojiMcBVxHVJHd2cMvw3YN9xiw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=GCPoYuzp; arc=fail smtp.client-ip=52.101.193.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="GCPoYuzp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=htd3JvRr+RA3xvnrwEeLW/dhpue6imIcIBqjvaU4l7qbHGr6ZUdneCP0rpbS1NdEbYepFhNqkyGuWOJi3GNeCQdtjPR3DUKmHjV2B8uqrsW2IYCbPOUSZbRcDNF3CXU8L3JKstMpaNPoNoFgkJrt9+km8ewSBU2l882FjwjQzVFlp+DlxOuX3wOzQ3WWjlr2UVyrKRbWHukJsGiecAm09OKlrQZxlNZDtXkJKhAPJEhUONo210WEiUQP6KerwtspZeq0/VTAvFebixlZg0kfrQU5MoPtsM9Horr1r9iQ+Os+3n5oWzk4uWo/Z9xKITh9UBUwGmbDV4n/Eq02OtX32A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dh+D433ZcjdVYKfdRvAaAViP/sqKx+uqVJhIlVyYgL4=; b=getNBUd50jQ7NUz+8xsOmCpiVvzaRm2rJyLaQlgrTRIcpKUty9ftwJaMrvJpsdRuGeWNBwMrBKfhQRV/3jjA7cO0cyuPdebnVTPVdb7nIEJhyZ+TRyXlFiPTm2x4BF5niVX9oXuoCYkd0J6wP8Jj0vuZTRMsO35Cd/yCroh0jqfaVBivbKlRlizA+4RDuuhGxmCwdSYCSirL9e4HusQZE/VO/h6L3QAslQX/qfz0nGPh5TlluLu3V0VccblukLVkvQj27yspyEk9MVU/nrjiFZ4LBRSqQJy2ySZ8QAkVuzpTAbQ1jUs0ixKay8RsIxZFTc1Z6jaM1YtfmnUYr4OwAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dh+D433ZcjdVYKfdRvAaAViP/sqKx+uqVJhIlVyYgL4=; b=GCPoYuzpi667lDsZb+3sQ5NoCMrN6uFKfrw0ytk4ZVzQEb5BE5TTLSwbb4JROPCc0IPEqELLVqsJw/JBOhqdB5fbGC9qbhPme+jDOSVKMjl+ExU01kvJGsPygI6scLbJnQZYgFnd3OqwDanilVT5fGHyVjIldH0UoFFKILTqSisaF2QVsR7yTaqjrZIxvGHmKr4WsaBXXVJE9u3W6sPRTMKvp0yUTO/m3p4B7xHSyVzwMIa1dheFOB47LxbPNMeALDdN7w4IaE7Id7FB5MqOfzDhWZf7DcJwLGTiIuMbuJAxB2JT7KOtH7f4YgY2gCX3gSv4ma89o063lWyFqUox5Q== Received: from SJ0PR03CA0180.namprd03.prod.outlook.com (2603:10b6:a03:338::35) by CYYPR12MB8939.namprd12.prod.outlook.com (2603:10b6:930:b8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.17; Mon, 3 Aug 2026 11:25:51 +0000 Received: from SJ5PEPF000001D4.namprd05.prod.outlook.com (2603:10b6:a03:338:cafe::52) by SJ0PR03CA0180.outlook.office365.com (2603:10b6:a03:338::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.18 via Frontend Transport; Mon, 3 Aug 2026 11:25:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001D4.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.8 via Frontend Transport; Mon, 3 Aug 2026 11:25:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Mon, 3 Aug 2026 04:25:38 -0700 Received: from dev-r-vrt-155.mtr.labs.mlnx (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:33 -0700 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net-next v2 3/5] bridge: Validate NS/NA messages using ndisc_check_ns_na() Date: Mon, 3 Aug 2026 14:25:03 +0300 Message-ID: <20260803112505.613873-4-danieller@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260803112505.613873-1-danieller@nvidia.com> References: <20260803112505.613873-1-danieller@nvidia.com> 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 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D4:EE_|CYYPR12MB8939:EE_ X-MS-Office365-Filtering-Correlation-Id: 709fa420-ee78-458d-5387-08def151f9aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700016|23010399003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: rHJ9UJjK1MOPwnAjzZZtL+6O3hF7AX0hBXQ9+KHFrL0smcCyzofXUiB3VnSEcd57zhW1WINKeYwx9maunLfA68Nux70ToKbiG6VoEKW7u7pcQMAXo69ab2jmC2J68ixZZU820MxWyJISfpbfGPlX3px+Q7ZK6RYiIrfKLJNImdIAugO9SPDz4FaF11Ctqh4kIFttEyOq4YQhV6DUG0wxqBGppks/Ywe3NaLwqUzXSwxninwOSuauta4BCFHAHPKQMphQN7b5nbmHyOcZ1X/hKLXrYar1jmDzX+4atlWgqAgA2gVKF8gFUgPXel5gcVDRqpkij8BXVe0G4rjDXBH2EacaAMD50eQ8UfHz0R0dpLwXUIi8IOQWa1VBBz6cw64w5TQdOhs60yxvZXXeatMDF8XE6MiJy75QSv5dj2w0ELJ+LLOTbAKeWBzTcwtXBmLmvB1FFZlbx8VY59HKNummJ94UEPqeaOnxLhTBIFQ6jN4bheQuZfc0OwUerAh2BDsJPqlyYyhoURybEbkBS1S6vJkDIVO/VCMIj51tIVHdldG3GwpdvarDv2UNnwAsNxOTNAqx/eYSWPgUvYr0NWQg/TuUl21igkXKOwDsSUMwZRF9AEUJIU5JQpx64ig7Jc8ojD8lKP9QYtOq2SH8GP2nIO5WE95PXY4EughkADAtWdZHefNMRLut8eqtDXHY6uBSuP0dqU30tIIBJDE5Llk1/Q== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(1800799024)(36860700016)(23010399003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HGH/dRhynqaKS1Hf+RvP7UUWdLoREtPXTAPJsXuseR8j6wI2mLfP4v9rW0XV2OL15J84HGFC2MvRMTbtH/nR93rOH8F/C1qwEa3ja2lNihZp1YK9bLxP7TFarBr15hMmfqJaLQ9ncG056+7U9/19NAvv7FBEOfNr82VXIIZrd9xilrEqpC9m+aOkQO8neNPM+QDUH4L1DokDJzzP04acZc60DLC68u+CR5dS0x8H2CesYX7sBhzviyPmz9PMQtK9FXd1P0Jr3rQ970YGY6vUl4R3CmGfrwgtncdyRUUmGY9zBagkr3Fn9tR1LmsklgBRAHmedVF7ovIge/NUZgBn73e88Sk94xNX2GpJRWVObic1vGTRVZdhJGAWUM5T4evp3fxhWL9jcwnihGhkgZU7Pq/Qt51oUk/y2CYIyN1OE2o25pNp6O045oB2wZNwJLSD X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 11:25:51.5266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 709fa420-ee78-458d-5387-08def151f9aa X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8939 Content-Type: text/plain; charset="utf-8" The bridge performs neighbor suppression by snooping NS/NA messages, but previously only checked the ICMPv6 type and code. This leaves it open to acting on malformed or spoofed packets that any RFC-compliant node should reject. Wire br_is_nd_neigh_msg() into the new ndisc_check_ns_na() helper, which enforces the full RFC 4861 section 7.1.1/7.1.2 receive validation: hop limit of 255, valid checksum, correct code, and type-specific rules (NS target not multicast; NA solicited flag clear for multicast destinations). MLD messages are already validated by ipv6_mc_check_mld() before the bridge acts on them; this brings NS/NA to the same standard. As a side effect, the skb parameter of br_is_nd_neigh_msg() changes from const to non-const, since ndisc_check_ns_na() may reallocate the skb head via pskb_may_pull() and sets the transport header. The returned pointer is now derived from skb_transport_header() rather than a direct cast. Reviewed-by: Petr Machata Acked-by: Nikolay Aleksandrov Signed-off-by: Danielle Ratson --- net/bridge/br_arp_nd_proxy.c | 11 ++++------- net/bridge/br_private.h | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index db08c3272001..445c930ed59b 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -19,6 +19,7 @@ #include #if IS_ENABLED(CONFIG_IPV6) #include +#include #endif =20 #include "br_private.h" @@ -234,16 +235,12 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, st= ruct net_bridge *br, #endif =20 #if IS_ENABLED(CONFIG_IPV6) -struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb) +struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb) { - struct nd_msg *m =3D (struct nd_msg *)(ipv6_hdr(skb) + 1); - - if (m->icmph.icmp6_code !=3D 0 || - (m->icmph.icmp6_type !=3D NDISC_NEIGHBOUR_SOLICITATION && - m->icmph.icmp6_type !=3D NDISC_NEIGHBOUR_ADVERTISEMENT)) + if (ndisc_check_ns_na(skb)) return NULL; =20 - return m; + return (struct nd_msg *)skb_transport_header(skb); } =20 static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p, diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e31439cb4420..d337b1cfb980 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -2367,7 +2367,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, st= ruct net_bridge *br, u16 vid, struct net_bridge_port *p); void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br, u16 vid, struct net_bridge_port *p, struct nd_msg *msg); -struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb); +struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb); bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid= ); bool br_is_neigh_forward_grat_enabled(const struct net_bridge_port *p, u16= vid); #endif --=20 2.54.0 From nobody Fri Oct 2 08:25:15 2026 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011014.outbound.protection.outlook.com [52.101.52.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AA54400971; Mon, 3 Aug 2026 11:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756363; cv=fail; b=px+8drsnd9dOzqN+93HJwEgnCh8jHQ6S9qr+ZKWqLkCktFwmvdSTrE5l/YzE2Z9B2GpwDsfGR1DECv518QTrOl6Lbk+wTsGycgLt/m43npnMmCRRM4x3YcVXX/fJ706QDzco3u+uzmsD/e6CaIQ6hh678xDUwxBsYSnUoDVbR+I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756363; c=relaxed/simple; bh=Iw/Fi0w5c/TxlhhiZvVB4q6i+ENGMrQIhhAfid3vvvU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uoScusxhBz1c27SxwjJHmyKpxxh1hIpFGypa810xcXubJ/5sAZTzRQYG2YVdngPBu6tvz51P5+kou0CAodoZ01ytov3FhKYPKYmJqJHWegh5VuOBh9ovHgSoKgOFbA8w+wYCTCExwvpE7dWueuqdllch2rdndeWHZrlxUsmE/8Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=cCbPLcEr; arc=fail smtp.client-ip=52.101.52.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="cCbPLcEr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eOsl8RWqrz7JcPIaK9ddk8lQ87UnJjQ4cYM/kuWzLcxO+KZQVhqWRKv0EJNrR52XD+h6nQZiVGVrAgVRrSPU9i4c64Pq/aMpgPokPQAluwJVCvbv6PAbc9Twq/uTUtwUGZrOI1pDpfQ5jc8+6bSZmiDCEP6lJlXJIetnpuk3k5ivkg3kM8QKxusF+DsxM0Cf8XCF6O5dFFn4thROfkNIQYaEY6rzoKII5xCynn2iE6dUeycSKuCHSO8ZRPNy1L5cLgW/k6zR0hH5PcpoX/3zvgypJeVIU9vHFQLXClwkqlPkBlQMiPmD4jXwTg5rxkQR12LwUkLnY5J6//heepHOfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VZkcTj2z70JFJusAax4ZVxRyiTWr9z4UftmhnDzxAzM=; b=R1PuLCImg2DiKv2XcXoMbBn/siXMny+UHbpysi+d4FdAIaBlyet2rAT7+caVvePfwhs3a5Llm++uB+Pl904x4+dCasvYklGaXs5eadS2kk6YO8fAoRapb91+Rng15oKsfo6FnXDUTkcJjxfhpEZzGRHQt+aNZ22xhobcHCuBntxpGVr2lbGVs99vJkI9gsxkXd/45E3/oLR/75Sbn/iAeKmpH9Mpsu8ZeXxvxsR/a6zK9vFzJxNzcUNzZSPIOyXBqlnSmW3zWv1s0aRI/xq6TJCQU6H8818oJS4kU0hsrVdtnXV6iqa/YVb0ESUyJhMgCzCMpTVGtWfKw57Zi76XJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VZkcTj2z70JFJusAax4ZVxRyiTWr9z4UftmhnDzxAzM=; b=cCbPLcErJDV9xolzEEPuRHEIHxL1gQiyf9BHFtyu5AHtSfqx2IbQtF1EmITVPjy9AdyiUv04W9aE0vkwmFQ06zmPE7POOp53g4lWB8v/GxNX8Wzhom+hh8NU04mABOseDcijKYXt38zM/rtnHCxK/eRUlP0ry3XtJRPvwUpAIRDeBMv992prQZYr7daieePBK6VxBiH/oo7zDEuah5RJ1yP7cgytRF8L5G3Np/FQpRMRChwj7drvduwrTBPPMUoPIrMGaMR42A8LC25s2xRvZEjNXirzA8GhotnDbrUkJ/80XPf6KicQok1O67vULOQ+OxvdxBcp+fx9kz/pQVncUQ== Received: from MW4PR04CA0360.namprd04.prod.outlook.com (2603:10b6:303:8a::35) by CY5PR12MB6059.namprd12.prod.outlook.com (2603:10b6:930:2c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.17; Mon, 3 Aug 2026 11:25:54 +0000 Received: from SJ5PEPF000001D0.namprd05.prod.outlook.com (2603:10b6:303:8a:cafe::9a) by MW4PR04CA0360.outlook.office365.com (2603:10b6:303:8a::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.18 via Frontend Transport; Mon, 3 Aug 2026 11:25:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001D0.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.8 via Frontend Transport; Mon, 3 Aug 2026 11:25:54 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Mon, 3 Aug 2026 04:25:42 -0700 Received: from dev-r-vrt-155.mtr.labs.mlnx (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:38 -0700 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net-next v2 4/5] bridge: Linearize skb once the ND message type is validated Date: Mon, 3 Aug 2026 14:25:04 +0300 Message-ID: <20260803112505.613873-5-danieller@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260803112505.613873-1-danieller@nvidia.com> References: <20260803112505.613873-1-danieller@nvidia.com> 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 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D0:EE_|CY5PR12MB6059:EE_ X-MS-Office365-Filtering-Correlation-Id: b7a23602-4894-429b-ae83-08def151fb38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|36860700016|376014|7416014|1800799024|82310400026|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: UvTcz6UOEB88pi1t5GEwmyxGN5d9FUexszkpqU6g80MWLZ3ipmiG72h7yjDNXo7fRs4I97OJ27QM4RanhYtAbf0yNy9WCPsVcQOWCoscDmGSAnvHafUZz1zFPJCvrVt96fexcumvpK8R6ocmd4bKTwW4FhVeoZYrwy92rtbg1fl8JLa+PfnC3lTtBoVqpjTyzbwozjlN38JKhYUmdRwkMvnv5Rgx72kooMxCyZwXpSd5Q+acIXYzP2SvHi5s/mf1qNvznPht+Ezuwp7+3WHPMh7cpKTwykAypLig3oHZC5YQoLGiF5ejP44fNChgX2bt02YeFPpOBbrQQockjpR6+/yz9jekXIQxC6MYUMvZfPJcdxIWfwxLoWaLWcr+MCEOsKwQB/ZJ34ak6gZl6CLZ5nSVZUonT7/DhocArHRi0Hm+24PpVKb9/ox/+grdJasSx+DYw66fC5nfJE0i7oVV1vUhJ+SZv/tkVL/z6dKw3Qeaawle1IDR4YdtCDIK+MA99Z568z8mH33QLX/soMFSbLiMhrsowvpNOMICBSA2HEz6/oAurn0mtdQJ0MLlkS15EWH/2mKlbnYh+M6Fk+INPgsEgaBMqBdTTFnIJXnYTz6MynuFcIfEQ02ay1nm8rWlnZfxBcxg3uYtLugs9TlfEsSh5mpVwIApl8KlrbYGybANEEm2JmTLkj6TUVefKhRjsZuOt0MnToUsB/G/8AVW1A== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(23010399003)(36860700016)(376014)(7416014)(1800799024)(82310400026)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 30ebRXW6CWMo4/L20es/VAhWeUPdvmrWMmxzFomxgaPy5SN15H4v0KWlLi7gCfNXsHZK/RxHQTtcUf9PZKO6PHAWUFBO+eMyr8xo1onl+ZGFTV6rtLtcdsIKDUCQ9mrHkQPEAiohXu+hCtvNDS1Yn5yzVvp2rxjbobgODr3+ffi3kW3jA/eSy860QWusctdORUcRrJ8Vq5se+GuhLwJ4ejPOpGaoUkZmn1kVi8zLn2hcAyaWnOmVD4repnYxGSr/7nyj7V0rzpW4X+lHAnhe1T8AX9HLXflPcSSwkCoj06T/R4T9ByP84FMFjmHXkkj8GkAVZznlDc5WEX53OH9DN7YCS5jX8DzSE8muBSRZyS4gk/F9eUaBQYzRrgKCHHIrFDx1dQ/uMg+SfdwubAgXI/ikZnrzaH4PFuKKgkQ98rPomcIhTKVsj3gBUsRnG52C X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 11:25:54.1379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7a23602-4894-429b-ae83-08def151fb38 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6059 Content-Type: text/plain; charset="utf-8" br_nd_send() parses ND options from ns->opt[] and therefore needs the skb to be linear. Commit a01aee7cafc5 ("bridge: br_nd_send: linearize skb before parsing ND options") ensured that by linearizing inside br_nd_send() itself. Move the linearization up into br_is_nd_neigh_msg(), right after ndisc_check_ns_na() has validated the message as an NS/NA. This makes a linear buffer a property of every recognized ND message, so that this and any future ND message handling operate on a linear skb and cannot reintroduce that class of bug by forgetting to linearize. Since the skb is now linear by the time br_nd_send() runs, drop the linearization there and derive ns from the transport header set by ndisc_check_ns_na(), instead of recomputing it from the network header. If linearization fails under memory pressure, br_is_nd_neigh_msg() returns NULL and the packet falls back to normal forwarding rather than being suppressed. Reviewed-by: Petr Machata Signed-off-by: Danielle Ratson --- Notes: v2: * Add a comment noting that br_is_nd_neigh_msg() also linearizes the skb. net/bridge/br_arp_nd_proxy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index 445c930ed59b..6b6de0eff38c 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -235,11 +235,17 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, st= ruct net_bridge *br, #endif =20 #if IS_ENABLED(CONFIG_IPV6) +/* Validate skb as an NS/NA and linearize it for br_nd_send()'s ND + * option parsing; returns the nd_msg, or NULL on failure. + */ struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb) { if (ndisc_check_ns_na(skb)) return NULL; =20 + if (skb_linearize(skb)) + return NULL; + return (struct nd_msg *)skb_transport_header(skb); } =20 @@ -259,7 +265,7 @@ static void br_nd_send(struct net_bridge *br, struct ne= t_bridge_port *p, bool dad; u16 pvid; =20 - if (!dev || skb_linearize(request)) + if (!dev) return; =20 len =3D LL_RESERVED_SPACE(dev) + sizeof(struct ipv6hdr) + @@ -276,8 +282,7 @@ static void br_nd_send(struct net_bridge *br, struct ne= t_bridge_port *p, skb_set_mac_header(reply, 0); =20 daddr =3D eth_hdr(request)->h_source; - ns =3D (struct nd_msg *)(skb_network_header(request) + - sizeof(struct ipv6hdr)); + ns =3D (struct nd_msg *)skb_transport_header(request); =20 /* Do we need option processing ? */ ns_olen =3D request->len - (skb_network_offset(request) + --=20 2.54.0 From nobody Fri Oct 2 08:25:15 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011040.outbound.protection.outlook.com [52.101.62.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A89C3F483D; Mon, 3 Aug 2026 11:26:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756371; cv=fail; b=aut/8QE39DVTImnmTKHaEM6GvyLS8fiTiSpMXSQiuHEFEsx7857zLxodt3gBEDKjkKFr4psIppkJajKfBApJ8+lWojzQn80rWIfHFqTE8GTyVdMASRqGSlMhn1LslXLdGGLy8s8fjcSmMJlJ1Yhj5K7bN0rJcOg5j7mQJeOfnuE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785756371; c=relaxed/simple; bh=qFjy9ineWjWQ9DVb7cRMJXeddCP1R5wk2Jd8BzId84g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Yksl2ewwF2myzbEFVl/e6nfS/8UbHuw74/zeU3BjJoqfffLgMkjfNR5xEmz38suRQ2kWa6XgF5STIf+HP/F50WDsbXIHKn3TQz/dxfIT3Cuq1FwtSEkCS8XVxWPm0s8cjBk+9D9z4Y4t+hxr1b6j2lyVbKWccoagax2QiHGw+O8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=n9/wAY2m; arc=fail smtp.client-ip=52.101.62.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="n9/wAY2m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P0r3wUjyXnO1Ahwl5KGcHq5aFQ2aTOvU6fJzTXiNimUoVLpaV9DY7e7PzJBAdwPi2sh8kVbfh17ndKGtxb1yvYr/bauWlbgnEQIR2h4/ue79AuZ5YvLPzb5KDpiUz0P/VUFq58CNlBYgsAmK8KfnEP5Ze9zB3WjtWIzu9yZLTy7UM7n9QgVqYLMuJyCdnVOQDc/Cis4sV//+XxoLXz8LKzJeZjyyXwGoLTh7eAEMfzaVYxzjIUfKbX26qJOpEDjZ7fCeWlei41B5W+wBvoG4mJdYWMKttcNjDI4fGJ5RZUbwNnIvP6a8BnQdOL3Ng6xu0aO/FaxzGzk3iLdIX23wxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BFKvHAQ+bIS+e+avEi8+UBCJf2WSCLF1319NYYwLpvE=; b=egSlloEERO3WF6aYrnHYO3KAvs6ThO84BVQVSC9k97S5HDFqSc9wf8fLRMG7BAuaixMQzG4AGYMsqSsL0dtAXsj/9VXE2PraLWimZph1WNzvGtIwhsyX0VPPY2nzY77KDyzEeqpnGYi+P0PoUnqm5dDUoTg01MKOclK0tGFZK8rUILT2/qgTmoTsY5DByA5Q9cyRd0WHJ7Ilu+AefM9ZiIG91tr3O3JQ1OGdvKAWKknyl0HdDQ8hNo6CY9u0pJBHeM4cqQr8i/TfROt9u+pjRdcc3F0ZSJ6EZrh1ZlucbLwWON+SkGXjer5SqfjcX8tFHinPy/qy4F2b44HcQ/rctg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BFKvHAQ+bIS+e+avEi8+UBCJf2WSCLF1319NYYwLpvE=; b=n9/wAY2mCj4hsi3wMASWeYQpFjj4v0hxpcv0b0iwWe5Vx3VOZ52/ygcgmtJ9Pwn1Ny/zC0viO+FXfJX5lSE6HQJCTToHCT047kI0NFalJzC4Asy62k38vWqSg4u4xnZGlH8+VdRHGozZC9JXP6K2rUu5NUZNS73U+gb32/lvL872Yqs2z6WaZwZWvfBFNyqrJUAqXvHJrsAMo/hk5TBI4T636SigtrVWZiVzbm0a88xaxSZXpYQP2OGCzqpApODQCc9ZIsCcy0WMAeAl4iymy2qUboYadrMhLsEoLKzfUqTw+fkBghz4C22/972/4XoQS4yr75DbX6PU4Puxfms2rA== Received: from BN9P220CA0009.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::14) by CH3PR12MB9313.namprd12.prod.outlook.com (2603:10b6:610:1ca::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.18; Mon, 3 Aug 2026 11:26:01 +0000 Received: from BN1PEPF00004686.namprd03.prod.outlook.com (2603:10b6:408:13e:cafe::6a) by BN9P220CA0009.outlook.office365.com (2603:10b6:408:13e::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.17 via Frontend Transport; Mon, 3 Aug 2026 11:26:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004686.mail.protection.outlook.com (10.167.243.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.8 via Frontend Transport; Mon, 3 Aug 2026 11:26:00 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:47 -0700 Received: from dev-r-vrt-155.mtr.labs.mlnx (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 3 Aug 2026 04:25:42 -0700 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net-next v2 5/5] bridge: Use ndisc_parse_options() to parse ND options in br_nd_send() Date: Mon, 3 Aug 2026 14:25:05 +0300 Message-ID: <20260803112505.613873-6-danieller@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260803112505.613873-1-danieller@nvidia.com> References: <20260803112505.613873-1-danieller@nvidia.com> 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 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004686:EE_|CH3PR12MB9313:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a90e220-00a5-4570-cd0e-08def151ff10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|23010399003|1800799024|7416014|376014|56012099006|10067099003|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: MXyySNOP46dJVXUOla6wzsIV6NjPXRlxX7aYffxB53kJUPK3AzQjSWPBMetCSQ51dewl/ROMnbo53QxoKS9Mhkd6EOOOry0v7LYfeIxbJkQZak8ISrytka0oW8Pg/gMPIiP2SKQnndddzIz0VE7bYJOVNSTfZdyKxS+DF+c9fh9m09pX+tMlqVCVhSs4KXltvfgX9xYcu3+qi/+KBaa6JtX2RSY+To4nWwl6FwfZGVWQ72ZBquzYR+9590CvROqhkvVLg0wZteH+sll84QGR8ceTMpdd+apYR0hvGbECbglLIUql8MfTpUpYnjzul+rYRxXaSGEz0b0//pw102c/PwkgXSbZpC88Do0J8n+UOV9lNyLRo4H/gfZnwMRHbS4bZd63SkF1tlGR2+pE+HxyCk+EJ8R6CDlh1mqdCQLhqJYrc0+h5yP1nzY4hVJQibtwiwj94GmttREPPz4NC+lESq8bQQjeEMpHL05Fb3W5z7EgLB2qAcY4qBy8IpUrZFis0yEOmPK6PnGumaG6iA3vlIG/o3KTA2SipbN63T4pqOQHopEXeDVu5sii/uHYXZsft1PXrwt5isp3MGHyjXccAciwV7GSgb4u0MDPowCVEvKa+EZqOAlowFu4pG4O+2zmqMxckoggEwR/ITqcF5CiGprvSqbOV2G9INSO93s2tm/6+ncj4IXrNo9FlbbAMaPyDe9AJQXMxICYoBmuhwCGqA== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(23010399003)(1800799024)(7416014)(376014)(56012099006)(10067099003)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5N2hKtrvpgwvPVjT+cMn9VTkSj5NpSBr02OWIS8JNonCsnNpcLuElNBO7dwiEFQmyaEwSUGEaW800cyGczxxRuYBmpQLHzgcyFmo824ry51L0WtC2/FU/IW2i0CvSE0oh3VX7JKiWPCmLEIXEhLCY2CixQe0l7LNPfu/+bPgh5uCGtua4iykbxR7wC9fN8ohIQrLXLn4AwI0e2ms227XEWTg544wN/w/6kbf74uV70ckLsLVxW3HYr6Iu8SqcRRyVS6s8YVnkd9M1s9q37lW4XvY3TKgRdZ1IneG6YaH/rTwI0XH954plUdQKG/ajRFTV1RDllP6pIq3fuDFuoQlyhrNumxDTWkLDA7LjQk2vU/cDgq7angdnE75KmxZQ2n7pdrxFa1+ve67WdXUK9z6jpK4XSLSLXsai3s5+6dbkY/we++p7HAfeeiGTE99pwNm X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 11:26:00.5215 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a90e220-00a5-4570-cd0e-08def151ff10 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004686.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9313 Content-Type: text/plain; charset="utf-8" Replace the manual ND option parsing loop in br_nd_send() with ndisc_parse_options(), which provides proper validation and avoids the class of bugs that were fixed by commit 53fc685243bd ("bridge: Avoid infinite loop when suppressing NS messages with invalid options") and commit 850837965af1 ("bridge: br_nd_send: validate ND option lengths"). Use ndisc_opt_addr_data() to extract the source link-layer address from the parsed options, which correctly validates the option length for the underlying device type. Export ndisc_parse_options() so that it can be resolved from the bridge when it is built as a module (CONFIG_BRIDGE=3Dm); otherwise modpost fails with an undefined symbol. Reviewed-by: Petr Machata Acked-by: Nikolay Aleksandrov Signed-off-by: Danielle Ratson --- Notes: v2: * Use EXPORT_SYMBOL_GPL() instead of EXPORT_SYMBOL() to export ndisc_parse_options(). net/bridge/br_arp_nd_proxy.c | 32 +++++++++++++++++--------------- net/ipv6/ndisc.c | 1 + 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index 6b6de0eff38c..b6e5a86b6a92 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -255,15 +255,16 @@ static void br_nd_send(struct net_bridge *br, struct = net_bridge_port *p, { struct net_device *dev =3D request->dev; struct net_bridge_vlan_group *vg; + struct ndisc_options ndopts; struct nd_msg *na, *ns; struct sk_buff *reply; struct ipv6hdr *pip6; int na_olen =3D 8; /* opt hdr + ETH_ALEN for target */ int ns_olen; - int i, len; u8 *daddr; bool dad; u16 pvid; + int len; =20 if (!dev) return; @@ -284,20 +285,21 @@ static void br_nd_send(struct net_bridge *br, struct = net_bridge_port *p, daddr =3D eth_hdr(request)->h_source; ns =3D (struct nd_msg *)skb_transport_header(request); =20 - /* Do we need option processing ? */ - ns_olen =3D request->len - (skb_network_offset(request) + - sizeof(struct ipv6hdr)) - sizeof(*ns); - for (i =3D 0; i < ns_olen - 1; i +=3D (ns->opt[i + 1] << 3)) { - if (!ns->opt[i + 1] || i + (ns->opt[i + 1] << 3) > ns_olen) { - kfree_skb(reply); - return; - } - if (ns->opt[i] =3D=3D ND_OPT_SOURCE_LL_ADDR) { - if ((ns->opt[i + 1] << 3) >=3D - sizeof(struct nd_opt_hdr) + ETH_ALEN) - daddr =3D ns->opt + i + sizeof(struct nd_opt_hdr); - break; - } + /* Derive the option length from the IPv6 payload length so that any + * trailing L2 padding in the skb is not parsed as ND options. + */ + ns_olen =3D ntohs(ipv6_hdr(request)->payload_len) - sizeof(*ns); + if (!ndisc_parse_options(dev, ns->opt, ns_olen, &ndopts)) { + kfree_skb(reply); + return; + } + + if (ndopts.nd_opts_src_lladdr) { + u8 *lladdr; + + lladdr =3D ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, dev); + if (lladdr) + daddr =3D lladdr; } =20 dad =3D ipv6_addr_any(&ipv6_hdr(request)->saddr); diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index fe36b3f51285..2ceb655c4229 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -283,6 +283,7 @@ struct ndisc_options *ndisc_parse_options(const struct = net_device *dev, } return ndopts; } +EXPORT_SYMBOL_GPL(ndisc_parse_options); =20 int ndisc_mc_map(const struct in6_addr *addr, char *buf, struct net_device= *dev, int dir) { --=20 2.54.0