Commit 1e47abe4 authored by jiangyiwen's avatar jiangyiwen Committed by Kleber Sacilotto de Souza

9p/virtio: fix off-by-one error in sg list bounds check

BugLink: https://bugs.launchpad.net/bugs/1792419

commit 23cba9cb upstream.

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.comSigned-off-by: default avatarYiwen Jiang <jiangyiwen@huawei.com>
Reported-By: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarJun Piao <piaojun@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 7c050567
...@@ -192,7 +192,7 @@ static int pack_sg_list(struct scatterlist *sg, int start, ...@@ -192,7 +192,7 @@ static int pack_sg_list(struct scatterlist *sg, int start,
s = rest_of_page(data); s = rest_of_page(data);
if (s > count) if (s > count)
s = count; s = count;
BUG_ON(index > limit); BUG_ON(index >= limit);
/* Make sure we don't terminate early. */ /* Make sure we don't terminate early. */
sg_unmark_end(&sg[index]); sg_unmark_end(&sg[index]);
sg_set_buf(&sg[index++], data, s); sg_set_buf(&sg[index++], data, s);
...@@ -237,6 +237,7 @@ pack_sg_list_p(struct scatterlist *sg, int start, int limit, ...@@ -237,6 +237,7 @@ pack_sg_list_p(struct scatterlist *sg, int start, int limit,
s = PAGE_SIZE - data_off; s = PAGE_SIZE - data_off;
if (s > count) if (s > count)
s = count; s = count;
BUG_ON(index >= limit);
/* Make sure we don't terminate early. */ /* Make sure we don't terminate early. */
sg_unmark_end(&sg[index]); sg_unmark_end(&sg[index]);
sg_set_page(&sg[index++], pdata[i++], s, data_off); sg_set_page(&sg[index++], pdata[i++], s, data_off);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment