From: Greg Kroah-Hartman Date: Fri, 8 Mar 2019 10:09:40 +0000 (+0100) Subject: drop some broken 4.9 patches X-Git-Tag: v5.0.1~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47eb4795e9fc074bc74b9f04302d65fa1c6bcf25;p=thirdparty%2Fkernel%2Fstable-queue.git drop some broken 4.9 patches --- diff --git a/queue-4.9/ipv4-return-error-for-rta_via-attribute.patch b/queue-4.9/ipv4-return-error-for-rta_via-attribute.patch deleted file mode 100644 index 8476b8456cf..00000000000 --- a/queue-4.9/ipv4-return-error-for-rta_via-attribute.patch +++ /dev/null @@ -1,44 +0,0 @@ -From foo@baz Fri Mar 8 09:51:16 CET 2019 -From: David Ahern -Date: Tue, 26 Feb 2019 09:00:02 -0800 -Subject: ipv4: Return error for RTA_VIA attribute - -From: David Ahern - -[ Upstream commit b6e9e5df4ecf100f6a10ab2ade8e46d47a4b9779 ] - -IPv4 currently does not support nexthops outside of the AF_INET family. -Specifically, it does not handle RTA_VIA attribute. If it is passed -in a route add request, the actual route added only uses the device -which is clearly not what the user intended: - - $ ip ro add 172.16.1.0/24 via inet6 2001:db8:1::1 dev eth0 - $ ip ro ls - ... - 172.16.1.0/24 dev eth0 - -Catch this and fail the route add: - $ ip ro add 172.16.1.0/24 via inet6 2001:db8:1::1 dev eth0 - Error: IPv4 does not support RTA_VIA attribute. - -Fixes: 03c0566542f4c ("mpls: Netlink commands to add, remove, and dump routes") -Signed-off-by: David Ahern -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/ipv4/fib_frontend.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/net/ipv4/fib_frontend.c -+++ b/net/ipv4/fib_frontend.c -@@ -667,6 +667,10 @@ static int rtm_to_fib_config(struct net - case RTA_GATEWAY: - cfg->fc_gw = nla_get_be32(attr); - break; -+ case RTA_VIA: -+ NL_SET_ERR_MSG(extack, "IPv4 does not support RTA_VIA attribute"); -+ err = -EINVAL; -+ goto errout; - case RTA_PRIORITY: - cfg->fc_priority = nla_get_u32(attr); - break; diff --git a/queue-4.9/ipv6-return-error-for-rta_via-attribute.patch b/queue-4.9/ipv6-return-error-for-rta_via-attribute.patch deleted file mode 100644 index 309d35214c1..00000000000 --- a/queue-4.9/ipv6-return-error-for-rta_via-attribute.patch +++ /dev/null @@ -1,44 +0,0 @@ -From foo@baz Fri Mar 8 09:51:16 CET 2019 -From: David Ahern -Date: Tue, 26 Feb 2019 09:00:03 -0800 -Subject: ipv6: Return error for RTA_VIA attribute - -From: David Ahern - -[ Upstream commit e3818541b49fb88650ba339d33cc53e4095da5b3 ] - -IPv6 currently does not support nexthops outside of the AF_INET6 family. -Specifically, it does not handle RTA_VIA attribute. If it is passed -in a route add request, the actual route added only uses the device -which is clearly not what the user intended: - - $ ip -6 ro add 2001:db8:2::/64 via inet 172.16.1.1 dev eth0 - $ ip ro ls - ... - 2001:db8:2::/64 dev eth0 metric 1024 pref medium - -Catch this and fail the route add: - $ ip -6 ro add 2001:db8:2::/64 via inet 172.16.1.1 dev eth0 - Error: IPv6 does not support RTA_VIA attribute. - -Fixes: 03c0566542f4c ("mpls: Netlink commands to add, remove, and dump routes") -Signed-off-by: David Ahern -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/ipv6/route.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/net/ipv6/route.c -+++ b/net/ipv6/route.c -@@ -2867,6 +2867,10 @@ static int rtm_to_fib6_config(struct sk_ - cfg->fc_gateway = nla_get_in6_addr(tb[RTA_GATEWAY]); - cfg->fc_flags |= RTF_GATEWAY; - } -+ if (tb[RTA_VIA]) { -+ NL_SET_ERR_MSG(extack, "IPv6 does not support RTA_VIA attribute"); -+ goto errout; -+ } - - if (tb[RTA_DST]) { - int plen = (rtm->rtm_dst_len + 7) >> 3; diff --git a/queue-4.9/mpls-return-error-for-rta_gateway-attribute.patch b/queue-4.9/mpls-return-error-for-rta_gateway-attribute.patch deleted file mode 100644 index bd05b364ea1..00000000000 --- a/queue-4.9/mpls-return-error-for-rta_gateway-attribute.patch +++ /dev/null @@ -1,33 +0,0 @@ -From foo@baz Fri Mar 8 09:51:16 CET 2019 -From: David Ahern -Date: Tue, 26 Feb 2019 09:00:04 -0800 -Subject: mpls: Return error for RTA_GATEWAY attribute - -From: David Ahern - -[ Upstream commit be48220edd48ca0d569782992840488a52373a24 ] - -MPLS does not support nexthops with an MPLS address family. -Specifically, it does not handle RTA_GATEWAY attribute. Make it -clear by returning an error. - -Fixes: 03c0566542f4c ("mpls: Netlink commands to add, remove, and dump routes") -Signed-off-by: David Ahern -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/mpls/af_mpls.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/net/mpls/af_mpls.c -+++ b/net/mpls/af_mpls.c -@@ -1291,6 +1291,9 @@ static int rtm_to_route_config(struct sk - goto errout; - break; - } -+ case RTA_GATEWAY: -+ NL_SET_ERR_MSG(extack, "MPLS does not support RTA_GATEWAY attribute"); -+ goto errout; - case RTA_VIA: - { - if (nla_get_via(nla, &cfg->rc_via_alen, diff --git a/queue-4.9/series b/queue-4.9/series index c0829b80d68..b831bd88994 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -22,9 +22,6 @@ xen-netback-don-t-populate-the-hash-cache-on-xenbus-disconnect.patch xen-netback-fix-occasional-leak-of-grant-ref-mappings-under-memory-pressure.patch net-add-__icmp_send-helper.patch net-avoid-use-ipcb-in-cipso_v4_error.patch -ipv4-return-error-for-rta_via-attribute.patch -ipv6-return-error-for-rta_via-attribute.patch -mpls-return-error-for-rta_gateway-attribute.patch tun-fix-blocking-read.patch tun-remove-unnecessary-memory-barrier.patch net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch