| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 23 Sep 2015 08:15:21 -0700
From: David Ahern <dsa@...ulusnetworks.com>
To: netdev@...r.kernel.org
Cc: David Ahern <dsa@...ulusnetworks.com>
Subject: [PATCH net-next 8/9] net: Remove local_input label
Move calls to ip_route_local_input to jump sites and remove
local_input label.
Signed-off-by: David Ahern <dsa@...ulusnetworks.com>
---
net/ipv4/route.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c23bb0965966..340246414545 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1835,9 +1835,11 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
0, dev, in_dev, &itag);
if (err < 0) {
ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);
- goto out;
+ } else {
+ err = ip_route_local_input(skb, &res, net, in_dev,
+ flags, itag, err);
}
- goto local_input;
+ goto out;
}
if (!IN_DEV_FORWARD(in_dev)) {
@@ -1870,7 +1872,6 @@ out: return err;
res.type = RTN_BROADCAST;
RT_CACHE_STAT_INC(in_brd);
-local_input:
err = ip_route_local_input(skb, &res, net, in_dev,
flags, itag, err);
goto out;
@@ -1880,7 +1881,10 @@ out: return err;
res.type = RTN_UNREACHABLE;
res.fi = NULL;
res.table = NULL;
- goto local_input;
+
+ err = ip_route_local_input(skb, &res, net, in_dev,
+ flags, itag, err);
+ goto out;
}
int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists