lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vhost-net: fix range checking in mrg bufs case

Browse Source 
In mergeable buffer case, we use headcount, log_num
and seg as indexes in same-size arrays, and
we know that headcount <= seg and
log_num equals either 0 or seg.

Therefore, the right thing to do is range-check seg,
not headcount as we do now: these will be different
if guest chains s/g descriptors (this does not
happen now, but we can not trust the guest).

Long term, we should add BUG_ON checks to verify
two other indexes are what we think they should be.

Reported-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin
2010-09-14 15:15:52 +02:00
parent 053d8f6622
commit ee05d6939e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/vhost/net.c
View File

@@ -243,7 +243,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
int r, nlogs = 0; int r, nlogs = 0;
while (datalen > 0) { while (datalen > 0) {
if (unlikely(headcount >= VHOST_NET_MAX_SG)) { if (unlikely(seg >= VHOST_NET_MAX_SG)) {
r = -ENOBUFS; r = -ENOBUFS;
goto err; goto err;
} }