[arch-commits] Commit in linux-hardened/trunk (3 files)

[Levente Polyak]

    Date: Thursday, July 12, 2018 @ 16:46:40
  Author: anthraxx
Revision: 328312

upgpkg: linux-hardened 4.17.6.a-1

Added:
  linux-hardened/trunk/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64

------------------------------------------------------------+
 PKGBUILD                                                   |   13 ++-
 config.x86_64                                              |    6 -
 mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch |   43 +++++++++++
 3 files changed, 54 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-12 16:14:19 UTC (rev 328311)
+++ PKGBUILD	2018-07-12 16:46:40 UTC (rev 328312)
@@ -5,7 +5,7 @@
 
 pkgbase=linux-hardened
 _srcname=linux-4.17
-_pkgver=4.17.5
+_pkgver=4.17.6
 pkgver=${_pkgver}.a
 pkgrel=1
 url='https://github.com/anthraxx/linux-hardened'
@@ -28,20 +28,23 @@
         ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
         # https://bugs.archlinux.org/task/56711
         Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
+        # Fix iwd provoking a BUG
+        mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
 )
 replaces=('linux-grsec')
 sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
             'SKIP'
-            'cc18fcf14df25f0bab047aa180b9362bd4f3ce96f1b05e1f7764cfcc0e271bbd'
+            '7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf'
             'SKIP'
-            '7b39254f8a01e1c5f3757360f18eb68d250b4ae9393176cceddd6122203f94e0'
+            '682684b99a2cea2937d3365b4dc43df313c7b87338a2612a2976172d3891a762'
             'SKIP'
-            '43896cb1572f82a463e92b8f5ded9a30d73352117df05de309541aadaf9e6bcd'
+            '37bb7dce427e4e7a07263746c141e30488e1a785cdb931f479ea57707dc3e479'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             'd744e7f4552896670bc8b99361534eec7ba095bebc2462ef0e5ee433e6341a0a'
-            '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e')
+            '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e'
+            'ef7c149d9af24efea551cec86e26f52c9c1cc02714335e948f929985ff414676')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman

Modified: config.x86_64
===================================================================
--- config.x86_64	2018-07-12 16:14:19 UTC (rev 328311)
+++ config.x86_64	2018-07-12 16:46:40 UTC (rev 328312)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.5 Kernel Configuration
+# Linux/x86 4.17.6 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -6285,7 +6285,7 @@
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
@@ -6808,7 +6808,7 @@
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 #
 # USB Miscellaneous drivers

Added: mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
===================================================================
--- mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch	                        (rev 0)
+++ mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch	2018-07-12 16:46:40 UTC (rev 328312)
@@ -0,0 +1,43 @@
+From e7441c9274a6a5453e06f4c2b8b5f72eca0a3f17 Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz at gmail.com>
+Date: Tue, 19 Jun 2018 10:39:50 -0500
+Subject: [PATCH] mac80211: disable BHs/preemption in
+ ieee80211_tx_control_port()
+
+On pre-emption enabled kernels the following print was being seen due to
+missing local_bh_disable/local_bh_enable calls.  mac80211 assumes that
+pre-emption is disabled in the data path.
+
+    BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
+    caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
+    [...]
+    Call Trace:
+    dump_stack+0x5c/0x80
+    check_preemption_disabled.cold.0+0x46/0x51
+    __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
+
+Fixes: 911806491425 ("mac80211: Add support for tx_control_port")
+Signed-off-by: Denis Kenzior <denkenz at gmail.com>
+[commit message rewrite, fixes tag]
+Signed-off-by: Johannes Berg <johannes.berg at intel.com>
+---
+ net/mac80211/tx.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 44b5dfe8727d..fa1f1e63a264 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -4845,7 +4845,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
+ 	skb_reset_network_header(skb);
+ 	skb_reset_mac_header(skb);
+ 
++	local_bh_disable();
+ 	__ieee80211_subif_start_xmit(skb, skb->dev, flags);
++	local_bh_enable();
+ 
+ 	return 0;
+ }
+-- 
+2.18.0
+