lkml.org 
[lkml]   [2018]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] bpf: remove redundant null pointer check before consume_skb
On Thu, Sep 20, 2018 at 3:00 AM zhong jiang <zhongjiang@huawei.com> wrote:
>
> consume_skb has taken the null pointer into account. hence it is safe
> to remove the redundant null pointer check before consume_skb.
>
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>

Acked-by: Song Liu <songliubraving@fb.com>

> ---
> kernel/bpf/sockmap.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
> index 488ef96..a9359cb 100644
> --- a/kernel/bpf/sockmap.c
> +++ b/kernel/bpf/sockmap.c
> @@ -590,8 +590,7 @@ static int free_sg(struct sock *sk, int start,
> if (i == MAX_SKB_FRAGS)
> i = 0;
> }
> - if (md->skb)
> - consume_skb(md->skb);
> + consume_skb(md->skb);
>
> return free;
> }
> @@ -973,8 +972,7 @@ static int bpf_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
>
> if (!sg->length && md->sg_start == md->sg_end) {
> list_del(&md->list);
> - if (md->skb)
> - consume_skb(md->skb);
> + consume_skb(md->skb);
> kfree(md);
> }
> }
> --
> 1.7.12.4
>

\
 
 \ /
  Last update: 2018-09-20 19:55    [W:0.134 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site