summaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorjiangyiwen <jiangyiwen@huawei.com>2018-08-03 12:11:34 +0800
committerDominique Martinet <dominique.martinet@cea.fr>2018-08-13 09:35:28 +0900
commit23cba9cbde0bba05d772b335fe5f66aa82b9ad19 (patch)
tree3a25c5676e7d7d273119fbb08120ace47eb25a1e /net/9p
parentc69f297d7f0b46187919d5c2aa36183688ecf3d4 (diff)
downloadlinux-stable-23cba9cbde0bba05d772b335fe5f66aa82b9ad19.tar.gz
linux-stable-23cba9cbde0bba05d772b335fe5f66aa82b9ad19.tar.bz2
linux-stable-23cba9cbde0bba05d772b335fe5f66aa82b9ad19.zip
9p/virtio: fix off-by-one error in sg list bounds check
Because the value of limit is VIRTQUEUE_NUM, if index is equal to limit, it will cause sg array out of bounds, so correct the judgement of BUG_ON. Link: http://lkml.kernel.org/r/5B63D5F6.6080109@huawei.com Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com> Reported-By: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jun Piao <piaojun@huawei.com> Cc: stable@vger.kernel.org Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_virtio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 6265d1d62749..08264bae3f5d 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -191,7 +191,7 @@ static int pack_sg_list(struct scatterlist *sg, int start,
s = rest_of_page(data);
if (s > count)
s = count;
- BUG_ON(index > limit);
+ BUG_ON(index >= limit);
/* Make sure we don't terminate early. */
sg_unmark_end(&sg[index]);
sg_set_buf(&sg[index++], data, s);
@@ -236,6 +236,7 @@ pack_sg_list_p(struct scatterlist *sg, int start, int limit,
s = PAGE_SIZE - data_off;
if (s > count)
s = count;
+ BUG_ON(index >= limit);
/* Make sure we don't terminate early. */
sg_unmark_end(&sg[index]);
sg_set_page(&sg[index++], pdata[i++], s, data_off);