From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 17 Aug 2017 13:07:22 +0000 (+0200)
Subject: bpf: no need to nullify ri->map in xdp_do_redirect
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d6a75b65dbfa910e84b2cbd7cd54468cf33ff9b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

bpf: no need to nullify ri->map in xdp_do_redirect

We are guaranteed to have a NULL ri->map in this branch since
we test for it earlier, so we don't need to reset it here.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/filter.c b/net/core/filter.c
index e9f8dcef6c57..ea3ca34d0bf4 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2568,7 +2568,6 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
 
 	fwd = dev_get_by_index_rcu(dev_net(dev), index);
 	ri->ifindex = 0;
-	ri->map = NULL;
 	if (unlikely(!fwd)) {
 		bpf_warn_invalid_xdp_redirect(index);
 		return -EINVAL;