From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Nov 2020 12:19:49 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.247~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29323f9517d71cda82ddd88d3625ccb41e8a6508;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	ipv4-use-is_enabled-instead-of-ifdef.patch
---

diff --git a/queue-5.4/ipv4-use-is_enabled-instead-of-ifdef.patch b/queue-5.4/ipv4-use-is_enabled-instead-of-ifdef.patch
new file mode 100644
index 00000000000..5e0b64c1866
--- /dev/null
+++ b/queue-5.4/ipv4-use-is_enabled-instead-of-ifdef.patch
@@ -0,0 +1,43 @@
+From c09c8a27b9baa417864b9adc3228b10ae5eeec93 Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Sun, 15 Nov 2020 23:45:09 +0100
+Subject: ipv4: use IS_ENABLED instead of ifdef
+
+From: Florian Klink <flokli@flokli.de>
+
+commit c09c8a27b9baa417864b9adc3228b10ae5eeec93 upstream.
+
+Checking for ifdef CONFIG_x fails if CONFIG_x=m.
+
+Use IS_ENABLED instead, which is true for both built-ins and modules.
+
+Otherwise, a
+> ip -4 route add 1.2.3.4/32 via inet6 fe80::2 dev eth1
+fails with the message "Error: IPv6 support not enabled in kernel." if
+CONFIG_IPV6 is `m`.
+
+In the spirit of b8127113d01e53adba15b41aefd37b90ed83d631.
+
+Fixes: d15662682db2 ("ipv4: Allow ipv6 gateway with ipv4 routes")
+Cc: Kim Phillips <kim.phillips@arm.com>
+Signed-off-by: Florian Klink <flokli@flokli.de>
+Reviewed-by: David Ahern <dsahern@kernel.org>
+Link: https://lore.kernel.org/r/20201115224509.2020651-1-flokli@flokli.de
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv4/fib_frontend.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/ipv4/fib_frontend.c
++++ b/net/ipv4/fib_frontend.c
+@@ -706,7 +706,7 @@ int fib_gw_from_via(struct fib_config *c
+ 		cfg->fc_gw4 = *((__be32 *)via->rtvia_addr);
+ 		break;
+ 	case AF_INET6:
+-#ifdef CONFIG_IPV6
++#if IS_ENABLED(CONFIG_IPV6)
+ 		if (alen != sizeof(struct in6_addr)) {
+ 			NL_SET_ERR_MSG(extack, "Invalid IPv6 address in RTA_VIA");
+ 			return -EINVAL;
diff --git a/queue-5.4/series b/queue-5.4/series
index b633d70ae66..fe8a9dbcfc9 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,2 +1,3 @@
 spi-bcm-qspi-fix-use-after-free-on-unbind.patch
 spi-bcm2835-fix-use-after-free-on-unbind.patch
+ipv4-use-is_enabled-instead-of-ifdef.patch