diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-27 12:00:26 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-30 16:23:17 +0100 |
| commit | cb505037a28ad1d8c378b40366e17fbbc44d10e6 (patch) | |
| tree | 9e935c1a5dfa8d3cbe180fb0d1877cd38854bad8 /drivers/vhost | |
| parent | ea1e320ea1ab61681ab8e093bc4f48cf79a04543 (diff) | |
| download | kernel_samsung_smdk4412-cb505037a28ad1d8c378b40366e17fbbc44d10e6.zip kernel_samsung_smdk4412-cb505037a28ad1d8c378b40366e17fbbc44d10e6.tar.gz kernel_samsung_smdk4412-cb505037a28ad1d8c378b40366e17fbbc44d10e6.tar.bz2 | |
vhost: fix total length when packets are too short
[ Upstream commit d8316f3991d207fe32881a9ac20241be8fa2bad0 ]
When mergeable buffers are disabled, and the
incoming packet is too large for the rx buffer,
get_rx_bufs returns success.
This was intentional in order for make recvmsg
truncate the packet and then handle_rx would
detect err != sock_len and drop it.
Unfortunately we pass the original sock_len to
recvmsg - which means we use parts of iov not fully
validated.
Fix this up by detecting this overrun and doing packet drop
immediately.
CVE-2014-0077
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/net.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 5c58128..92c839d 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -346,6 +346,12 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, *iovcount = seg; if (unlikely(log)) *log_num = nlogs; + + /* Detect overrun */ + if (unlikely(datalen > 0)) { + r = UIO_MAXIOV + 1; + goto err; + } return headcount; err: vhost_discard_vq_desc(vq, headcount); @@ -400,6 +406,14 @@ static void handle_rx(struct vhost_net *net) /* On error, stop handling until the next kick. */ if (unlikely(headcount < 0)) break; + /* On overrun, truncate and discard */ + if (unlikely(headcount > UIO_MAXIOV)) { + msg.msg_iovlen = 1; + err = sock->ops->recvmsg(NULL, sock, &msg, + 1, MSG_DONTWAIT | MSG_TRUNC); + pr_debug("Discarded rx packet: len %zd\n", sock_len); + continue; + } /* OK, now we need to know about added descriptors. */ if (!headcount) { if (unlikely(vhost_enable_notify(&net->dev, vq))) { |