From: Sasha Levin Date: Fri, 8 Nov 2019 00:08:57 +0000 (-0500) Subject: fixes for 4.19 X-Git-Tag: v4.4.200~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=591b923e15aa7947829e701931ce98f96c0cde65;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/series b/queue-4.19/series index 16a5aaa6787..fbe9b40d998 100644 --- 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 index 00000000000..3ad26ff348f --- /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 +Date: Tue, 7 May 2019 20:28:15 +0300 +Subject: wireless: Skip directory when generating certificates + +From: Maxim Mikityanskiy + +[ 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 +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + 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 +