| Message ID | 1537436772-42545-1-git-send-email-zhongjiang@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: remove redundant null pointer check before consume_skb | expand |
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 >
On 09/20/2018 11:46 AM, zhong jiang 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> Applied to bpf-next, thanks Zhong!
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); } }
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> --- kernel/bpf/sockmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)