diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2017-04-26 14:03:50 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-27 16:35:57 -0400 |
| commit | adeb45cbb5057731ce9c47aad93756135d7947bf (patch) | |
| tree | 4bdebd857bdd4491ebd9b83da6a68cec8fe1f1e4 /net | |
| parent | bridge: add per-port broadcast flood flag (diff) | |
| download | linux-dev-adeb45cbb5057731ce9c47aad93756135d7947bf.tar.xz linux-dev-adeb45cbb5057731ce9c47aad93756135d7947bf.zip | |
fib_rules: fix error return code
Fix to return error code -EINVAL from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: 622ec2c9d524 ("net: core: add UID to flows, rules, and routes")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/fib_rules.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index c58c1df6f92b..f21c4d3aeae0 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -440,6 +440,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, if (tb[FRA_TUN_ID]) rule->tun_id = nla_get_be64(tb[FRA_TUN_ID]); + err = -EINVAL; if (tb[FRA_L3MDEV]) { #ifdef CONFIG_NET_L3_MASTER_DEV rule->l3mdev = nla_get_u8(tb[FRA_L3MDEV]); @@ -461,7 +462,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, else rule->suppress_ifgroup = -1; - err = -EINVAL; if (tb[FRA_GOTO]) { if (rule->action != FR_ACT_GOTO) goto errout_free; @@ -592,8 +592,10 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, if (tb[FRA_UID_RANGE]) { range = nla_get_kuid_range(tb); - if (!uid_range_set(&range)) + if (!uid_range_set(&range)) { + err = -EINVAL; goto errout; + } } else { range = fib_kuid_range_unset; } |