linux-kernel - Re: [PATCH net] vhost_net: fix wrong iter offset when setting number of buffers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20150215.081753.375314410062222400.davem@davemloft.net>
Date:	Sun, 15 Feb 2015 08:17:53 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	jasowang@...hat.com
Cc:	mst@...hat.com, kvm@...r.kernel.org,
	virtualization@...ts.linux-foundation.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org, viro@...iv.linux.org.uk
Subject: Re: [PATCH net] vhost_net: fix wrong iter offset when setting
 number of buffers

From: Jason Wang <jasowang@...hat.com>
Date: Sun, 15 Feb 2015 16:35:17 +0800

> In commit ba7438aed924 ("vhost: don't bother copying iovecs in
> handle_rx(), kill memcpy_toiovecend()"), we advance iov iter fixup
> sizeof(struct virtio_net_hdr) bytes and fill the number of buffers
> after doing the socket recvmsg(). This work well but was broken after
> commit 6e03f896b52c ("Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") which tries
> to advance sizeof(struct virtio_net_hdr_mrg_rxbuf). It will fill the
> number of buffers at the wrong place. This patch fixes this.
> 
> Fixes 6e03f896b52c
> ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> Cc: David S. Miller <davem@...emloft.net>
> Cc: Al Viro <viro@...iv.linux.org.uk>
> Cc: Michael S. Tsirkin <mst@...hat.com>
> Signed-off-by: Jason Wang <jasowang@...hat.com>

I was wondering if I got that merge conflict right. :-/

Applied, thanks Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/