From nobody Mon Dec 1 23:33:20 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 7D8CB309EEA for ; Wed, 26 Nov 2025 02:37:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764124656; cv=none; b=o0DKyIZbsWbWOiWyY4R520GeDSCrjgBnrYlvyNwK8m1L8b5SoVIoTWuxKwQDWHcx4nlBdjrK6QL/cXMHNNQ2KN6xMueIOPqzAVGuZWWCTuJHrt5/+OhCNpJ/DcXLwVz1v+qf+FUD2tpJk1SwocMMiAZ0LfhZrKGh9ibM5tc/ASw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764124656; c=relaxed/simple; bh=entLQ00bQ62t/dTRgSabG0fNBdbyrs85rvRHU1HwGTo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=echCenw76E/IP+W0o7SQN5nrA6brpoJGzU92ix2Stvxwxo96hbFvztUfJQnNLqwR9pXtPSvJTcVHODSHznO36OKIicOkODsILZkhsLb2Ww63ekYzOCeKiQuzUx1mAXTL+Bg0u6l513nWggZCeQP7debHEsBOUJn1UoroDv/aARU= 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=f02hnfG8; arc=none smtp.client-ip=209.85.214.176 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="f02hnfG8" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-29568d93e87so59192735ad.2 for ; Tue, 25 Nov 2025 18:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764124654; x=1764729454; 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=57/iOTQ4I+Y5hbIzCA+HosZ78NtoHBq+y9GUVuWjdbw=; b=f02hnfG88imzcF16LKnqx+iYXEjsOu9yyEroCAaetG/dSONCY0B2YckA4bxeYYpufG pawDV2932eJxixGEKT/4uG0IDhXQjfwBzR79ogxqDt8xZqBgU9h7j1TR3m1EZwU/uAA2 WfpnOwsRIpjEoqD+jt+TVkPkV0YphwFJA13xay0pXuHAItPi0giKR9PLdqG8guJQojI9 T10fOHJL9BOJc5QoogzheosbdFfz7diqAnl4pIQQAOzvhKNIZELBBXB2QAXMoblBUUbo QvPMPcKaz3bbykkpLOfw935ODVTSuiDLzgIvoBm0T4RwiTiv0vHsbBPskWxXGqUQRn3o 2Atg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764124654; x=1764729454; 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=57/iOTQ4I+Y5hbIzCA+HosZ78NtoHBq+y9GUVuWjdbw=; b=LHWzOsZnUjf518vHOOMEAnMnyuMf0HvzyBM/2zavRVjgfqUllRhd6qVBVHUZyNdWq+ 1pahnvimbyP+WVng3Begqf64rEHFveur13mgVJWvhEdq+vLfKKj1GyqphsopftnKXX90 9+gb65yUtC/GH9YidJuCTplbA8/BcWqx+CP7giC7j2ZlCYpnYm4xVSOsKMeprQ2ZeB8v +81l4g1RubZWr20YLh8fxlmJA6aK1ohbGTNn2NvVf33WAT4QeOB/d0NX3XkvRTJOrton i69Uc6pGkctC7eP9lKM1aMv7dWAhj2/zjR6zFpKEICaGwZLIUaq7Egnqc7xIKeDYsrvO J2sg== X-Forwarded-Encrypted: i=1; AJvYcCUtwHLdXjFpTzbTn1RQn5dC1g/9D3jHeKMijslHu0BAKDZ+LCdJJVWuhdz+1e3dAWDFv0IaACg3Mz6NbQE=@vger.kernel.org X-Gm-Message-State: AOJu0YxvldE+n3/P9KHQvjv3vJ9EjTUY206lzqb8DlhTESngWP7nVFpJ ERMCEmYBSKTH5jeva/0WxuGReHntCUUSSJdTrbG2ty9W4jC8x+JLxROa X-Gm-Gg: ASbGncvBJkZByaNI2HyWBnFPc6PKQ2zpGq39nfeMEl26No6sF7EOYVhmkxvAu3bXa56 0awNT7sL7iL1aIXIB2KUMebfuFOTL5g6+bsWW8Btxq47ua4UNB217bxB74VVL0+0+0VDh5hJ0BB WuODRnLV3wpGb2fFr1ZpEB86hJtoA9vK6L8tF+QKibmTO73GkOq+2zWW9rX5JvBl0RWCYLr/z5D 3hk/r22KhSGylBmqSpdlA1PzvXCodPVkUK38sBpfgqu7zv7Ixbw84Z11qaxbvirtjHhLC3aaVC9 9e4TifXAVcu708Kk3ZXqHwsoBxJtBiINZPGjUAH8TX4Rcim+3PVy0aV6ANeovwJre70nveQSH9/ SAsnQkL7hB8Cy78Vnjhn8ZNyOr/0LY8ptx8NvY6lE3W1wn6SmrYXupM1AnrD3DpVX5LB1FhfGhe Yz10ZIXOmA9Svqbvrzoq84qaVAdhdx7pX30z/pZM0v4iW/8g== X-Google-Smtp-Source: AGHT+IELIwvzumjhkeb3r8Hq6IYtOrVYTz06StNxAdW2mIJzeAWDQwIAW8d3zdgadbvDm5C0h20dKQ== X-Received: by 2002:a17:903:950:b0:294:ccc6:cd30 with SMTP id d9443c01a7336-29baaf99b4bmr62717285ad.17.1764124653683; Tue, 25 Nov 2025 18:37:33 -0800 (PST) Received: from gmail.com ([183.56.183.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b107edesm177578005ad.5.2025.11.25.18.37.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Nov 2025 18:37:33 -0800 (PST) From: jiefeng.z.zhang@gmail.com To: netdev@vger.kernel.org Cc: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, andrew+netdev@lunn.ch, edumazet@google.com, linux-kernel@vger.kernel.org, irusskikh@marvell.com, Jiefeng Zhang Subject: [PATCH net v4] net: atlantic: fix fragment overflow handling in RX path Date: Wed, 26 Nov 2025 10:37:27 +0800 Message-Id: <20251126023727.52472-1-jiefeng.z.zhang@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) 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" From: Jiefeng Zhang The atlantic driver can receive packets with more than MAX_SKB_FRAGS (17) fragments when handling large multi-descriptor packets. This causes an out-of-bounds write in skb_add_rx_frag_netmem() leading to kernel panic. The issue occurs because the driver doesn't check the total number of fragments before calling skb_add_rx_frag(). When a packet requires more than MAX_SKB_FRAGS fragments, the fragment index exceeds the array bounds. Fix by assuming there will be an extra frag if buff->len > AQ_CFG_RX_HDR_SI= ZE, then all fragments are accounted for. And reusing the existing check to prevent the overflow earlier in the code path. This crash occurred in production with an Aquantia AQC113 10G NIC. Stack trace from production environment: ``` RIP: 0010:skb_add_rx_frag_netmem+0x29/0xd0 Code: 90 f3 0f 1e fa 0f 1f 44 00 00 48 89 f8 41 89 ca 48 89 d7 48 63 ce 8b 90 c0 00 00 00 48 c1 e1 04 48 01 ca 48 03 90 c8 00 00 00 <48> 89 7a 30 44 89 52 3c 44 89 42 38 40 f6 c7 01 75 74 48 89 fa 83 RSP: 0018:ffffa9bec02a8d50 EFLAGS: 00010287 RAX: ffff925b22e80a00 RBX: ffff925ad38d2700 RCX: fffffffe0a0c8000 RDX: ffff9258ea95bac0 RSI: ffff925ae0a0c800 RDI: 0000000000037a40 RBP: 0000000000000024 R08: 0000000000000000 R09: 0000000000000021 R10: 0000000000000848 R11: 0000000000000000 R12: ffffa9bec02a8e24 R13: ffff925ad8615570 R14: 0000000000000000 R15: ffff925b22e80a00 FS: 0000000000000000(0000) GS:ffff925e47880000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff9258ea95baf0 CR3: 0000000166022004 CR4: 0000000000f72ef0 PKRU: 55555554 Call Trace: aq_ring_rx_clean+0x175/0xe60 [atlantic] ? aq_ring_rx_clean+0x14d/0xe60 [atlantic] ? aq_ring_tx_clean+0xdf/0x190 [atlantic] ? kmem_cache_free+0x348/0x450 ? aq_vec_poll+0x81/0x1d0 [atlantic] ? __napi_poll+0x28/0x1c0 ? net_rx_action+0x337/0x420 ``` Fixes: 6aecbba12b5c ("net: atlantic: add check for MAX_SKB_FRAGS") Changes in v4: - Add Fixes: tag to satisfy patch validation requirements. Changes in v3: - Fix by assuming there will be an extra frag if buff->len > AQ_CFG_RX_HDR_= SIZE, then all fragments are accounted for. Signed-off-by: Jiefeng Zhang --- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net= /ethernet/aquantia/atlantic/aq_ring.c index f21de0c21e52..d23d23bed39f 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -547,6 +547,11 @@ static int __aq_ring_rx_clean(struct aq_ring_s *self, = struct napi_struct *napi, =20 if (!buff->is_eop) { unsigned int frag_cnt =3D 0U; + + /* There will be an extra fragment */ + if (buff->len > AQ_CFG_RX_HDR_SIZE) + frag_cnt++; + buff_ =3D buff; do { bool is_rsc_completed =3D true; --=20 2.39.5