| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-20 09:07:29 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-21 16:49:00 (GMT) |
| commit | d5c71a7c533e88a9fcc74fe1b5c25743868fa300 (patch) | |
| tree | cf2cd089af1904ccf0f98300b73beb6612ba4845 | |
| parent | 7f9290f72168ad4179bfbf03b9e26d9c75bfc446 (diff) | |
| download | common-d5c71a7c533e88a9fcc74fe1b5c25743868fa300.zip common-d5c71a7c533e88a9fcc74fe1b5c25743868fa300.tar.gz common-d5c71a7c533e88a9fcc74fe1b5c25743868fa300.tar.bz2 | |
fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
When commit e9919a24d302 ("fib_rules: return 0 directly if an exactly
same rule exists when NLM_F_EXCL not supplied") was backported to 4.9.y,
it changed the logic a bit as err should have been reset before exiting
the test, like it happens in the original logic.
If this is not set, errors happen :(
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Reported-by: David Ahern <dsahern@gmail.com>
Reported-by: Florian Westphal <fw@strlen.de>
Cc: Hangbin Liu <liuhangbin@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/core/fib_rules.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index bb26457..c03dd21 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -430,6 +430,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh) goto errout_free; if (rule_exists(ops, frh, tb, rule)) { + err = 0; if (nlh->nlmsg_flags & NLM_F_EXCL) err = -EEXIST; goto errout_free; |