| Message ID | 20180328114836.GD29050@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | test_bpf: Fix NULL vs IS_ERR() check in test_skb_segment() | expand |
On 03/28/2018 01:48 PM, Dan Carpenter wrote: > The skb_segment() function returns error pointers on error. It never > returns NULL. > > Fixes: 76db8087c4c9 ("net: bpf: add a test for skb_segment in test_bpf module") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Patch is directly for net-next, thanks! Acked-by: Daniel Borkmann <daniel@iogearbox.net>
On 3/28/18 4:48 AM, Dan Carpenter wrote: > The skb_segment() function returns error pointers on error. It never > returns NULL. > > Fixes: 76db8087c4c9 ("net: bpf: add a test for skb_segment in test_bpf module") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/lib/test_bpf.c b/lib/test_bpf.c > index b2badf6b23cd..8e157806df7a 100644 > --- a/lib/test_bpf.c > +++ b/lib/test_bpf.c > @@ -6649,7 +6649,7 @@ static __init int test_skb_segment(void) > } > > segs = skb_segment(skb, features); > - if (segs) { > + if (!IS_ERR(segs)) { > kfree_skb_list(segs); > ret = 0; > pr_info("%s: success in skb_segment!", __func__); Oh, my bad. Thanks for the fix! Reviewed-by: Yonghong Song <yhs@fb.com>
Hi David, On 03/28/2018 06:19 PM, Yonghong Song wrote: > On 3/28/18 4:48 AM, Dan Carpenter wrote: >> The skb_segment() function returns error pointers on error. It never >> returns NULL. >> >> Fixes: 76db8087c4c9 ("net: bpf: add a test for skb_segment in test_bpf module") >> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> >> >> diff --git a/lib/test_bpf.c b/lib/test_bpf.c >> index b2badf6b23cd..8e157806df7a 100644 >> --- a/lib/test_bpf.c >> +++ b/lib/test_bpf.c >> @@ -6649,7 +6649,7 @@ static __init int test_skb_segment(void) >> } >> segs = skb_segment(skb, features); >> - if (segs) { >> + if (!IS_ERR(segs)) { >> kfree_skb_list(segs); >> ret = 0; >> pr_info("%s: success in skb_segment!", __func__); > > Oh, my bad. Thanks for the fix! > Reviewed-by: Yonghong Song <yhs@fb.com> If you have a chance, please take this fix directly into your net-next tree since it also contains the original commit 76db8087c4c9 ("net: bpf: add a test for skb_segment in test_bpf module"), which is not in the bpf-next tree at this point. Thanks a lot, Daniel
From: Daniel Borkmann <daniel@iogearbox.net> Date: Wed, 28 Mar 2018 20:57:27 +0200 > If you have a chance, please take this fix directly into your net-next tree > since it also contains the original commit 76db8087c4c9 ("net: bpf: add a > test for skb_segment in test_bpf module"), which is not in the bpf-next tree > at this point. Ok, done.
diff --git a/lib/test_bpf.c b/lib/test_bpf.c index b2badf6b23cd..8e157806df7a 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -6649,7 +6649,7 @@ static __init int test_skb_segment(void) } segs = skb_segment(skb, features); - if (segs) { + if (!IS_ERR(segs)) { kfree_skb_list(segs); ret = 0; pr_info("%s: success in skb_segment!", __func__);
The skb_segment() function returns error pointers on error. It never returns NULL. Fixes: 76db8087c4c9 ("net: bpf: add a test for skb_segment in test_bpf module") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>