[PATCH bpf] bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup

[PATCH bpf] bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup

[Anton Protopopov]

The bpf_ipv6_fib_lookup function should return BPF_FIB_LKUP_RET_FWD_DISABLED
when forwarding is disabled for the input device.  However instead of checking
if forwarding is enabled on the input device, it checked the global
net->ipv6.devconf_all->forwarding flag.  Change it to behave as expected.

Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
---
 net/core/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index f615e42cf4ef..3fdf1b21be36 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4737,7 +4737,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 		return -ENODEV;
 
 	idev = __in6_dev_get_safely(dev);
-	if (unlikely(!idev || !net->ipv6.devconf_all->forwarding))
+	if (unlikely(!idev || !idev->cnf.forwarding))
 		return BPF_FIB_LKUP_RET_FWD_DISABLED;
 
 	if (flags & BPF_FIB_LOOKUP_OUTPUT) {
-- 
2.19.1

Re: [PATCH bpf] bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup

[Toke Høiland-Jørgensen]

Anton Protopopov <a.s.protopopov@gmail.com> writes:

> The bpf_ipv6_fib_lookup function should return BPF_FIB_LKUP_RET_FWD_DISABLED
> when forwarding is disabled for the input device.  However instead of checking
> if forwarding is enabled on the input device, it checked the global
> net->ipv6.devconf_all->forwarding flag.  Change it to behave as expected.
>
> Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>

Thanks!

Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>

Re: [PATCH bpf] bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup

[David Ahern]

On 6/17/19 5:17 AM, Toke Høiland-Jørgensen wrote:
> Anton Protopopov <a.s.protopopov@gmail.com> writes:
> 
>> The bpf_ipv6_fib_lookup function should return BPF_FIB_LKUP_RET_FWD_DISABLED
>> when forwarding is disabled for the input device.  However instead of checking
>> if forwarding is enabled on the input device, it checked the global
>> net->ipv6.devconf_all->forwarding flag.  Change it to behave as expected.
>>
>> Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
> 
> Thanks!
> 
> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
> 

Fixes: 87f5fc7e48dd ("bpf: Provide helper to do forwarding lookups in
kernel FIB table")

Reviewed-by: David Ahern <dsahern@gmail.com>

Re: [PATCH bpf] bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup

[Daniel Borkmann]

On 06/16/2019 12:53 AM, Anton Protopopov wrote:
> The bpf_ipv6_fib_lookup function should return BPF_FIB_LKUP_RET_FWD_DISABLED
> when forwarding is disabled for the input device.  However instead of checking
> if forwarding is enabled on the input device, it checked the global
> net->ipv6.devconf_all->forwarding flag.  Change it to behave as expected.
> 
> Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>

Applied, thanks!