|
@@ -110,7 +110,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
--- a/net/ipv6/route.c
|
|
--- a/net/ipv6/route.c
|
|
|
+++ b/net/ipv6/route.c
|
|
+++ b/net/ipv6/route.c
|
|
|
-@@ -97,6 +97,8 @@ static int ip6_pkt_discard(struct sk_bu
|
|
|
|
|
|
|
+@@ -98,6 +98,8 @@ static int ip6_pkt_discard(struct sk_bu
|
|
|
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
|
static int ip6_pkt_prohibit(struct sk_buff *skb);
|
|
static int ip6_pkt_prohibit(struct sk_buff *skb);
|
|
|
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
@@ -119,7 +119,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
static void ip6_link_failure(struct sk_buff *skb);
|
|
static void ip6_link_failure(struct sk_buff *skb);
|
|
|
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
|
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
|
|
struct sk_buff *skb, u32 mtu,
|
|
struct sk_buff *skb, u32 mtu,
|
|
|
-@@ -317,6 +319,18 @@ static const struct rt6_info ip6_prohibi
|
|
|
|
|
|
|
+@@ -318,6 +320,18 @@ static const struct rt6_info ip6_prohibi
|
|
|
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP),
|
|
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP),
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
|
.dst = {
|
|
.dst = {
|
|
|
.__refcnt = ATOMIC_INIT(1),
|
|
.__refcnt = ATOMIC_INIT(1),
|
|
|
-@@ -1039,6 +1053,7 @@ static const int fib6_prop[RTN_MAX + 1]
|
|
|
|
|
|
|
+@@ -1040,6 +1054,7 @@ static const int fib6_prop[RTN_MAX + 1]
|
|
|
[RTN_BLACKHOLE] = -EINVAL,
|
|
[RTN_BLACKHOLE] = -EINVAL,
|
|
|
[RTN_UNREACHABLE] = -EHOSTUNREACH,
|
|
[RTN_UNREACHABLE] = -EHOSTUNREACH,
|
|
|
[RTN_PROHIBIT] = -EACCES,
|
|
[RTN_PROHIBIT] = -EACCES,
|
|
@@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
[RTN_THROW] = -EAGAIN,
|
|
[RTN_THROW] = -EAGAIN,
|
|
|
[RTN_NAT] = -EINVAL,
|
|
[RTN_NAT] = -EINVAL,
|
|
|
[RTN_XRESOLVE] = -EINVAL,
|
|
[RTN_XRESOLVE] = -EINVAL,
|
|
|
-@@ -1074,6 +1089,10 @@ static void ip6_rt_init_dst_reject(struc
|
|
|
|
|
|
|
+@@ -1075,6 +1090,10 @@ static void ip6_rt_init_dst_reject(struc
|
|
|
rt->dst.output = ip6_pkt_prohibit_out;
|
|
rt->dst.output = ip6_pkt_prohibit_out;
|
|
|
rt->dst.input = ip6_pkt_prohibit;
|
|
rt->dst.input = ip6_pkt_prohibit;
|
|
|
break;
|
|
break;
|
|
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
case RTN_THROW:
|
|
case RTN_THROW:
|
|
|
case RTN_UNREACHABLE:
|
|
case RTN_UNREACHABLE:
|
|
|
default:
|
|
default:
|
|
|
-@@ -4540,6 +4559,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
|
|
|
+@@ -4544,6 +4563,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
/*
|
|
/*
|
|
|
* Allocate a dst for local (unicast / anycast) address.
|
|
* Allocate a dst for local (unicast / anycast) address.
|
|
|
*/
|
|
*/
|
|
|
-@@ -5033,7 +5063,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
|
|
|
+@@ -5037,7 +5067,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
|
rtm->rtm_type == RTN_PROHIBIT ||
|
|
rtm->rtm_type == RTN_PROHIBIT ||
|
|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
-@@ -6280,6 +6311,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
|
|
+@@ -6284,6 +6315,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
|
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
|
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
|
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
#endif
|
|
#endif
|
|
|
-@@ -6291,6 +6324,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
|
|
+@@ -6295,6 +6328,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
-@@ -6482,6 +6516,8 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
|
|
+@@ -6486,6 +6520,8 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
net->ipv6.fib6_has_custom_rules = false;
|
|
net->ipv6.fib6_has_custom_rules = false;
|
|
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
|
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
|
|
sizeof(*net->ipv6.ip6_prohibit_entry),
|
|
sizeof(*net->ipv6.ip6_prohibit_entry),
|
|
|
GFP_KERNEL);
|
|
GFP_KERNEL);
|
|
|
-@@ -6492,11 +6528,21 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
|
|
+@@ -6496,11 +6532,21 @@ static int __net_init ip6_route_net_init
|
|
|
ip6_template_metrics, true);
|
|
ip6_template_metrics, true);
|
|
|
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
|
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
|
|
|
|
|
|
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
|
ip6_template_metrics, true);
|
|
ip6_template_metrics, true);
|
|
|
-@@ -6523,6 +6569,8 @@ out:
|
|
|
|
|
|
|
+@@ -6527,6 +6573,8 @@ out:
|
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
out_ip6_prohibit_entry:
|
|
out_ip6_prohibit_entry:
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
out_ip6_null_entry:
|
|
out_ip6_null_entry:
|
|
|
-@@ -6542,6 +6590,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
|
|
+@@ -6546,6 +6594,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
kfree(net->ipv6.ip6_null_entry);
|
|
kfree(net->ipv6.ip6_null_entry);
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
#endif
|
|
#endif
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
-@@ -6625,6 +6674,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
|
|
+@@ -6629,6 +6678,9 @@ void __init ip6_route_init_special_entri
|
|
|
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
|
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
|
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
|
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|