* [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func()
@ 2019-07-29 2:21 Jia-Ju Bai
2019-07-29 6:56 ` Jiri Pirko
0 siblings, 1 reply; 5+ messages in thread
From: Jia-Ju Bai @ 2019-07-29 2:21 UTC (permalink / raw)
To: jhs, xiyou.wangcong, jiri, davem; +Cc: netdev, linux-kernel, Jia-Ju Bai
In dequeue_func(), there is an if statement on line 74 to check whether
skb is NULL:
if (skb)
When skb is NULL, it is used on line 77:
prefetch(&skb->end);
Thus, a possible null-pointer dereference may occur.
To fix this bug, skb->end is used when skb is not NULL.
This bug is found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
net/sched/sch_codel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
index 25ef172c23df..30169b3adbbb 100644
--- a/net/sched/sch_codel.c
+++ b/net/sched/sch_codel.c
@@ -71,10 +71,10 @@ static struct sk_buff *dequeue_func(struct codel_vars *vars, void *ctx)
struct Qdisc *sch = ctx;
struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
- if (skb)
+ if (skb) {
sch->qstats.backlog -= qdisc_pkt_len(skb);
-
- prefetch(&skb->end); /* we'll need skb_shinfo() */
+ prefetch(&skb->end); /* we'll need skb_shinfo() */
+ }
return skb;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func()
2019-07-29 2:21 [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func() Jia-Ju Bai
@ 2019-07-29 6:56 ` Jiri Pirko
2019-07-29 7:32 ` Jia-Ju Bai
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Pirko @ 2019-07-29 6:56 UTC (permalink / raw)
To: Jia-Ju Bai; +Cc: jhs, xiyou.wangcong, davem, netdev, linux-kernel
Mon, Jul 29, 2019 at 04:21:57AM CEST, baijiaju1990@gmail.com wrote:
>In dequeue_func(), there is an if statement on line 74 to check whether
>skb is NULL:
> if (skb)
>
>When skb is NULL, it is used on line 77:
> prefetch(&skb->end);
>
>Thus, a possible null-pointer dereference may occur.
>
>To fix this bug, skb->end is used when skb is not NULL.
>
>This bug is found by a static analysis tool STCheck written by us.
>
>Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Fixes tag, please?
>---
> net/sched/sch_codel.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
>index 25ef172c23df..30169b3adbbb 100644
>--- a/net/sched/sch_codel.c
>+++ b/net/sched/sch_codel.c
>@@ -71,10 +71,10 @@ static struct sk_buff *dequeue_func(struct codel_vars *vars, void *ctx)
> struct Qdisc *sch = ctx;
> struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
>
>- if (skb)
>+ if (skb) {
> sch->qstats.backlog -= qdisc_pkt_len(skb);
>-
>- prefetch(&skb->end); /* we'll need skb_shinfo() */
>+ prefetch(&skb->end); /* we'll need skb_shinfo() */
>+ }
> return skb;
> }
>
>--
>2.17.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func()
2019-07-29 6:56 ` Jiri Pirko
@ 2019-07-29 7:32 ` Jia-Ju Bai
2019-07-29 7:41 ` Jiri Pirko
0 siblings, 1 reply; 5+ messages in thread
From: Jia-Ju Bai @ 2019-07-29 7:32 UTC (permalink / raw)
To: Jiri Pirko; +Cc: jhs, xiyou.wangcong, davem, netdev, linux-kernel
On 2019/7/29 14:56, Jiri Pirko wrote:
> Mon, Jul 29, 2019 at 04:21:57AM CEST, baijiaju1990@gmail.com wrote:
>> In dequeue_func(), there is an if statement on line 74 to check whether
>> skb is NULL:
>> if (skb)
>>
>> When skb is NULL, it is used on line 77:
>> prefetch(&skb->end);
>>
>> Thus, a possible null-pointer dereference may occur.
>>
>> To fix this bug, skb->end is used when skb is not NULL.
>>
>> This bug is found by a static analysis tool STCheck written by us.
>>
>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> Fixes tag, please?
Sorry, I do not know what "fixes tag" means...
I just find a possible bug and fix it in this patch.
Best wishes,
Jia-Ju Bai
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func()
2019-07-29 7:32 ` Jia-Ju Bai
@ 2019-07-29 7:41 ` Jiri Pirko
2019-07-29 7:59 ` Jia-Ju Bai
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Pirko @ 2019-07-29 7:41 UTC (permalink / raw)
To: Jia-Ju Bai; +Cc: jhs, xiyou.wangcong, davem, netdev, linux-kernel
Mon, Jul 29, 2019 at 09:32:00AM CEST, baijiaju1990@gmail.com wrote:
>
>
>On 2019/7/29 14:56, Jiri Pirko wrote:
>> Mon, Jul 29, 2019 at 04:21:57AM CEST, baijiaju1990@gmail.com wrote:
>> > In dequeue_func(), there is an if statement on line 74 to check whether
>> > skb is NULL:
>> > if (skb)
>> >
>> > When skb is NULL, it is used on line 77:
>> > prefetch(&skb->end);
>> >
>> > Thus, a possible null-pointer dereference may occur.
>> >
>> > To fix this bug, skb->end is used when skb is not NULL.
>> >
>> > This bug is found by a static analysis tool STCheck written by us.
>> >
>> > Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
>> Fixes tag, please?
>
>Sorry, I do not know what "fixes tag" means...
>I just find a possible bug and fix it in this patch.
git log |grep Fixes:
If A fix goes to -net tree, it most probably fixes some bug introduced
by some commit in the past. So this tag is to put a reference.
>
>
>Best wishes,
>Jia-Ju Bai
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func()
2019-07-29 7:41 ` Jiri Pirko
@ 2019-07-29 7:59 ` Jia-Ju Bai
0 siblings, 0 replies; 5+ messages in thread
From: Jia-Ju Bai @ 2019-07-29 7:59 UTC (permalink / raw)
To: Jiri Pirko; +Cc: jhs, xiyou.wangcong, davem, netdev, linux-kernel
On 2019/7/29 15:41, Jiri Pirko wrote:
> Mon, Jul 29, 2019 at 09:32:00AM CEST, baijiaju1990@gmail.com wrote:
>>
>> On 2019/7/29 14:56, Jiri Pirko wrote:
>>> Mon, Jul 29, 2019 at 04:21:57AM CEST, baijiaju1990@gmail.com wrote:
>>>> In dequeue_func(), there is an if statement on line 74 to check whether
>>>> skb is NULL:
>>>> if (skb)
>>>>
>>>> When skb is NULL, it is used on line 77:
>>>> prefetch(&skb->end);
>>>>
>>>> Thus, a possible null-pointer dereference may occur.
>>>>
>>>> To fix this bug, skb->end is used when skb is not NULL.
>>>>
>>>> This bug is found by a static analysis tool STCheck written by us.
>>>>
>>>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
>>> Fixes tag, please?
>> Sorry, I do not know what "fixes tag" means...
>> I just find a possible bug and fix it in this patch.
> git log |grep Fixes:
>
> If A fix goes to -net tree, it most probably fixes some bug introduced
> by some commit in the past. So this tag is to put a reference.
Thanks for the explanation.
I will add it and submit a v2 patch.
Best wishes,
Jia-Ju Bai
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-29 7:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-29 2:21 [PATCH] net: sched: Fix a possible null-pointer dereference in dequeue_func() Jia-Ju Bai
2019-07-29 6:56 ` Jiri Pirko
2019-07-29 7:32 ` Jia-Ju Bai
2019-07-29 7:41 ` Jiri Pirko
2019-07-29 7:59 ` Jia-Ju Bai
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).