Commit 41d707b7 authored by Brian Vazquez's avatar Brian Vazquez Committed by David S. Miller
Browse files

fib: fix fib_rules_ops indirect calls wrappers 



This patch fixes:
commit b9aaec8f ("fib: use indirect call wrappers in the most common
fib_rules_ops") which didn't consider the case when
CONFIG_IPV6_MULTIPLE_TABLES is not set.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: b9aaec8f ("fib: use indirect call wrappers in the most common fib_rules_ops")
Signed-off-by: default avatarBrian Vazquez <brianvv@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a41cf09b

net/core/fib_rules.c

+20 −13
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 
#include <net/ip_tunnels.h>

#include <linux/indirect_call_wrapper.h>



#ifdef CONFIG_IPV6_MULTIPLE_TABLES

#define INDIRECT_CALL_MT(f, f2, f1, ...) \

	INDIRECT_CALL_INET(f, f2, f1, __VA_ARGS__)

#else

#define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__)

#endif



static const struct fib_kuid_range fib_kuid_range_unset = {

	KUIDT_INIT(0),

	KUIDT_INIT(~0),
@@ -268,7 +275,7 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops, 
	    uid_gt(fl->flowi_uid, rule->uid_range.end))

		goto out;



	ret = INDIRECT_CALL_INET(ops->match,

	ret = INDIRECT_CALL_MT(ops->match,

			       fib6_rule_match,

			       fib4_rule_match,

			       rule, fl, flags);
@@ -302,12 +309,12 @@ jumped: 
		} else if (rule->action == FR_ACT_NOP)

			continue;

		else

			err = INDIRECT_CALL_INET(ops->action,

			err = INDIRECT_CALL_MT(ops->action,

					       fib6_rule_action,

					       fib4_rule_action,

					       rule, fl, flags, arg);



		if (!err && ops->suppress && INDIRECT_CALL_INET(ops->suppress,

		if (!err && ops->suppress && INDIRECT_CALL_MT(ops->suppress,

							      fib6_rule_suppress,

							      fib4_rule_suppress,

							      rule, arg))

CRA Git | Maintained and supported by SUSTech CRA and CCSE