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.129.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 8C2EC3D890F for ; Wed, 15 Apr 2026 15:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776265787; cv=none; b=TAapJcbh76MEd/ZAPrVHesYcrupp2hqGOOKVk0ymiL8E3R9V9AEHr899nsE30dlWxx6LAd71BXxtioi4vu5A5rtI5X6HlZJRFteds8XgLCtewiXdWKmMwFgQligkePEmQnQ0WIKXGZcU0fmnKvKgljEi0kYyh4whoOvElTQzDrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776265787; c=relaxed/simple; bh=8KxSLwY587LR57aGsCLpqgDw1kJidOt4vFYe6TGecyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m0Ix/E1CrGOefZ9Wv9h7J009OHeDgw9+DW9Sx2sDueqSIcopfJ/tzG6EUqxH9NEzJe+SaydxjLa8TdbFyBcZQmpuVApWKGY0x8i7jFuELM6Hvy+y9uBPpzF63tgsljybo67csxdtcdy1fp7/hjJV1Hkj/yJL9ydYQiZFgLkBVss= 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=B3i75YCJ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=KuT5V+ZD; arc=none smtp.client-ip=170.10.129.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="B3i75YCJ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="KuT5V+ZD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776265785; 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: in-reply-to:in-reply-to:references:references; bh=GGbKEVk7Q+3WFRVihAcafbqDB4/UKYyFXHFteVNPtTg=; b=B3i75YCJCypjiEog0x0BthTUZZv2+T93KXOogawOe20DG5nZ4GavjoEJjWtFlVWNDr9Pim +35e9tz4saHZkc8b/fIzeRlaONKRLEO7DW2DZKtzp2Mda9edhNwB1uX8F816mdarD4ylOw JpID/ECRkjeuJJqaAjfTWRxvAutaduY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-153-Oy_CTsgmMmyYihzNiRvxeA-1; Wed, 15 Apr 2026 11:09:43 -0400 X-MC-Unique: Oy_CTsgmMmyYihzNiRvxeA-1 X-Mimecast-MFC-AGG-ID: Oy_CTsgmMmyYihzNiRvxeA_1776265782 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-43d7b7bacddso2281331f8f.0 for ; Wed, 15 Apr 2026 08:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776265782; x=1776870582; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GGbKEVk7Q+3WFRVihAcafbqDB4/UKYyFXHFteVNPtTg=; b=KuT5V+ZDxxwtul6OrsVNM8Sat89SsEhCBRx0bHYl/l5KUpaBA85cIRvWe1WrY24gjB ex453lm0Z0SJq+kD5nvTjO/giQ6Lj+QyV1tsL2syuK2TfEQRqrjARtYQJNYocaoq3ncq YD6aTD7DWoj9f0vgCFxodyhbONRIt5a78QOu1QDj6k0bxDJ7xxuF+K8NVueubrPf5Q// d77bZUus/+i+/EoYOjjWsCHP8rmnbYcpMXvx8HX6aeybJZGDafr2tPAHV7/f0B23B6R3 KKgDG4BNpzg9Vi2PsZvnuCaJYP8rDlQ3Ofv3eeQoe/6xLXSm11Fcz5XHwppwPMxrDf2p ZRxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776265782; x=1776870582; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=GGbKEVk7Q+3WFRVihAcafbqDB4/UKYyFXHFteVNPtTg=; b=NilISk3mo8ks6WKLOr23jAdDjqrkXQURc2NZmh7C+wm6c83fpklFkbvcX0UMPr4GBQ WXsQOf8gId22DSg+GUkPgy4HkqObBcDk2wbqZMQHVBdy3Rb7kfC/PQtH7A3sGnjiaAJ/ W7icUxsCSm/KXj6pGEWcVO6UJX/NxpMiaJYagND2HGph1txlLj7daak1+WS24aja5+la LlvCpCmETAS3Cgj2pM7hWk9JODllkv1C3RZtKHK0fB7Xop6fvG6tqe9gK/fsVoNM28u4 jH6F/aav6L2dAMasBK/0Ml8CFi5vkPtf3BqwKuJiAD2hiu5Y6t+dkqgtnF1LGUqTspCi ci2Q== X-Forwarded-Encrypted: i=1; AFNElJ+dKILp5sV8c3rpXBmD90mn6ASgMIBrWFeku9B81vHE9L2SGwAWc4cBXSJnmSxjmsCIonGBfurbJ9G+n+M=@vger.kernel.org X-Gm-Message-State: AOJu0YxSlwlylm8vzypuL1LmYpwF+6PO/6uT29IQ7oMbsJn89bf44VCT Y898X1CJUk+O/GImkR5ZV7Y2TsW2nqSUaicHwhxkV44FHB/YMWcWvIRQUlzfH4ddLNpxLw2UAtw cwQRfZVTmTbTChUIu0zvFbH+iFYpRz8MP9cpG6R1S/S025rpbLKATulJgypMRr6XooA== X-Gm-Gg: AeBDievgNGeq0dFZ0LlmL0YJOLuSglvkgf6X24jXQUYsY7goNcGf6ezqUwUsQYOaDQF zT/ZaBDt14JrIk4W6xhi1Q5qYGkDQhjGr8/j/h22Cbucm1PswQSu9znl8EhzV7TxQNRNC0eS3o1 rX36GE7tWT7Y2zYwqMq/2KAxAha/+nku36ZtRmFm7vzy97pHkX+JYWi7E4yoG5nLc1YvriJDKKK PcVeWPOCPCqw+v/+/6Y2vUv1V4l5TVhtvJTPqeng/ctgYvgyRtJd69Yk9F4xfzKfW0DcBX9rN+v OgAYlYVQdiX9WQYTOGgGXET3feMiTA3gLT3shsBXGDw382nmj62RBEhgt/XNu1kIbGbr+6jyPQ3 pMeIEBJFJckZjF9V8mIE7MxxY8m1M0TrAssBp/hMFuOedLJN7w/V0BIU+QrQV X-Received: by 2002:a5d:64c4:0:b0:43d:30ea:9383 with SMTP id ffacd0b85a97d-43d64259b42mr30842194f8f.8.1776265781763; Wed, 15 Apr 2026 08:09:41 -0700 (PDT) X-Received: by 2002:a5d:64c4:0:b0:43d:30ea:9383 with SMTP id ffacd0b85a97d-43d64259b42mr30842115f8f.8.1776265781194; Wed, 15 Apr 2026 08:09:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 08:09:40 -0700 (PDT) From: Luigi Leonardi Date: Wed, 15 Apr 2026 17:09:28 +0200 Subject: [PATCH net v4 1/3] vsock/virtio: fix MSG_PEEK ignoring skb offset when calculating bytes to copy 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 Message-Id: <20260415-fix_peek-v4-1-8207e872759e@redhat.com> References: <20260415-fix_peek-v4-0-8207e872759e@redhat.com> In-Reply-To: <20260415-fix_peek-v4-0-8207e872759e@redhat.com> 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()` does not account for the skb offset when computing the number of bytes to copy. This means that, after a partial recv() that advances the offset, a peek requesting more bytes than are available in the sk_buff causes `skb_copy_datagram_iter()` to go past the valid payload, resulting in a -EFAULT. The dequeue path already handles this correctly. Apply the same logic to the peek path. Fixes: 0df7cd3c13e4 ("vsock/virtio/vhost: read data from non-linear skb") Reviewed-by: Stefano Garzarella Acked-by: Arseniy Krasnov Signed-off-by: Luigi Leonardi --- net/vmw_vsock/virtio_transport_common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index a152a9e208d0..b5015ab2ee1e 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -545,9 +545,8 @@ virtio_transport_stream_do_peek(struct vsock_sock *vsk, skb_queue_walk(&vvs->rx_queue, skb) { size_t bytes; - bytes = len - total; - if (bytes > skb->len) - bytes = skb->len; + bytes = min_t(size_t, len - total, + skb->len - VIRTIO_VSOCK_SKB_CB(skb)->offset); spin_unlock_bh(&vvs->rx_lock); -- 2.53.0