Home Home > GIT Browse
diff options
authorPanu Matilainen <pmatilai@redhat.com>2014-11-14 13:14:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:55:33 -0800
commit8700ecbb15a77b8c20d52f65da9665f2b6071ad6 (patch)
parent548da392f3f0b21dcf27e4d284747736bfcfbcba (diff)
ipv4: Fix incorrect error code when adding an unreachable route
[ Upstream commit 49dd18ba4615eaa72f15c9087dea1c2ab4744cf5 ] Trying to add an unreachable route incorrectly returns -ESRCH if if custom FIB rules are present: [root@localhost ~]# ip route add dev eth0 via RTNETLINK answers: Network is unreachable [root@localhost ~]# ip rule add to table 200 [root@localhost ~]# ip route add dev eth0 via RTNETLINK answers: No such process [root@localhost ~]# Commit 83886b6b636173b206f475929e58fac75c6f2446 ("[NET]: Change "not found" return value for rule lookup") changed fib_rules_lookup() to use -ESRCH as a "not found" code internally, but for user space it should be translated into -ENETUNREACH. Handle the translation centrally in ipv4-specific fib_lookup(), leaving the DECnet case alone. On a related note, commit b7a71b51ee37d919e4098cd961d59a883fd272d8 ("ipv4: removed redundant conditional") removed a similar translation from ip_route_input_slow() prematurely AIUI. Fixes: b7a71b51ee37 ("ipv4: removed redundant conditional") Signed-off-by: Panu Matilainen <pmatilai@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index f2e15738534d..8f7bd56955b0 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -62,6 +62,10 @@ int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res)
res->tclassid = 0;
+ if (err == -ESRCH)
return err;