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 D9BD1436374 for ; Tue, 5 May 2026 12:44:27 +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=1777985069; cv=none; b=IF2oq82NUvEp0IpFDhuG7mXuFPheyFzWaPU0F1Rtix04TbHKxhsKVs2mr8DAnrns3DXxYJn1FGtfFnSYtkBuaXsAORHKfWWIZo8hK4rY31WOTnCeKuoxu+o4Z5tumhyRzfDRJVLZ1FYxG7P1CfGjrS9RARBUKIXAp/JJm1AJ9s8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777985069; c=relaxed/simple; bh=hz98aOu66uNVwuTZiRLja0C8i6pImQOrnxxcY7S6SyA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: In-Reply-To:Content-Type:Content-Disposition; b=fkFG8pwjf4/VQskA1yrjesELFD/gfadqKNeqjhftpWsEE0lj8kTghQpraqkSn4dPc2kPGi7gzMXhfKpH8bxdHXeirmj3sXEgIITLlUZl5jA2wGMat0sd7I7LXYVrxT17kJtWK5JD46KTx50XSsfZR62EsQVqvYx1E7OlACDYMEs= 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=DzviqUdF; 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="DzviqUdF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777985066; 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: in-reply-to:in-reply-to:references:references; bh=jwSGsuiyqii/zr4WOQ6nXZFN/nOITIhLrEP6HdZcP9o=; b=DzviqUdFdPDAtFQk2u8mHN770INivLeV/SiEbS84QhWgs382OSGZxCa3jgW7HvdpJB/rDV u9D1mD+TAOkau6YYKS4DnQ1mdMZ1Cg8wjny4IKa++RF48EZ2qHn1OOnl32Ihssbabji8jV aHJilfuvdBgqJx6f4O0GdxbvV/Q2Ui0= 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-627-eqoRWbVMPSOW2mUYtAhSgw-1; Tue, 05 May 2026 08:44:23 -0400 X-MC-Unique: eqoRWbVMPSOW2mUYtAhSgw-1 X-Mimecast-MFC-AGG-ID: eqoRWbVMPSOW2mUYtAhSgw_1777985062 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-449b2a183d3so3185173f8f.0 for ; Tue, 05 May 2026 05:44:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777985062; x=1778589862; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jwSGsuiyqii/zr4WOQ6nXZFN/nOITIhLrEP6HdZcP9o=; b=cBPm7YhkPAzZ4GPsppYUE+cbvL2d8C1c73gX3zDFIY6rA2zq8H5YcGkobwhpZhZDLS AcngcGDiXNGfiQVI4Xxx/yjLX1AKTKs+2fhjRJlTrgGabvBMaC9lYbePDVff4fRCDkuj N5AICbZ++kFpmOpCylUNqZovNJF++TMQfQ+L+G0Ym1uxUk8Q0Ly/Kh39n+S0yCn6V44q YBebjJadqbJ6rZXp4tjANqNHuEKBX5E1EqwtAe4coHWUcCH1hrnNI5EqRYwgUa1wX3t0 sEVsH9XtBYs9fvIO6Lu4qRyFLzEf2zTVrXyR3HdRUlrLZOVX11xoAya86jLBr6FEwsRb Ki0w== X-Forwarded-Encrypted: i=1; AFNElJ/N5fwNe18K+kKAHE4JsonTuYFu7XbxNekdb7mosptZ3JM8K2F+B1M/0ozTTiZqFptmVtAp1suICjvfY9q1cA==@lists.linux.dev X-Gm-Message-State: AOJu0YxP5cjMqzS/MDrAgfUX3J7jIdd2jwS+eH7ldc2ZKXM9ZJPUtreK ilYI8peZ+treH1N9lJHN/QFrJUlBk7E9yInbDVnsgt5m5vYRu5xrEEjo93r5BNSe0obFV7Xz7A6 RkjryqwyuaCpFs6E9S++V6ORYnT8o07Edr3zX+Rv0EfDGYBw0eAHLJ/jUNKRRWx3M1Vcx X-Gm-Gg: AeBDiev/csJX7sP96qALosbBeYY/b7cV25V6n58r1MZKAy0764fTxfRH8sEC9rcAqve cdWpKeNOImgYvRVKkaKESofzYxiv8Y5OZPJcS1VJON2wdaWKXCgdzaCYR50yl9MhwgUqOsvCUFO wCMxTxI3Dls0FGMHVLiN42GgnqIzxD8z66/PQ2bc4bIVt0YsfWnb3nTJ1tiJeKfAxtMaJMVSXb9 vrzQX494S1c4s43pSZ6BYpwbd1drqT3T5za0mYOl6PAWPa47XeGrAiCaAUYHGpAZZZ1QyB6GvmR Bj9yO+T8BPgqRPxKOHozh6aOjf2GmAN3BlAncL1QwQc2EXJ+fEtsHqYainxhGX3YOztv81WOGp8 Axrzi1NtEbfH0WG3OZuf4u4u1kzYEYu+9HLtybSNBgPPIovZlV9o44Hz/pST3AhQKQ7MBU4YFig == X-Received: by 2002:a05:6000:186b:b0:449:b7dd:4a75 with SMTP id ffacd0b85a97d-44fdee4405cmr6456578f8f.20.1777985062378; Tue, 05 May 2026 05:44:22 -0700 (PDT) X-Received: by 2002:a05:6000:186b:b0:449:b7dd:4a75 with SMTP id ffacd0b85a97d-44fdee4405cmr6456485f8f.20.1777985061805; Tue, 05 May 2026 05:44:21 -0700 (PDT) Received: from sgarzare-redhat (host-87-11-6-2.retail.telecomitalia.it. [87.11.6.2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505238e6e0sm4243514f8f.6.2026.05.05.05.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 05:44:21 -0700 (PDT) Date: Tue, 5 May 2026 14:44:16 +0200 From: Stefano Garzarella To: Paolo Abeni , Arseniy Krasnov , Bobby Eshleman Cc: stefanha@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, horms@kernel.org, Yiqi Sun , kvm@vger.kernel.org, virtualization@lists.linux.dev Subject: Re: [PATCH] vsock/virtio: fix vsockmon info leak in non-linear tap copy Message-ID: References: <20260430071110.380509-1-sunyiqixm@gmail.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jqSmE6KtpPLQMb5ABUQY9ZpIcNM8Ed0gzaWj9WVtSr4_1777985062 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline CCing Arseniy and Bobby. On Tue, May 05, 2026 at 12:26:21PM +0200, Paolo Abeni wrote: >On 4/30/26 9:11 AM, Yiqi Sun wrote: >> vsockmon mirrors packets through virtio_transport_build_skb(), which >> builds a new skb and copies the payload into it. For non-linear skbs, >> this goes through virtio_transport_copy_nonlinear_skb(). >> >> Helper manually initializes a iov_iter, but leaves iov_iter.count unset. >> As a result, skb_copy_datagram_iter() sees zero writable bytes >> in the destination iterator and copies no payload data. >> >> This becomes an info leak because virtio_transport_build_skb() has >> already reserved payload_len bytes in the new skb with skb_put(). The >> skb is then returned to the tap path with that payload area still >> uninitialized, so userspace reading from a vsockmon device can observe >> heap contents and potentially kernel address. >> >> Fix it by initializing iov_iter.count to the number of bytes to copy. >> >> Fixes: 4b0bf10eb077 ("vsock/virtio: non-linear skb handling for tap") >> Signed-off-by: Yiqi Sun >> --- >> net/vmw_vsock/virtio_transport_common.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c >> index 416d533f493d..6b26ee57ccab 100644 >> --- a/net/vmw_vsock/virtio_transport_common.c >> +++ b/net/vmw_vsock/virtio_transport_common.c >> @@ -152,7 +152,7 @@ static void virtio_transport_copy_nonlinear_skb(const struct sk_buff *skb, >> iov_iter.nr_segs = 1; >> >> to_copy = min_t(size_t, len, skb->len); >> - >> + iov_iter.count = to_copy; >> skb_copy_datagram_iter(skb, VIRTIO_VSOCK_SKB_CB(skb)->offset, >> &iov_iter, to_copy); > >@Stefano, @Stefan, the patch LGTM, but sashiko pointed out to a >pre-existing issue you should probably want to address: > >> to_copy = min_t(size_t, len, skb->len); >Does this length calculation account for the offset when a packet is >split across multiple transmissions? >If a packet is requeued, VIRTIO_VSOCK_SKB_CB(skb)->offset is increased, >but to_copy still evaluates to the full length of the skb. Yep, I just checked and vhost-vsock is the only place where we call virtio_transport_deliver_tap_pkt() wiht an offset != 0, but I agree that we should also fix it. Looking better in net/vmw_vsock/virtio_transport_common.c I think this is a regression, indeed we have this comment in virtio_transport_build_skb(): /* A packet could be split to fit the RX buffer, so we can retrieve * the payload length from the header and the buffer pointer taking * care of the offset in the original packet. */ pkt_hdr = virtio_vsock_hdr(pkt); Before commit 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") we read the payload lenght from the header that is always set to the right value before delivering the packet to the tap. From that commit, we don't to consider the offset anymore since we started to use `len` from the skb, so IMO we should go back to what we did before it, I mean: payload_len = le32_to_cpu(pkt->hdr.len); @Bobby do you remember why we did that change? Or if you see any issue going back to what we did initially? Also IMO we should avoid to set all the iov_iter fields by hand and start to use iov_iter_kvec(). Plus, we can just use skb_copy_datagram_iter() in any case, like we already do in vhost-vsock, since it already handles linear vs non linear. At the end I mean something like this: @@ -171,7 +150,7 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque) * care of the offset in the original packet. */ pkt_hdr = virtio_vsock_hdr(pkt); - payload_len = pkt->len; + payload_len = le32_to_cpu(pkt_hdr->len); skb = alloc_skb(sizeof(*hdr) + sizeof(*pkt_hdr) + payload_len, GFP_ATOMIC); @@ -214,13 +193,17 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque) skb_put_data(skb, pkt_hdr, sizeof(*pkt_hdr)); if (payload_len) { - if (skb_is_nonlinear(pkt)) { - void *data = skb_put(skb, payload_len); + struct iov_iter iov_iter; + struct kvec kvec; + void *data = skb_put(skb, payload_len); - virtio_transport_copy_nonlinear_skb(pkt, data, payload_len); - } else { - skb_put_data(skb, pkt->data, payload_len); - } + kvec.iov_base = data; + kvec.iov_len = payload_len; + iov_iter_kvec(&iov_iter, READ, &kvec, 1, payload_len); + + skb_copy_datagram_iter(pkt, + VIRTIO_VSOCK_SKB_CB(pkt)->offset, + &iov_iter, payload_len); } return skb; And removing virtio_transport_copy_nonlinear_skb(). If you agree, I can send a proper series with these changes that should fix the issue reported by Yiqi Sun introduced by commit 4b0bf10eb077 ("vsock/virtio: non-linear skb handling for tap") and the issue introduced by commit 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff"). Thanks, Stefano