From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 6F2A537FF42 for ; Wed, 10 Jun 2026 23:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781134185; cv=none; b=pqm6irjYTLnnENLor9RDrfG1rpq/XdcBMcaPdN3JsCrFZrWMMsryLT700AmWyqbgT90HjXwDfw3HJ8t/ogEk1tyR9OtctchvqoOtGTDujC+T33V4JeYyEc4cuoEze60u/6OUWwA7gKHYUVv3TVu6YuY40sneKYq5GdDy69cT3BY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781134185; c=relaxed/simple; bh=VmL/XyDWEuE0QsbaGtnBZ4YmZiYfGkfte0l+rUVpi6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mniEQk5gcopp7zMAiSSJBy95wMgy0lPHg8JiQ1q6+owDyXLEM2iwFmXt747gwSuF1IrA8j+UIZPwib7d/g2rArQu9+EuakMwhVtaF2gMFmUtELquZWhBTba/BYY9oRo0aDkxuMy7JTBHRcNxYpP/Xm2owYrSzWXlsp3ud6V9k5U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=asu.edu; spf=pass smtp.mailfrom=asu.edu; dkim=pass (2048-bit key) header.d=asu.edu header.i=@asu.edu header.b=L4xJmNka; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=asu.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=asu.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=asu.edu header.i=@asu.edu header.b="L4xJmNka" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2c0bd02d97eso81953055ad.2 for ; Wed, 10 Jun 2026 16:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu.edu; s=google; t=1781134184; x=1781738984; 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=Tbtqprzo1bFuxnDYsSnM79zDHYhOXlVVzm5C0yyeVNM=; b=L4xJmNkajTQd1/8Q7apZ3vCN55xFiWC2y/gY3+cFpgAJAacoJ+hY2Ab9pasuy86G+j JE4KL4YEmdvdEyfeNbY4ZLUDzfeyDta74zS0nOP1uuXDs9QOR7SltgMfFA2zhc/aEqY6 bwfoOKZbqTO+a0qjA+85EanBUR3Wt2W7ryJDB9FL6rgMifWz2lJyolq5Kez/DpdZ6YXN b1ep5TobOIm5eHQt01mSGSQ5rSJgBkKNzTdPif16fTI1ixM0e+F7hyOS+qPqsFYxTzPX a74iN+VpGLCnVgjmdUp3P7Q6Y6MSsOmpI++uVr36Q1sDy91FYnDAzLpeVy2w8PYtbmjp nGiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781134184; x=1781738984; 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=Tbtqprzo1bFuxnDYsSnM79zDHYhOXlVVzm5C0yyeVNM=; b=J37NDfggV6G+wlpVe8gS7U+x6+is9WYHW+xfjy6qFzUfixdDIKjlGqXMDT6mujNKhm 8r2gfFhrYZ/72shj6HDJR0iVpy1rHGXXSeivfcj2oc+jZbNX/O0sHV1d9ViTEOQjCxrZ LK6dUb+pXn0P2dd+3wlLzC35BhNLYOJMqnXhZu7IXv4Uc7qRJcFhrq9uLdFuQGnGsV+Z apIBJ4lxuL4o2orOLCEmKlkri8fsgLf/x1W94AUvHDxBeca98MWM9ZFJ7Ho50TR1fv0k i7ZKH42se9BX22/V8p2o4mERv3UuGILUn0e654KIQuLhaUj+LlMczgnORMOnE8q+BvoA /+JQ== X-Forwarded-Encrypted: i=1; AFNElJ+D7lnL/o5NJRYMpfl6edfsUol7P8c/Ix37kaDmboAdsn3vxC+65WJQAcfOnOLo2sY2/zVooSnpkUfS07A=@vger.kernel.org X-Gm-Message-State: AOJu0YxkFbPsxYZDDjwVnUtnWIrqbG/fxHGfSod3k4WCbEXDz+gGyjFz U9OuIcCJ8ZgYL18/Kfbj+gCnxzRf5iM/B9/gX5fnsIK2SXnvBJbAhS4l541bYYOQVw== X-Gm-Gg: Acq92OGmBIGtgCYiLBe/57I8SvOWUyBLfJgjZ+snFH6okwiutJ3LVZrhjTItTlHzZYs KT2mwAwYfcEPmwN1hnnbmgJWWujBU9+ZldUeiY2sw4HCBbuQyz0pf5AoFyNPf1u7MuPDzZmWjQW 7syXJ/GswzatOXXVpdrtzOOuwrCne5D95JQEw83RBTq1jZ4Ojiuiua84cm7TT9MrC6+vTfg0QvT G2uHJnxSyGUXFrYbaikznaAwwFno7MdX6nAq9owJFfr+HKReOopia8aYxim8HIsqwPk7b2McYIr gR8vlgNQk0wxEf3cL3INMtDkYWWHTbpiwrtdO14HYWmnAoJ9si/Kv1JQsnagqzZuZ+ywv329GMg A8vD3qStnebSE6Fqz2hMLBOtWSvI13MHNsKf+ZdXIMc2BH0ki44KoxmRQhrq9o8A9pDRtY7z9G9 IOWuL4aM2pb69Evqqw/J6BbyPh2u440g== X-Received: by 2002:a17:903:3b83:b0:2c0:ab82:6ba7 with SMTP id d9443c01a7336-2c2f3055e26mr1288055ad.33.1781134183883; Wed, 10 Jun 2026 16:29:43 -0700 (PDT) Received: from p1.. ([2607:fb91:1582:d2f1:7bbf:a7c4:749b:120a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16629d090sm242781845ad.55.2026.06.10.16.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 16:29:43 -0700 (PDT) From: Xiang Mei To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, minhquangbui99@gmail.com, bestswngs@gmail.com, Xiang Mei Subject: [PATCH net v2 2/2] virtio-net: harden page_to_skb() big-packet frag loop Date: Wed, 10 Jun 2026 16:29:36 -0700 Message-ID: <20260610232936.1176094-2-xmei5@asu.edu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260610232936.1176094-1-xmei5@asu.edu> References: <20260610232936.1176094-1-xmei5@asu.edu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is a robustness hardening patch. The slow-path frag loop in page_to_skb() walks the page chain via page->private until the device-reported len is consumed, implicitly trusting that len fits the chain. It does not stop when the chain is exhausted (page becomes NULL at the tail), nor when nr_frags reaches the end of the static skb_shinfo()->frags[MAX_SKB_FRAGS] array. Both bounds are needed: the chain length is big_packets_num_skbfrags + 1 pages, which for an MTU-driven configuration can be well below MAX_SKB_FRAGS, so neither guard implies the other. Make the loop self-defending so it no longer relies on the caller having validated len: stop once the chain is exhausted, and never index past MAX_SKB_FRAGS. No functional change for well-formed input. Signed-off-by: Xiang Mei --- v2: robustness patch drivers/net/virtio_net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index afe73eda1491..518c22fa1b68 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -906,8 +906,11 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, } BUG_ON(offset >= PAGE_SIZE); - while (len) { + while (len && page) { unsigned int frag_size = min((unsigned)PAGE_SIZE - offset, len); + + if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) + break; skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, offset, frag_size, truesize); len -= frag_size; -- 2.43.0