fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/series b/queue-4.19/series
index 16a5aaa6787bc1b3cdd3d77b8c3b10c4e702ab3f..fbe9b40d9986ae634322433fa50d84a924119fd3 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -70,3 +70,4 @@ net-usb-lan78xx-connect-phy-before-registering-mac.patch
 net-dsa-fix-switch-tree-list.patch
 r8152-add-device-id-for-lenovo-thinkpad-usb-c-dock-gen-2.patch
 net-flow_dissector-switch-to-siphash.patch
+wireless-skip-directory-when-generating-certificates.patch

diff --git a/queue-4.19/wireless-skip-directory-when-generating-certificates.patch b/queue-4.19/wireless-skip-directory-when-generating-certificates.patch
new file mode 100644 (file)
index 0000000..3ad26ff
--- /dev/null
+++ b/queue-4.19/wireless-skip-directory-when-generating-certificates.patch
@@ -0,0 +1,42 @@
+From 4895f89dda4770f3c0f17e4bd9e1fc6a883be1ef Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 7 May 2019 20:28:15 +0300
+Subject: wireless: Skip directory when generating certificates
+
+From: Maxim Mikityanskiy <maxtram95@gmail.com>
+
+[ Upstream commit 32b5a2c9950b9284000059d752f7afa164deb15e ]
+
+Commit 715a12334764 ("wireless: don't write C files on failures") drops
+the `test -f $$f` check. The list of targets contains the
+CONFIG_CFG80211_EXTRA_REGDB_KEYDIR directory itself, and this check used
+to filter it out. After the check was removed, the extra keydir option
+no longer works, failing with the following message:
+
+od: 'standard input': read error: Is a directory
+
+This commit restores the check to make extra keydir work again.
+
+Fixes: 715a12334764 ("wireless: don't write C files on failures")
+Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/wireless/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/wireless/Makefile b/net/wireless/Makefile
+index 1d84f91bbfb0c..8158b375d1700 100644
+--- a/net/wireless/Makefile
++++ b/net/wireless/Makefile
+@@ -38,6 +38,7 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \
+       @(set -e; \
+         allf=""; \
+         for f in $^ ; do \
++            test -f $$f || continue;\
+             # similar to hexdump -v -e '1/1 "0x%.2x," "\n"' \
+             thisf=$$(od -An -v -tx1 < $$f | \
+                          sed -e 's/ /\n/g' | \
+-- 
+2.20.1
+