From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.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 A8BB83A6F04 for ; Thu, 2 Jul 2026 18:05:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783015532; cv=none; b=RaCeJnw7COVegTcos8j3lv7Pp5MqvSvrzjSW2To3XAEFOBekfA6cZy8gE9jJgQ9LOziSJVu051cVBb3YSdRXICl/bUut6Lt5RHXh1L6BYDwOzUU8IxpZv+gksXb76Ob3M7ebwE/i91rhbWZcB3yrrB0EFCl1lyiS2gFUgNsdyM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783015532; c=relaxed/simple; bh=JIoUXlQepeQ3/b8j3T/tXuyELWs+N9uk25RZYtoDjXc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CP53ZWP+L6Ctm5vZFSukCa99Sqh2ZEhYwrpCJ4tGnf7V4OwEsoWl24pCm1kdrEOm85F1ay4o9X08ILivflyw+J0zSwi1I+zcJLcJVpxhwisw/HGn/Oyl+9TTfRVO5fYBFtfO/R6qBgwZPC5JPgvflD4xtqXA7VoEywGa2wAkbZc= 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=bz03Fj8z; arc=none smtp.client-ip=209.85.210.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="bz03Fj8z" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-847a5528b33so1164034b3a.3 for ; Thu, 02 Jul 2026 11:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783015531; x=1783620331; 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:content-type; bh=Y3UiQpQDKH2c9n6CLAsdUQpOpJU3f54iB9ppdD3l/0g=; b=bz03Fj8zevfStxZJ1fBqtVHAxcHXFCLFCunJjMRC16w31mnBFK8T1gA6+BdSGSqZ6B Qo+llQm13WJTWujA0VaefXCNSzQvxWq0laKBTSDUcqv2JEb4mx88DYlwycmWq7IykRvD QfhcAQCDXHQVl386NZjArOoYpzGAtbd7DT3odUrPrtlB9Vu0RNQz9+HV1yYTOqqZ5yMI KxbQYkUKL/rgOQb3yZQyuRbW8ypQwxV9wjEJA7mo5FxD7W/VtrZMl8ycsou9lcvchrCK ciUCcxefAu8lVbcevqM5wHvqhtiRRM4DWyPQdo9ZaoNyx0sjVtWDrtDeUvx3PHDOu+BE sB6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783015531; x=1783620331; 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:content-type; bh=Y3UiQpQDKH2c9n6CLAsdUQpOpJU3f54iB9ppdD3l/0g=; b=tMJlBsdSC8SJ6CrbOwjyrfg0T67MDYzYmJFKGmwjd7tskE2AmBrdPkiAAwzvOv0P22 QKzHb58a7/5iug0nHX1TQSfiKhUBuAq/Dw4bnKOVAw2NwLqIGGREafn2Y2tZSQitZ4Uy BaiBHt9q0vCa8tXuBBCjPYtJr8NkUpxYirAgvbaW8CW1SSGytGIzQ1pV8W07EBJYKgzc PeW6VIXmVemUrr62NnDyEm+xqepNiMZb0kSArU1496xonj/pnVgkHO0JtYK/OKOTjc13 ucIA4fVvpLYHY4v6Xlq4BIMqY2ySLcq4fbOBSgsQiQ+/bfnihUxXUiLNz0jnxgTwxtmr //Uw== X-Forwarded-Encrypted: i=1; AFNElJ/e7LcnPfMUYmyCBSfzjDv/tINeKSrc7+OZfu19MYrx/d4atrsnx+vzzn2ueNWXzBpCYRK5/C9XxuBI2AU=@vger.kernel.org X-Gm-Message-State: AOJu0YxaWzjSMiXktO5DRny73BY1SErkImymuqkvO2H3HPHKUFzAY7uv t9UHP0wxdLXbeCR8o1iLjNQUrHr8qTK0Pn6AclBp/yr5iBupxuwVbd4K X-Gm-Gg: AfdE7cnzt1dSg71UTYEas4gJPHwZwhaVYw7bV+38d+o8XE7fexLAeeOLco6d5ACiM73 mU6BbreQ/jRviA8Jn8ah6GbC4ZYfvhQK9QF6PkwKhn8dD/JMvMZ18lxeAmX3Z39IG/us+T7dZ+H eOu2QgEQhit5gyUGiD3LFZ6FS6ei3LLNf3Gd0fM8p6/DIWyaO8/oy7sh7sivERA4zNZsaEKjF0n 4LD5YvNpqqld+LsgQB3LMn1WTb+9PRqvQKkgugk2w7YKlyPw229YxVzgkr1cZyIeZR/ScRw+ZT5 z5XLtU4S9qLp+e3SU4NKipFtPHqImAdcRHTs1l3jiZJyrBlonfCzlD71p3tEHrc7VvcmpWP48KF 5TUBRF/5AEGOFfjy/7RwBmMHkE3ha5S4SbGZWHkwlD0iJ5XkGw/HhDgfYiYc+U9cjnSHTqLhcbH J7ilwzvqbdjuo2dl0fwM0/FT2r+r43xn8+CFbQug== X-Received: by 2002:a05:6a00:b8f:b0:845:dfef:75b8 with SMTP id d2e1a72fcca58-847c5036146mr6187409b3a.15.1783015530795; Thu, 02 Jul 2026 11:05:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 11:05:30 -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 2/2] octeon_ep_vf: fix skb frags overflow in the RX path Date: Fri, 3 Jul 2026 02:05:18 +0800 Message-Id: <20260702180518.2013324-3-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_vf_oq_process_rx() has the same unbounded fragment loop as the PF driver. buff_info->len comes from the device response header, and one fragment is added per buffer_size chunk with no check against MAX_SKB_FRAGS. A long packet yields about 18 fragments, one past the default MAX_SKB_FRAGS of 17, so skb_add_rx_frag() writes past shinfo->frags[]. The fragment count is now checked before napi_build_skb(). A packet that needs more fragments than the skb can hold is dropped. Its descriptors are drained the same way the build_skb failure path does. Fixes: 1cd3b407977c ("octeon_ep_vf: add Tx/Rx processing and interrupt support") Co-developed-by: Kaixuan Li Signed-off-by: Kaixuan Li Signed-off-by: Maoyi Xie --- .../marvell/octeon_ep_vf/octep_vf_rx.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c index d982474082..7af6a80671 100644 --- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c +++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c @@ -431,6 +431,26 @@ static int __octep_vf_oq_process_rx(struct octep_vf_device *oct, struct skb_shared_info *shinfo; u16 data_len; + data_len = buff_info->len - oq->max_single_buffer_size; + if (DIV_ROUND_UP(data_len, oq->buffer_size) > MAX_SKB_FRAGS) { + desc_used++; + read_idx = octep_vf_oq_next_idx(oq, read_idx); + while (data_len) { + dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr, + PAGE_SIZE, DMA_FROM_DEVICE); + buff_info = (struct octep_vf_rx_buffer *) + &oq->buff_info[read_idx]; + buff_info->page = NULL; + if (data_len < oq->buffer_size) + data_len = 0; + else + data_len -= oq->buffer_size; + desc_used++; + read_idx = octep_vf_oq_next_idx(oq, read_idx); + } + continue; + } + skb = napi_build_skb((void *)resp_hw, PAGE_SIZE); if (!skb) { oq->stats->alloc_failures++; -- 2.34.1