From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 006913A75BB for ; Wed, 15 Apr 2026 15:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776265786; cv=none; b=TCXqelBMrFsIksMqmTshIzjLyi0hlbIN/TYpXTSF4hM49qcGkwDIHmPnJu1uRz3CVJcjbKcvOV4ZcNXtTT0a2O9uU23ymYaoWWSdnztDewmQFy6k2dkl46c4uLjSXdFVCReBBs4TuRHA761v3DBVBnGRKNRFlcY+rAT2y/Qi388= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776265786; c=relaxed/simple; bh=B5WKSuazSjYIg6pXvSVj3VKZEuyDVABRTNFWpy0TJsY=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=mo7PvpRMWzOrhpL+5h6Gsqjr04wU6bpdktZEjNvDXyU2hgSyG2DgZEiWBVkUGJ2HMRe+WwqKa81hROQ4TzbW84wQoUSOl8AkAyFBrUSCMFnVhUltE5FmuMhhfHlNva/3NZGlhiXt3gD109OeL0hNVMtpzGR+DL7PrfvvUFQ3gkg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=QrGg9Jb+; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ss/WZkPg; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QrGg9Jb+"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ss/WZkPg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776265783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SFZ1c4j1EFVbHkK0HGQBwId3xqOOHFTPClHfmjw9dVA=; b=QrGg9Jb+XofV/2WXVRRL3Uvjf2ZVn0c+vg4Ii8C39aule0y3je859puq4xgfucnx2mr8CN gcvLmHBqS2JoZXKfGqHwi5RwTQet45iRagYdakPToV4G2giRC+dsuB6sNWOPVWVlr65NNN nj4WsiLGqnrBmrrWOqq22FvL/qTA5u4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-l4Ysxma2PT6E_3Via4Gtyg-1; Wed, 15 Apr 2026 11:09:41 -0400 X-MC-Unique: l4Ysxma2PT6E_3Via4Gtyg-1 X-Mimecast-MFC-AGG-ID: l4Ysxma2PT6E_3Via4Gtyg_1776265780 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-43cf5b4dac8so7329476f8f.0 for ; Wed, 15 Apr 2026 08:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776265780; x=1776870580; darn=vger.kernel.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=SFZ1c4j1EFVbHkK0HGQBwId3xqOOHFTPClHfmjw9dVA=; b=ss/WZkPgQ00Ewmq6HAhvkQILiKp7EPKVX4vuMuE7LLDAqjLS4ty2/IsfHFhn+QgxZO aY25rMpvw+ywop6bwIaIMHc7NNllpHqL21tKsVugMgyqOgp4kUGUfaxWWMatbGaXTRX1 Y9LCwOHOdtqWaJvqyE/fB5oSYNQaFbcYeaidBgmSOcrq/LVVmdbeNulE36gJMzuFIkwY IQMQI71diKi5c8WMj7lt8HsrSZLy5byx0UMMI31fUMk/oojTBxQvgV7MNojBhXMOjvjq w6sWVSmt0INE98V8XDNETWSLt6B7r8IZYUrYBPg7kjRrtkFpfy10GuYE9DvC5Or3WhvH pYKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776265780; x=1776870580; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SFZ1c4j1EFVbHkK0HGQBwId3xqOOHFTPClHfmjw9dVA=; b=TtXQQRK0MpsRIY4H05i1JqJHYgUihY/1Oa/cXKYlXi6ehBCFGaTEVoovt1twrLWDvB HYuUN4R7JQig8zG+IvLnXJQ+zCf3n8ijojPvb2gPFZ9jWT0GT3lJPHAcAaSgZ7UG0YU6 Yi82m1d/rQleQYw+JWYuNWt9hfyHkU2vXoxptScrpptQ3zwVWwPR4RXklRzsK6i5auGr te5zU4+5FMSnSePa5hApH74NumL0BIowDo67tho88uFx8SY24F24CSRRa5Tet2/axHJG rk0HXxor+t7qaSGBYyZ446SnKI2fHnMiKjmoCTuL6MWBZ/Q9zZCnWsgE1vAw4NEVNfa9 90pw== X-Forwarded-Encrypted: i=1; AFNElJ+gbAd4abeOMfDjmaYXrUPmgqSjuzmesZo0hAQpyrE7Y87ahurqH/quqUDVPIfOpkj3/TudMHD8axR23QI=@vger.kernel.org X-Gm-Message-State: AOJu0YwlhosSwoUcCgrFn+pVrFLP529573eGtXfg1krQ5xPrUHn0yfLI Os2RTP2V3TM4x4VO+puztHa3xi0sKdkUeeNkBHY9z3wxe5pkkeBRU9yeuxOo5eJtgW6cohaH7LH so8Tp6gIZPLuMAiYIPg86osGI/5kbaap2n2L4pgMFGdvlbpBtTE3F27glJRg5f4CMbg== X-Gm-Gg: AeBDiesbJ1WnudzEykrWjj8at0LgviszKIYmwwjWyzubZTCEdPCdhDT8E9hus5Erjx2 rdkMDyEV97ECM73Q0UCOi5dSs3VR4LPSKX/k3mwtxyIcIex1Rh5GK/39Ygn444mzHSb+rlYmBvV Xd8s+1ofx04fu5+18cgVSVNHgM7c6GBj4EUGAO0ISlEBL/IwNHowK928PxiR2rWExL2alfCjtDz TtHLuC9Jky+iBA4KzqFcPzwIbcjhNl9PUlwhPhTEiJS3KV67Wf4ULfel7A38NMzBKTVHRcgaD6p ek2TdBPoWO1Vom+bQQ7X5qOgo8gED2PUzkS9cTPZEJxWMCIwx/nl9hkddW/0J9B8DRL2+EQF0Iq pZ66CeIu3b6ljBYZ40PKRG6aNX5Jq/VnG77PNE+5cogddyd0I4Yzs5tr6l3SA X-Received: by 2002:a05:6000:1a8d:b0:43b:3d4f:e17a with SMTP id ffacd0b85a97d-43d642cd287mr33797803f8f.37.1776265780074; Wed, 15 Apr 2026 08:09:40 -0700 (PDT) X-Received: by 2002:a05:6000:1a8d:b0:43b:3d4f:e17a with SMTP id ffacd0b85a97d-43d642cd287mr33797739f8f.37.1776265779553; Wed, 15 Apr 2026 08:09:39 -0700 (PDT) Received: from lleonard-thinkpadx1carbongen13.rmtit.csb ([176.206.19.176]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43ead35bf1esm5907557f8f.16.2026.04.15.08.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 08:09:38 -0700 (PDT) From: Luigi Leonardi Subject: [PATCH net v4 0/3] vsock/virtio: fix MSG_PEEK calculation on bytes to copy Date: Wed, 15 Apr 2026 17:09:27 +0200 Message-Id: <20260415-fix_peek-v4-0-8207e872759e@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-B4-Tracking: v=1; b=H4sIAAAAAAAC/2XM3QrCIBiA4VsZHmf413QddR8R4fSzSbQNHVKM3 XsiQUaH38/zrihC8BDRsVlRgOSjn8Y8iF2DzKDHG2Bv84wYYS0RhGLnn9cZ4I5bxWWvuGg74Ci /zwHyraTOaIQFXfJy8HGZwqvkEy2nT4l9S4ligrVlUjgDTsr+FMAOetmb6VEqidVSVpJlyYAdF LVG9dL8SV5JKirJswRpNWgrOqf4j9y27Q3PqHqgGgEAAA== X-Change-ID: 20260401-fix_peek-6837b83469e3 To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Arseniy Krasnov Cc: kvm@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luigi Leonardi X-Mailer: b4 0.14.3 `virtio_transport_stream_do_peek`, when calculating the number of bytes to copy, didn't consider the `offset`, caused by partial reads that happened before. This might cause out-of-bounds read that lead to an EFAULT. More details in the commits. Commit 1 introduces the fix Commit 2 introduces some preliminary work for adding a test and fixes a problem in existing tests. Commit 3 introduces a test that checks for this bug to avoid future regressions. For disclosure: this bug was found initially by claude opus 4.6, I then analyzed it and worked on the fix and the test. Signed-off-by: Luigi Leonardi --- Changes in v4: - Picked up RoB - Increased sleep time from 10 us to 10 ms - Minor changes to commit messages and comments as suggested by Stefano. - Link to v3: https://lore.kernel.org/r/20260414-fix_peek-v3-0-e7daead49f83@redhat.com Changes in v3: - Addressed reviwers omment - Dropped test client, reusing the one already existing - Minor changes: added comment, improved commit messages - Rebased to latest net-next - Link to v2: https://lore.kernel.org/r/20260407-fix_peek-v2-0-2e2581dc8b7c@redhat.com Changes in v2: - Addressed reviewers comment - Test now uses the recv_buf utils. - Removed unnecessary barrier - Checkpatch warnings. - Added new commit that allows to use recv_buf with MSG_PEEK - Picked up RoBs - Link to v1: https://lore.kernel.org/r/20260402-fix_peek-v1-0-ad274fcef77b@redhat.com --- Luigi Leonardi (3): vsock/virtio: fix MSG_PEEK ignoring skb offset when calculating bytes to copy vsock/test: fix MSG_PEEK handling in recv_buf() vsock/test: add MSG_PEEK after partial recv test net/vmw_vsock/virtio_transport_common.c | 5 ++-- tools/testing/vsock/util.c | 15 ++++++++++ tools/testing/vsock/vsock_test.c | 50 +++++++++++++++++++++++++-------- 3 files changed, 55 insertions(+), 15 deletions(-) --- base-commit: 35c2c39832e569449b9192fa1afbbc4c66227af7 change-id: 20260401-fix_peek-6837b83469e3 Best regards, -- Luigi Leonardi