From f71b3c5f37c34d5ade98c3303b87e2c947f6eb2a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 May 2019 11:15:26 +0200 Subject: [PATCH] 4.14-stable patches added patches: fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch --- ...t-of-e9919a24d302-fib_rules-return-0.patch | 39 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.14/fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch diff --git a/queue-4.14/fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch b/queue-4.14/fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch new file mode 100644 index 00000000000..927a66bc0eb --- /dev/null +++ b/queue-4.14/fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch @@ -0,0 +1,39 @@ +From b42f0ebbe4431ff7ce99c916555418f4a4c2be67 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Mon, 20 May 2019 11:07:29 +0200 +Subject: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...") + +From: Greg Kroah-Hartman + +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 +Reported-by: David Ahern +Reported-by: Florian Westphal +Cc: Hangbin Liu +Cc: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/core/fib_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c +index bb26457e8c21..c03dd2104d33 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; +-- +2.21.0 + diff --git a/queue-4.14/series b/queue-4.14/series index 7c86ed1ee86..0b0f8739f32 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -52,3 +52,4 @@ ipmi-ssif-compare-block-number-correctly-for-multi-part-return-messages.patch crypto-arm64-aes-neonbs-don-t-access-already-freed-walk.iv.patch crypto-salsa20-don-t-access-already-freed-walk.iv.patch crypto-ccm-fix-incompatibility-between-ccm-and-ccm_base.patch +fib_rules-fix-error-in-backport-of-e9919a24d302-fib_rules-return-0.patch -- 2.47.2