From: Steven Barth Date: Thu, 19 Mar 2015 15:46:03 +0000 (+0000) Subject: ipv6: fix throw routes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9b1840b861ae66a4749af156556b6fe5f66658d2;p=openwrt%2Fstaging%2Fblocktrron.git ipv6: fix throw routes Signed-off-by: Steven Barth SVN-Revision: 44894 --- diff --git a/target/linux/generic/patches-3.10/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-3.10/668-fix-ipv6-throw-routes.patch new file mode 100644 index 0000000000..f21e6f4b66 --- /dev/null +++ b/target/linux/generic/patches-3.10/668-fix-ipv6-throw-routes.patch @@ -0,0 +1,36 @@ +From 9cd600244515bd4540898411ab781a97f0cc387f Mon Sep 17 00:00:00 2001 +From: Steven Barth +Date: Thu, 19 Mar 2015 11:54:50 +0100 +Subject: [PATCH] ipv6: fix backtracking for throw routes + +for throw routes to trigger evaluation of other policy rules +EAGAIN needs to be propagated up to fib_rules_lookup +similar to how its done for IPv4 + +A simple testcase for verification is: + +ip -6 rule add lookup 33333 priority 33333 +ip -6 route add throw 2001:db8::1 +ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333 +ip route get 2001:db8::1 + +Signed-off-by: Steven Barth +--- + net/ipv6/fib6_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c +index b4d5e1d..27ca796 100644 +--- a/net/ipv6/fib6_rules.c ++++ b/net/ipv6/fib6_rules.c +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, + goto again; + flp6->saddr = saddr; + } ++ err = rt->dst.error; + goto out; + } + again: +-- +2.1.4 + diff --git a/target/linux/generic/patches-3.14/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-3.14/668-fix-ipv6-throw-routes.patch new file mode 100644 index 0000000000..f21e6f4b66 --- /dev/null +++ b/target/linux/generic/patches-3.14/668-fix-ipv6-throw-routes.patch @@ -0,0 +1,36 @@ +From 9cd600244515bd4540898411ab781a97f0cc387f Mon Sep 17 00:00:00 2001 +From: Steven Barth +Date: Thu, 19 Mar 2015 11:54:50 +0100 +Subject: [PATCH] ipv6: fix backtracking for throw routes + +for throw routes to trigger evaluation of other policy rules +EAGAIN needs to be propagated up to fib_rules_lookup +similar to how its done for IPv4 + +A simple testcase for verification is: + +ip -6 rule add lookup 33333 priority 33333 +ip -6 route add throw 2001:db8::1 +ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333 +ip route get 2001:db8::1 + +Signed-off-by: Steven Barth +--- + net/ipv6/fib6_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c +index b4d5e1d..27ca796 100644 +--- a/net/ipv6/fib6_rules.c ++++ b/net/ipv6/fib6_rules.c +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, + goto again; + flp6->saddr = saddr; + } ++ err = rt->dst.error; + goto out; + } + again: +-- +2.1.4 + diff --git a/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch new file mode 100644 index 0000000000..f21e6f4b66 --- /dev/null +++ b/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch @@ -0,0 +1,36 @@ +From 9cd600244515bd4540898411ab781a97f0cc387f Mon Sep 17 00:00:00 2001 +From: Steven Barth +Date: Thu, 19 Mar 2015 11:54:50 +0100 +Subject: [PATCH] ipv6: fix backtracking for throw routes + +for throw routes to trigger evaluation of other policy rules +EAGAIN needs to be propagated up to fib_rules_lookup +similar to how its done for IPv4 + +A simple testcase for verification is: + +ip -6 rule add lookup 33333 priority 33333 +ip -6 route add throw 2001:db8::1 +ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333 +ip route get 2001:db8::1 + +Signed-off-by: Steven Barth +--- + net/ipv6/fib6_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c +index b4d5e1d..27ca796 100644 +--- a/net/ipv6/fib6_rules.c ++++ b/net/ipv6/fib6_rules.c +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, + goto again; + flp6->saddr = saddr; + } ++ err = rt->dst.error; + goto out; + } + again: +-- +2.1.4 + diff --git a/target/linux/generic/patches-3.19/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-3.19/668-fix-ipv6-throw-routes.patch new file mode 100644 index 0000000000..f21e6f4b66 --- /dev/null +++ b/target/linux/generic/patches-3.19/668-fix-ipv6-throw-routes.patch @@ -0,0 +1,36 @@ +From 9cd600244515bd4540898411ab781a97f0cc387f Mon Sep 17 00:00:00 2001 +From: Steven Barth +Date: Thu, 19 Mar 2015 11:54:50 +0100 +Subject: [PATCH] ipv6: fix backtracking for throw routes + +for throw routes to trigger evaluation of other policy rules +EAGAIN needs to be propagated up to fib_rules_lookup +similar to how its done for IPv4 + +A simple testcase for verification is: + +ip -6 rule add lookup 33333 priority 33333 +ip -6 route add throw 2001:db8::1 +ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333 +ip route get 2001:db8::1 + +Signed-off-by: Steven Barth +--- + net/ipv6/fib6_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c +index b4d5e1d..27ca796 100644 +--- a/net/ipv6/fib6_rules.c ++++ b/net/ipv6/fib6_rules.c +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, + goto again; + flp6->saddr = saddr; + } ++ err = rt->dst.error; + goto out; + } + again: +-- +2.1.4 + diff --git a/target/linux/generic/patches-4.0/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-4.0/668-fix-ipv6-throw-routes.patch new file mode 100644 index 0000000000..f21e6f4b66 --- /dev/null +++ b/target/linux/generic/patches-4.0/668-fix-ipv6-throw-routes.patch @@ -0,0 +1,36 @@ +From 9cd600244515bd4540898411ab781a97f0cc387f Mon Sep 17 00:00:00 2001 +From: Steven Barth +Date: Thu, 19 Mar 2015 11:54:50 +0100 +Subject: [PATCH] ipv6: fix backtracking for throw routes + +for throw routes to trigger evaluation of other policy rules +EAGAIN needs to be propagated up to fib_rules_lookup +similar to how its done for IPv4 + +A simple testcase for verification is: + +ip -6 rule add lookup 33333 priority 33333 +ip -6 route add throw 2001:db8::1 +ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333 +ip route get 2001:db8::1 + +Signed-off-by: Steven Barth +--- + net/ipv6/fib6_rules.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c +index b4d5e1d..27ca796 100644 +--- a/net/ipv6/fib6_rules.c ++++ b/net/ipv6/fib6_rules.c +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, + goto again; + flp6->saddr = saddr; + } ++ err = rt->dst.error; + goto out; + } + again: +-- +2.1.4 +