From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 64B4447B41D for ; Wed, 1 Jul 2026 11:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782905321; cv=none; b=rtDFv2jkNpZzYD6DgFWKtXMz31lcaxu4x5xZTkCbMmu699kBYP5I/2GFET8ldOZ5Wopacjdkj6zBstyeOIqvGfp/GFaMgXt2ypn0U1+bii6QgWg53TnBqSh2h/pmz5S5F2eV2G+5+9k8ZtdMtQv1wewDY4xeTfh3S+kMZNXKL6s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782905321; c=relaxed/simple; bh=P8kmY5D2FfcPbtlnmqGmPWI+pDbwez4b4y6ZgebXYrY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KqqYrFW5zfB9x1wHbFgmIp781DVweQ7HRIFAeZ0LEYAe0/lawQYjnzM/HUzWcJ80sJgWIp8l2iKOAxMwCpaunRqcg2TqaavQgc2oqEengtwVVxe3IeMTEMNSokVlIo1dH2ueMzTuvpUky/JDbZY7NhmKkpfSlMR9BTgWeSY+f1g= 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=p9V5LR80; arc=none smtp.client-ip=209.85.215.171 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="p9V5LR80" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c9aaa90a791so172051a12.3 for ; Wed, 01 Jul 2026 04:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782905318; x=1783510118; 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=IkD5Lx6bDM8h0NlxCAhhMs/17IvesNqBMvWLCpxBmws=; b=p9V5LR80uuFqnNER9S8p2mzdU+Vh6p/6wfAUjC7duAmPppc8cUD4bECBMJWlYYVUM4 ECKuiv1eUUW2J0fxHro3D5fYBE5W3QtkoOaq0I2zP2ZE291P6mOdJ7aGX8uaba6Sgwwk Itb3JzeFgVgtRM9ZKTJJYvrMX8xjCA4yCL1oxZqw76NqGFYk8gJeaX9wwGxLxSygdxXN K7PnCkYA4T8BuERAQAe+bWurSVZLECWFmg6oIU6qwSnoe6WJDvq83JOkW7jqvKjPAnUo fuZfWh4nn1H7aNw+kCcnODVD17AVJrZZQjXbGbD69jZCh9pBEv7x2lMGPgHOEYE37T7H LkkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782905318; x=1783510118; 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=IkD5Lx6bDM8h0NlxCAhhMs/17IvesNqBMvWLCpxBmws=; b=KPkDGUNg++qMfe0ZvLHHOTXxAabwB8In/ynj5J0re/UoVzqvvBCSKl50ImE9re9nZu X5wJA9eWAnSEgNcv0lUChS04qNPKZLMccxH/nOZ+7daaotljCbME0gT8cJePbuvpkz8X l2SX+YN+sAzDkgCvhXe2swS/vYkXwpS1EWq5KTNp1kxEoHGScbzCZa1YNh9FyZNtuVFJ SQgwM9+KbQKUbv71eLtAOGFukN1ya+3JqxCA93vjww0eVIGXLrqgOK7YG5XLH5LFhGFG kQQIjzHImOEk/LGR0hHxcAFDnoo/BSBdKsdDyaWRNyiZuNi4DYzIV62hgFEeN4uGOk+n Z9Ww== X-Forwarded-Encrypted: i=1; AFNElJ+Txjf1ZGe1dz6PaRgeDAtAcUlvf1iR2IlepnxoZ2gnSYHFl8TLWN6SX8cUS86dBsC95/cN81ZrNTY3TQE=@vger.kernel.org X-Gm-Message-State: AOJu0YyWNGjD38blzoIPGmQxwxYgWaiqtRhsLKgRelN7EDLurCGqqpUp c2EIg/tSP4gdg9U4Hc+wN+GxRek2r1xafxCpusX4xAdWg6HvIIMEn/+e X-Gm-Gg: AfdE7ckPBcgv004D4LCcetQ3JzjCKNnS1Wx6QpBh7Pgz9+OQgLIu/KmsC2ltyWOmEoT PLGKtLvawwiGxWp6MrcsmT03ZoXbxFjLdz+pwdcoCIEGLhMmKRYWzpSKDnMJfDCZ/WjOb8mce8h M0aiEVeA5mIQx4Sk9+w6TKLqO6a0sjFkIdzn139At0KAodBztgsriViBKFshUIwEv89ySsZm7wn tCr78+zaTxaY8owfP4gLCcisBrxExthei+AAsAlFrZ/P4lKQljcSX/2269En6+U+gfCxfBDdsip 4vV63KbJomQ4DzNC8hY2HJQjMoRzkIfCR5/JwUL8hDLfr9pirQvZA9wFDn1SplDm1W5mRfjnkLJ N8YVT1j7qksXKMsjKrboCoDUVEv5aPJSxx74G7IO9mk7wUg0Pc3vnoIyILLdaLhcRrvWNB/YmQF ei09Xv+E3EtQ3Bn8HybLM5S8EPgsLFVMlf0ILNG3hh/NjiAs4E X-Received: by 2002:a05:6a21:3987:b0:3b4:736b:da45 with SMTP id adf61e73a8af0-3bfed47a34cmr1352711637.31.1782905318365; Wed, 01 Jul 2026 04:28:38 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c9bbff28998sm2934290a12.22.2026.07.01.04.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 04:28:37 -0700 (PDT) From: Maoyi Xie To: Veerasenareddy Burru , Sathesh Edara Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 2/2] octeon_ep_vf: fix skb frags overflow in the RX path Date: Wed, 1 Jul 2026 19:28:25 +0800 Message-Id: <20260701112825.1653044-3-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260701112825.1653044-1-maoyixie.tju@gmail.com> References: <20260701112825.1653044-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 driver now drops a packet that would need more fragments than the skb can hold. It drains the descriptors 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 --- .../ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 17 +++++++++++++++++ 1 file changed, 17 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 d982474082423..2e666df26b4c3 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 @@ -463,6 +463,23 @@ static int __octep_vf_oq_process_rx(struct octep_vf_device *oct, shinfo = skb_shinfo(skb); data_len = buff_info->len - oq->max_single_buffer_size; + if (DIV_ROUND_UP(data_len, oq->buffer_size) > MAX_SKB_FRAGS) { + dev_kfree_skb_any(skb); + 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; + } while (data_len) { dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr, PAGE_SIZE, DMA_FROM_DEVICE); -- 2.34.1