This is a note to let you know that I've just added the patch titled
ipv4: fix error return code in rtm_to_fib_config()
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipv4-fix-error-return-code-in-rtm_to_fib_config.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Dec 19 11:38:43 AM CET 2020
From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
Date: Fri, 4 Dec 2020 16:48:14 +0800
Subject: ipv4: fix error return code in rtm_to_fib_config()
From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
[ Upstream commit b410f04eb5b482b5efc4eee90de81ad35d3d923b ]
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: d15662682db2 ("ipv4: Allow ipv6 gateway with ipv4 routes")
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
Reviewed-by: David Ahern <dsahern@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1607071695-33740-1-git-send-email-zhangchangzhong@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/ipv4/fib_frontend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -825,7 +825,7 @@ static int rtm_to_fib_config(struct net
if (has_gw && has_via) {
NL_SET_ERR_MSG(extack,
"Nexthop configuration can not contain both GATEWAY and VIA");
- goto errout;
+ return -EINVAL;
}
return 0;
Patches currently in stable-queue which might be from zhangchangzhong@xxxxxxxxxx are
queue-5.9/net-bridge-vlan-fix-error-return-code-in-__vlan_add.patch
queue-5.9/net-ll_temac-fix-potential-null-dereference-in-temac_probe.patch
queue-5.9/ipv4-fix-error-return-code-in-rtm_to_fib_config.patch
