summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2014-11-14 13:14:32 +0200
committerDavid S. Miller <davem@davemloft.net>2014-11-16 14:11:45 -0500
commit49dd18ba4615eaa72f15c9087dea1c2ab4744cf5 (patch)
treea4af850407f81d7694ef390d77907fc2e27d4bdf /net
parentb7f4c0ba630f66d6499faf8bc265de880bde3112 (diff)
downloadblackbird-op-linux-49dd18ba4615eaa72f15c9087dea1c2ab4744cf5.tar.gz
blackbird-op-linux-49dd18ba4615eaa72f15c9087dea1c2ab4744cf5.zip
ipv4: Fix incorrect error code when adding an unreachable route
Trying to add an unreachable route incorrectly returns -ESRCH if if custom FIB rules are present: [root@localhost ~]# ip route add 74.125.31.199 dev eth0 via 1.2.3.4 RTNETLINK answers: Network is unreachable [root@localhost ~]# ip rule add to 55.66.77.88 table 200 [root@localhost ~]# ip route add 74.125.31.199 dev eth0 via 1.2.3.4 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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_rules.c4
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)
else
res->tclassid = 0;
#endif
+
+ if (err == -ESRCH)
+ err = -ENETUNREACH;
+
return err;
}
EXPORT_SYMBOL_GPL(__fib_lookup);
OpenPOWER on IntegriCloud