From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 9D04E39A80E for ; Thu, 2 Jul 2026 18:05:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783015529; cv=none; b=YozgRBjWZTFdANjX40uRTryPDnU+UO+c70x6h7sZMqCWM+3Agfpb8cAKl1mhmH3pxpJaZFgtx1/PPlaXtbbUK1ycXWBnrCHLcB/Lw4Zy20f/O02pMXWqq6CqTprQeybFjiGkDmk0/cfTENZFWhiPQbO7KEpnp9uwFgabvSwUPak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783015529; c=relaxed/simple; bh=CpF/+ZkhfLaqd+Qm00Pw9dFR1GigXcDjVgN3qQ1kJPI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uav5QJ1Z+/OXredkDnR9yHtSrkBTFXUxITEOnS5CZFIhFPxNtElnEA1VnWZFSYhq2B46SnSgpwTapmF50se14brNTEJWpnuH0RYBzxxF82IxymDlNVeEXVqwLkZsKmSMczy/oO3ZtbvZyiVy1lrn2cqfD1Mmc38eqf/3W9dGCaQ= 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=ObD/bg8p; arc=none smtp.client-ip=209.85.210.180 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="ObD/bg8p" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8478fe07f0fso2077818b3a.0 for ; Thu, 02 Jul 2026 11:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783015528; x=1783620328; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jTjUs2y9goRcZj8GKlJQUGr0p6xKvzwQaEafBMRd3lo=; b=ObD/bg8p9bFWU61fEkUCX2uJ4me158v9ITALNnZ5GG7HLKjP2g2YumTURXfT0/cY42 cFNe+xKBkG0LGO7ZOEKK8ns8gQ5/k40OfuJ00M0v3RIw29gNlSSKRLyQg2L1xWm6sE5B tyKC+Q4QDSh8RQqSfUU2jMGmeybpfkwZC9Asc6gWytao47xB5P07O5mCja/A6R3ZrdxB acYKpqzvpC9FAApCVZledyB3BIJ/713bx055eiJUzFxNfcq4L5Mr5omrp4NVNpAvTf6B FBHi6EdrH5aO1AOkZZiNHRWumQaAKqoYXCb1dlt1y3/csKyV/Kx5pbwhXVqzp7NuO9g8 RBzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783015528; x=1783620328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jTjUs2y9goRcZj8GKlJQUGr0p6xKvzwQaEafBMRd3lo=; b=RvQj1pKP3lwyoyuEmWg6PiwoRDvI0ge4/VTCGY3yb750ZagfgsOH4akwiLN8TalFXi 0z5LghsyKSl0Ihb2u8B/p9zOhBP6af+3r1Ohk9lYqO2OIzGwY431hOjH54sLek0/rWO0 dIxQ6dtjFWwnDYlyVmaMQZdVDa1RLvy5fitycrtUP1swMXkj3xWU9GGLIsl7oLzjiHYi snHm2sMo+94E3K5d6soIyRB/1owoONq3o6dSnSE9cdKlIRpjvaDybGu1wIEnn8AyNXs/ sSOSY+MleOxu5+VRRLbsBhwOkj4wplj18X3g3BnIBeKrV7u1pT5aOWxKx6k/P7PRt8II sTxQ== X-Forwarded-Encrypted: i=1; AHgh+Romp04zPGmkc+GpwafoyfujLYsqZ9eXSJFTHhI9OflWgpGnAYnHu2dwB87NozRzEL7fXKmwdaqhOwKd7eU=@vger.kernel.org X-Gm-Message-State: AOJu0YxJdbCu4nCSUy9fKlcYZLwXYguriYHhj5L9Grb9osxrx4f1zr2R lk/K2aZQb7XaikbB/FagAy6y8Dw4YgHSleUd3HKCLfBexf/oCxB2XhAs X-Gm-Gg: AfdE7ckjzkFruQ3Okxm3GOb6E7Z8G+ISVedLyj0D02U7JFTcSiv6iCBgX6tpjiOtIXu ZbQG1NQIUZqEQ4wv1ipIEGoTvq9HV7mBa78SKdjVTmpa/8kmZShiKXyfiiHVKNYFveB0t+UyHKd V6A2wYtj1NQc8X04RjpLJwEYMoJfDR+sgEQiXVqside97wCqvt+Gr8l0OAL9L8/nD7TmGQd+rpx W2YoGVAOsRjsV4V4+odz7pJoUapU5893pBZN9prI6L/QoQy0Xp6LFx/Dea5Pgd1ZrjnMbTYPP6p xD1Af2SHsUXkKBokEXA1BCZnfIjPSSGdV1OGrCCxfod2eL5c0OXYApot4ij9Q7LC6HSu9MSZv6B HYYZF8HJDnwIGd7mKkl0cjGfdX/6v40pLmoQudLGkB80oPlfIYltk3DH2E2fnVSNvZZSfWOXxkJ 5NsLd3SLNk/FK94Q1uRJvkOJsVCNDZ+EqtWNIG+A== X-Received: by 2002:a05:6a00:2a0e:b0:847:8d2d:712f with SMTP id d2e1a72fcca58-847c0678924mr7094180b3a.10.1783015527818; Thu, 02 Jul 2026 11:05:27 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847cb78d69csm1701877b3a.25.2026.07.02.11.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 11:05:27 -0700 (PDT) From: Maoyi Xie To: Veerasenareddy Burru , Sathesh Edara Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maciej Fijalkowski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2 1/2] octeon_ep: fix skb frags overflow in the RX path Date: Fri, 3 Jul 2026 02:05:17 +0800 Message-Id: <20260702180518.2013324-2-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260702180518.2013324-1-maoyixie.tju@gmail.com> References: <20260702180518.2013324-1-maoyixie.tju@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit __octep_oq_process_rx() builds an skb for a multi-buffer packet by adding one fragment per buffer_size chunk: data_len = buff_info->len - oq->max_single_buffer_size; while (data_len) { ... skb_add_rx_frag(skb, shinfo->nr_frags, buff_info->page, 0, buff_info->len, buff_info->len); ... } buff_info->len comes from the device response header (be64_to_cpu(resp_hw->length)). Nothing bounds the fragment count against MAX_SKB_FRAGS. data_len can be close to 65535. buffer_size defaults to about 3776 on 4K pages, so a full packet yields about 18 fragments. That is one more than the default MAX_SKB_FRAGS of 17, so skb_add_rx_frag() writes past shinfo->frags[]. The fragment count is now checked before build_skb(). A packet that needs more fragments than the skb can hold is dropped. octep_oq_drop_rx() consumes its descriptors like the build_skb failure path. The same class was fixed in other RX paths, including commit 5ffcb7b890f6 ("net: atlantic: fix fragment overflow handling in RX path") and commit f0813bcd2d9d ("net: wwan: t7xx: fix potential skb->frags overflow in RX path"). Fixes: 37d79d059606 ("octeon_ep: add Tx/Rx processing and interrupt support") Co-developed-by: Kaixuan Li Signed-off-by: Kaixuan Li Signed-off-by: Maoyi Xie --- drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c index e6ebc7e44a..bdbed58c7b 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c @@ -453,6 +453,15 @@ static int __octep_oq_process_rx(struct octep_device *oct, octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used); + if (buff_info->len > oq->max_single_buffer_size) { + u16 data_len = buff_info->len - oq->max_single_buffer_size; + + if (DIV_ROUND_UP(data_len, oq->buffer_size) > MAX_SKB_FRAGS) { + octep_oq_drop_rx(oq, buff_info, &read_idx, &desc_used); + continue; + } + } + skb = build_skb((void *)resp_hw, PAGE_SIZE); if (!skb) { octep_oq_drop_rx(oq, buff_info, -- 2.34.1