* [PATCH net-next] fib_rules: fix error return code
@ 2017-04-26 14:03 Wei Yongjun
2017-04-27 20:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2017-04-26 14:03 UTC (permalink / raw)
To: Lorenzo Colitti, Ido Schimmel, David Ahern, Mateusz Bajorski,
Johannes Berg
Cc: Wei Yongjun, netdev
From: Wei Yongjun <weiyongjun1@huawei.com>
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>
---
net/core/fib_rules.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index c58c1df..f21c4d3 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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] fib_rules: fix error return code
2017-04-26 14:03 [PATCH net-next] fib_rules: fix error return code Wei Yongjun
@ 2017-04-27 20:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-04-27 20:36 UTC (permalink / raw)
To: weiyj.lk
Cc: lorenzo, idosch, dsa, mateusz.bajorski, johannes.berg,
weiyongjun1, netdev
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Wed, 26 Apr 2017 14:03:50 +0000
> From: Wei Yongjun <weiyongjun1@huawei.com>
>
> 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>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-27 20:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-26 14:03 [PATCH net-next] fib_rules: fix error return code Wei Yongjun
2017-04-27 20:36 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.