summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-02-20 08:55:58 -0500
committerDavid S. Miller <davem@davemloft.net>2018-02-21 17:49:24 -0500
commitcac56209a66ea3b0be67aa2966b2c628b944da1e (patch)
tree1f100b5a7ef31579afc6f9242c159cd6c131d780 /net
parentaf9090c2375e6a4a7b3059c9a3d36cb363c35d42 (diff)
downloadlinux-cac56209a66ea3b0be67aa2966b2c628b944da1e.tar.bz2
net: Allow a rule to track originating protocol
Allow a rule that is being added/deleted/modified or dumped to contain the originating protocol's id. The protocol is handled just like a routes originating protocol is. This is especially useful because there is starting to be a plethora of different user space programs adding rules. Allow the vrf device to specify that the kernel is the originator of the rule created for this device. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/fib_rules.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index cb071b8e8d17..88298f18cbae 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -51,6 +51,7 @@ int fib_default_rule_add(struct fib_rules_ops *ops,
r->pref = pref;
r->table = table;
r->flags = flags;
+ r->proto = RTPROT_KERNEL;
r->fr_net = ops->fro_net;
r->uid_range = fib_kuid_range_unset;
@@ -465,6 +466,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
}
refcount_set(&rule->refcnt, 1);
rule->fr_net = net;
+ rule->proto = frh->proto;
rule->pref = tb[FRA_PRIORITY] ? nla_get_u32(tb[FRA_PRIORITY])
: fib_default_rule_pref(ops);
@@ -664,6 +666,9 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,
}
list_for_each_entry(rule, &ops->rules_list, list) {
+ if (frh->proto && (frh->proto != rule->proto))
+ continue;
+
if (frh->action && (frh->action != rule->action))
continue;
@@ -808,9 +813,9 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
if (nla_put_u32(skb, FRA_SUPPRESS_PREFIXLEN, rule->suppress_prefixlen))
goto nla_put_failure;
frh->res1 = 0;
- frh->res2 = 0;
frh->action = rule->action;
frh->flags = rule->flags;
+ frh->proto = rule->proto;
if (rule->action == FR_ACT_GOTO &&
rcu_access_pointer(rule->ctarget) == NULL)