Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

18 files changed, 94 insertions, 16 deletions

diff --git a/configs/fedora/generic/CONFIG_AX25 b/configs/fedora/generic/CONFIG_AX25
index 2838a653a..bc6101574 100644
--- a/configs/fedora/generic/CONFIG_AX25
+++ b/configs/fedora/generic/CONFIG_AX25
@@ -1 +1 @@
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
diff --git a/gitrev b/gitrev
index 301125f97..65a384fe6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-b0d4beaa5a4b7d31070c41c2e50740304a3f1138
+e42617b825f8073569da76dc4510bfa019b1c35a
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 6a94e631b..4044702e8 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 4a6e64c99..661ef6843 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 46f1d3cfe..754209543 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 065a0c878..6ac7b14d5 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a9923e11b..f33973b77 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index e2cac8611..526ea28a4 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 2762ea22d..9a5a07a24 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -344,7 +344,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 78b7577b5..01da40bdf 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -343,7 +343,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ba79b178d..a01242b5e 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -284,7 +284,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index d33dfbc25..569dc7eff 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -283,7 +283,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index bc424312b..1f1cddad0 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -288,7 +288,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index c192e4f26..3b1d283d7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -287,7 +287,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 48b89c3d4..9b6278cef 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -347,7 +347,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index a28baaadc..d6f3fbf68 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -346,7 +346,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_AX25=m
+# CONFIG_AX25 is not set
 CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
diff --git a/kernel.spec b/kernel.spec
index 5b2118eb5..8a90d02b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -869,6 +869,9 @@ Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
 # CVE-2019-14901 rhbz 1773519 1776184
 Patch527: mwifiex-Fix-heap-overflow-in-mmwifiex_process_tdls_action_frame.patch
 
+# Test fix for PPC build
+Patch528: netfilter_ppc_fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2907,6 +2910,12 @@ fi
 #
 #
 %changelog
+* Mon Dec 09 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc1.git0.1
+- Linux v5.5-rc1
+
+* Mon Dec 09 2019 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
 * Fri Dec 06 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git7.1
 - Linux v5.4-12941-gb0d4beaa5a4b
 
diff --git a/netfilter_ppc_fix.patch b/netfilter_ppc_fix.patch
new file mode 100644
index 000000000..421f80d41
--- /dev/null
+++ b/netfilter_ppc_fix.patch
@@ -0,0 +1,69 @@
+From: Pablo Neira Ayuso <pablo () netfilter ! org>
+Date: Sat, 07 Dec 2019 17:38:05 +0000
+To: netfilter-devel
+Subject: Re: [PATCH] netfilter: nf_flow_table_offload: Correct memcpy size for flow_overload_mangle
+
+I'm attaching a tentative patch to address this problem.
+
+Thanks.
+
+diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
+index c54c9a6cc981..3d6b2bea9a63 100644
+--- a/net/netfilter/nf_flow_table_offload.c
++++ b/net/netfilter/nf_flow_table_offload.c
+@@ -326,23 +326,23 @@ static void flow_offload_port_snat(struct net *net,
+ 				   struct nf_flow_rule *flow_rule)
+ {
+ 	struct flow_action_entry *entry = flow_action_entry_next(flow_rule);
+-	u32 mask = ~htonl(0xffff0000);
+-	__be16 port;
++	u32 mask = ~htonl(0xffff0000), port;
+ 	u32 offset;
+
+ 	switch (dir) {
+ 	case FLOW_OFFLOAD_DIR_ORIGINAL:
+-		port = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port;
++		port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port);
+ 		offset = 0; /* offsetof(struct tcphdr, source); */
+ 		break;
+ 	case FLOW_OFFLOAD_DIR_REPLY:
+-		port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port;
++		port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port);
+ 		offset = 0; /* offsetof(struct tcphdr, dest); */
+ 		break;
+ 	default:
+ 		break;
+ 	}
+
++	port = htonl(port << 16);
+ 	flow_offload_mangle(entry, flow_offload_l4proto(flow), offset,
+ 			    (u8 *)&port, (u8 *)&mask);
+ }
+@@ -353,23 +353,23 @@ static void flow_offload_port_dnat(struct net *net,
+ 				   struct nf_flow_rule *flow_rule)
+ {
+ 	struct flow_action_entry *entry = flow_action_entry_next(flow_rule);
+-	u32 mask = ~htonl(0xffff);
+-	__be16 port;
++	u32 mask = ~htonl(0xffff), port;
+ 	u32 offset;
+
+ 	switch (dir) {
+ 	case FLOW_OFFLOAD_DIR_ORIGINAL:
+-		port = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port;
++		port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port);
+ 		offset = 0; /* offsetof(struct tcphdr, source); */
+ 		break;
+ 	case FLOW_OFFLOAD_DIR_REPLY:
+-		port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port;
++		port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port);
+ 		offset = 0; /* offsetof(struct tcphdr, dest); */
+ 		break;
+ 	default:
+ 		break;
+ 	}
+
++	port = htonl(port);
+ 	flow_offload_mangle(entry, flow_offload_l4proto(flow), offset,
+ 			    (u8 *)&port, (u8 *)&mask);
+ }