From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (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 EE5142EC57C for ; Fri, 8 May 2026 22:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279439; cv=none; b=rOV4vSRhLrhWQTkRXae6bj4m7uFwxOf/z9Ea7+7M+eSkGohAKc09E4Z0xkXpvp9eF1yMeVWJlMnLJ3mLBkTtDN0QsYoJLNo4Qak0exteU2/Mpvhn4iX+FpxaLGab32eA80Drr4E6jGWnA+T7fxbHz5FyxhcDtBpfS1zKRpr8UjQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279439; c=relaxed/simple; bh=Wu5FDALBvzlDUGj+uhbPz25Y48g8JEEjaRm7yw3xXC4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Rbi+HVEONgSsngYDjY/u7HKd9bU3JQtk/WUSShgVNF9Nk1ginMtoQeLmP3LbdoLwYLJsSgjTgnHg842RN/8nXSyuP90MErCwt9CxORwso6Weyjx9YnC9XU1haJq9Gu5yyvr3hvHE0lv61+aGs00qj4By1qfAPTA5uCl7+8dRajs= 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=FiYOSPmM; arc=none smtp.client-ip=209.85.222.170 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="FiYOSPmM" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-8ee62a19730so290921685a.3 for ; Fri, 08 May 2026 15:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778279437; x=1778884237; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=2AUaxYCPCqaIbXtU1GhIn25HX53q6rl1plD/MbJsm1Y=; b=FiYOSPmM4YgttiUU3CDnyv9jYdys/B6dBcUX2p1bJ4o1rLQg374U4uXhcjqWjPgOpx BThusN6G8ZUqxLrBJn1eEaExAjlSEF6OkbUwkvWOwVPuEkzD+cKFzcsK7d+9E+pvfPD6 HrqdwZVDIvr9N56FOkZlqSMMp9AICF4cCmO3/tX62E0WCO5ZiQslGE9CXCS3oj0x+xWk pxJ52fBB9X0ka02ySEs6NvoctjAeh7jwpvqfl1Ku5iyT6JzZmPo+CO/4+HvWg0KREqsd E+O/wdmtKAUJh7bszODU2m7VW/CZxrF/ubSOhqUlJt8b081HZnhovARdOuOeHtjAYOgx U5EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778279437; x=1778884237; 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=2AUaxYCPCqaIbXtU1GhIn25HX53q6rl1plD/MbJsm1Y=; b=NvYxkqY1XcV7ZQkJdr+rneFzYehe6BbgAvtgPq3tDoUrOAyBgntk1Bq3fTuie+OvI1 QpewyfbFvz/A/RmxejLsVIQhREoEYEO7VCe/q9nqH7MIc8n05lgl876BwNke6IuXBlY7 2uWTKdEmFs+7j7Wx4Hv6HDiiYxH58j1AR/xpwUo7cI+1O/y0+Whan+eAOFPnik7tcRss rfDXiiOV7/wtIP2hGPoBSb01d7JeabJHHwfU7lRRFgjjUK6cKWZtrXfXxai2dcNImGs3 Aw66ymBLZuF8sdFGENnj8AYPTjC4rvmLr1DV+pf0N4iyUWy4kI5awRjSO5uBWuw+ZxEb 27FA== X-Forwarded-Encrypted: i=1; AFNElJ9lTlqb8umyK1gDHwU3DPWqIB1s/Rea8z99VTP5Zc8v0n41XOnznIOfhAI6pZwR/oAA7Pn8dWroApmX5OA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw36D6ZAEIrsIf2qG9HRkVzJsFZ+op6e4tiy1SRrx1CAd8y5dTj eriKm3+jNCfRN9bXqTE8OluL2XyHJXqdjsGv+7szCO7Hehnh8s1M3Tp6 X-Gm-Gg: AeBDieuqMAW6HX2kCE0Vp3c2NjOaKv8S4LCUVvvFGXZ5g0l9C8Hb6WN6FmGyrAu6U4k NjRwWVXtMJECLNgRcLMwAHjfZkmssKYeW9jT9YXxChoG3IYjagvXDhSzVKTD9UNM6gMFBmkEW8I uc+pU3CbSvPnsO/+zKF1u0GGzU9gYoIjDtF1dEGRxaYJXUrpMyu2L0UGId/Fg8btvCYlL6/gjPD ppZnQN+iOMW8L5SjE1YbZgsHaViJwIepo0BawT8GUWH3oSftK4Njy4NgLxPxejovN/uuIWmseNa dsX+FaXfcRr8+vyFNkht8y8OvbrzKlbo3NPqOsSODcT2xK0CwjC3rQikh+NLq0/IScKfjaRGFak +KOYWwh1QUS6O1J0jll2EEBfmTEsAWgMyFU6iPbetIlXLQkIi+FoL5kumZcQjulTOdje01oluXk eZslHl4WBOwWmmI4WCtlNmsLt/5uq82WelHqAw5XJEtYXR8Q0= X-Received: by 2002:a05:620a:2684:b0:8ee:630e:350a with SMTP id af79cd13be357-904d72c239fmr2149865085a.58.1778279436728; Fri, 08 May 2026 15:30:36 -0700 (PDT) Received: from devvm29614.prn0.facebook.com ([2a03:2880:f800:38::]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8fc2cd04c68sm2382574385a.46.2026.05.08.15.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 15:30:36 -0700 (PDT) Date: Fri, 8 May 2026 15:30:32 -0700 From: Bobby Eshleman To: Stefano Garzarella Cc: netdev@vger.kernel.org, Yiqi Sun , linux-kernel@vger.kernel.org, Xuan Zhuo , "Michael S. Tsirkin" , Stefan Hajnoczi , kvm@vger.kernel.org, Simon Horman , Bobby Eshleman , Jason Wang , Jakub Kicinski , "David S. Miller" , virtualization@lists.linux.dev, Eric Dumazet , Paolo Abeni , Arseniy Krasnov , Eugenio =?iso-8859-1?Q?P=E9rez?= , Bobby Eshleman Subject: Re: [PATCH net 2/2] vsock/virtio: fix empty payload in tap skb for non-linear buffers Message-ID: References: <20260508164411.261440-1-sgarzare@redhat.com> <20260508164411.261440-3-sgarzare@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=us-ascii Content-Disposition: inline In-Reply-To: <20260508164411.261440-3-sgarzare@redhat.com> On Fri, May 08, 2026 at 06:44:11PM +0200, Stefano Garzarella wrote: > From: Stefano Garzarella > > For non-linear skbs, virtio_transport_build_skb() goes through > virtio_transport_copy_nonlinear_skb() to copy the original payload > in the new skb to be delivered to the vsockmon tap device. > This manually initializes an iov_iter but does not set iov_iter.count. > Since the iov_iter is zero-initialized, the copy length is zero and no > payload is actually copied to the monitor interface, leaving data > un-initialized. > > Fix this by removing the linear vs non-linear split and using > skb_copy_datagram_iter() with iov_iter_kvec() for all cases, as > vhost-vsock already does. This handles both linear and non-linear skbs, > properly initializes the iov_iter, and removes the now unused > virtio_transport_copy_nonlinear_skb(). > > While touching this code, let's also check the return value of > skb_copy_datagram_iter(), even though it's unlikely to fail. > > Fixes: 4b0bf10eb077 ("vsock/virtio: non-linear skb handling for tap") > Reported-by: Yiqi Sun > Signed-off-by: Stefano Garzarella > --- > net/vmw_vsock/virtio_transport_common.c | 40 ++++++++----------------- > 1 file changed, 12 insertions(+), 28 deletions(-) > > diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c > index a678d5d75704..989cc252d3d3 100644 > --- a/net/vmw_vsock/virtio_transport_common.c > +++ b/net/vmw_vsock/virtio_transport_common.c > @@ -136,27 +136,6 @@ static void virtio_transport_init_hdr(struct sk_buff *skb, > hdr->fwd_cnt = cpu_to_le32(0); > } > > -static void virtio_transport_copy_nonlinear_skb(const struct sk_buff *skb, > - void *dst, > - size_t len) > -{ > - struct iov_iter iov_iter = { 0 }; > - struct kvec kvec; > - size_t to_copy; > - > - kvec.iov_base = dst; > - kvec.iov_len = len; > - > - iov_iter.iter_type = ITER_KVEC; > - iov_iter.kvec = &kvec; > - iov_iter.nr_segs = 1; > - > - to_copy = min_t(size_t, len, skb->len); > - > - skb_copy_datagram_iter(skb, VIRTIO_VSOCK_SKB_CB(skb)->offset, > - &iov_iter, to_copy); > -} > - > /* Packet capture */ > static struct sk_buff *virtio_transport_build_skb(void *opaque) > { > @@ -214,13 +193,18 @@ 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); > - > - virtio_transport_copy_nonlinear_skb(pkt, data, payload_len); > - } else { > - skb_put_data(skb, pkt->data + VIRTIO_VSOCK_SKB_CB(pkt)->offset, > - payload_len); > + struct iov_iter iov_iter; > + struct kvec kvec; > + void *data = skb_put(skb, payload_len); > + > + kvec.iov_base = data; > + kvec.iov_len = payload_len; > + iov_iter_kvec(&iov_iter, ITER_DEST, &kvec, 1, payload_len); > + > + if (skb_copy_datagram_iter(pkt, VIRTIO_VSOCK_SKB_CB(pkt)->offset, > + &iov_iter, payload_len)) { > + kfree_skb(skb); > + return NULL; > } > } > > -- > 2.54.0 > Reviewed-by: Bobby Eshleman