* [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment
@ 2018-08-03 4:11 jiangyiwen
2018-08-03 4:23 ` Dominique Martinet
2018-08-03 6:18 ` piaojun
0 siblings, 2 replies; 4+ messages in thread
From: jiangyiwen @ 2018-08-03 4:11 UTC (permalink / raw)
To: Eric Van Hensbergen, Ron Minnich, Latchesar Ionkov, Dominique Martinet
Cc: Linux Kernel Mailing List, v9fs-developer, netdev
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.
Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
---
net/9p/trans_virtio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 6265d1d..08264ba 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 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment
2018-08-03 4:11 [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment jiangyiwen
@ 2018-08-03 4:23 ` Dominique Martinet
2018-08-03 6:17 ` jiangyiwen
2018-08-03 6:18 ` piaojun
1 sibling, 1 reply; 4+ messages in thread
From: Dominique Martinet @ 2018-08-03 4:23 UTC (permalink / raw)
To: jiangyiwen
Cc: Eric Van Hensbergen, Ron Minnich, Latchesar Ionkov,
Linux Kernel Mailing List, v9fs-developer, netdev
jiangyiwen wrote on Fri, Aug 03, 2018:
> 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.
>
> Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
I'm not sure you've acted on his mail or if you found this
independantly, but this was reported by Dan Carpenter on the list in
June.
Would you mind if I add a tag for him?
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
That aside this looks good, I'll take it.
> ---
> net/9p/trans_virtio.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
> index 6265d1d..08264ba 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 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
> 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);
--
Dominique Martinet
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment
2018-08-03 4:23 ` Dominique Martinet
@ 2018-08-03 6:17 ` jiangyiwen
0 siblings, 0 replies; 4+ messages in thread
From: jiangyiwen @ 2018-08-03 6:17 UTC (permalink / raw)
To: Dominique Martinet
Cc: Eric Van Hensbergen, Ron Minnich, Latchesar Ionkov,
Linux Kernel Mailing List, v9fs-developer, netdev
On 2018/8/3 12:23, Dominique Martinet wrote:
> jiangyiwen wrote on Fri, Aug 03, 2018:
>> 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.
>>
>> Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
>
> I'm not sure you've acted on his mail or if you found this
> independantly, but this was reported by Dan Carpenter on the list in
> June.
> Would you mind if I add a tag for him?
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> That aside this looks good, I'll take it.
>
Sorry, I didn't see it before, I tested this problem a few days ago.
It is true that this problem was discovered first by him. Thank you
for adding him.
>> ---
>> net/9p/trans_virtio.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
>> index 6265d1d..08264ba 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 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
>> 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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment
2018-08-03 4:11 [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment jiangyiwen
2018-08-03 4:23 ` Dominique Martinet
@ 2018-08-03 6:18 ` piaojun
1 sibling, 0 replies; 4+ messages in thread
From: piaojun @ 2018-08-03 6:18 UTC (permalink / raw)
To: jiangyiwen, Eric Van Hensbergen, Ron Minnich, Latchesar Ionkov,
Dominique Martinet
Cc: v9fs-developer, Linux Kernel Mailing List, netdev
LGTM
On 2018/8/3 12:11, jiangyiwen wrote:
> 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.
>
> Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
Acked-by: Jun Piao <piaojun@huawei.com>
> ---
> net/9p/trans_virtio.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
> index 6265d1d..08264ba 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 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
> 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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-03 6:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-03 4:11 [V9fs-developer] [PATCH] net/9p: Modify the problem of BUG_ON judgment jiangyiwen
2018-08-03 4:23 ` Dominique Martinet
2018-08-03 6:17 ` jiangyiwen
2018-08-03 6:18 ` piaojun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).