fib: fix another fib_rules_ops indirect call wrapper problem
Subsystems (3)
PATCH 1/1 fib: fix another fib_rules_ops indirect call wrapper problem
It turns out that on commit 41d707b7332f ("fib: fix fib_rules_ops indirect calls wrappers") I forgot to include the case when CONFIG_IP_MULTIPLE_TABLES is not set.
Fixes 41d707b7332f ("fib: fix fib_rules_ops indirect calls wrappers")
Reported-by Randy Dunlap <[email protected]>
Cc Stephen Rothwell <[email protected]>
Signed-off-by Brian Vazquez <[email protected]>
--- net/core/fib_rules.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/fib_rules.c +6 -0
@@ -17,10 +17,16 @@#include <linux/indirect_call_wrapper.h> #ifdef CONFIG_IPV6_MULTIPLE_TABLES +#ifdef CONFIG_IP_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, f2, __VA_ARGS__) +#endif +#elif CONFIG_IP_MULTIPLE_TABLES #define INDIRECT_CALL_MT (f, f2, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__) +#else +#define INDIRECT_CALL_MT (f, f2, f1, ...) f(__VA_ARGS__)#endif static const struct fib_kuid_range fib_kuid_range_unset = {
Signature · 1 line
2.28.0.163.g6104cc2f0b6-goog
Quoted 8 lines · Brian Vazquez
It turns out that on commit
41d707b7332f("fib: fixfib_rules_opsindirect calls wrappers") I forgot to include the case whenCONFIG_IP_MULTIPLE_TABLESis not set.Fixes 41d707b7332f ("fib: fix fib_rules_ops indirect calls wrappers")Reported-by Randy Dunlap <[email protected]>Cc Stephen Rothwell <[email protected]>Signed-off-by Brian Vazquez <[email protected]>
Thanks.
Quoted 26 lines
--- net/core/fib_rules.c | 6 ++++++ 1 file changed, 6 insertions(+)net/core/fib_rules.c +6
-0@@ -17,10 +17,16 @@#include <linux/indirect_call_wrapper.h> #ifdef CONFIG_IPV6_MULTIPLE_TABLES +#ifdef CONFIG_IP_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, f2, __VA_ARGS__) +#endif +#elif CONFIG_IP_MULTIPLE_TABLES #define INDIRECT_CALL_MT (f, f2, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__) +#else +#define INDIRECT_CALL_MT (f, f2, f1, ...) f(__VA_ARGS__)#endif static const struct fib_kuid_range fib_kuid_range_unset = {
Signature · 1 line
~Randy
From: Brian Vazquez <[email protected]>
Date: Fri, 31 Jul 2020 20:01:10 -0700
Quoted 8 lines
It turns out that on commit
41d707b7332f("fib: fixfib_rules_opsindirect calls wrappers") I forgot to include the case whenCONFIG_IP_MULTIPLE_TABLESis not set.Fixes 41d707b7332f ("fib: fix fib_rules_ops indirect calls wrappers")Reported-by Randy Dunlap <[email protected]>Cc Stephen Rothwell <[email protected]>Signed-off-by Brian Vazquez <[email protected]>
Applied.