diff options
| author | Maxim Mikityanskiy <maxtram95@gmail.com> | 2019-05-07 20:28:15 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-10 11:27:54 +0100 |
| commit | 2d830cf287a59a7569a6fe27d5d05d5e3148c757 (patch) | |
| tree | 77a60e21d1cf10418b728a78dc775bf1e4a7a592 | |
| parent | 558d2bdad5f6a0dd65ed7ed4f74419e826a97759 (diff) | |
| download | linux-stable-2d830cf287a59a7569a6fe27d5d05d5e3148c757.tar.gz linux-stable-2d830cf287a59a7569a6fe27d5d05d5e3148c757.tar.bz2 linux-stable-2d830cf287a59a7569a6fe27d5d05d5e3148c757.zip | |
wireless: Skip directory when generating certificates
[ 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>
| -rw-r--r-- | net/wireless/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 1d84f91bbfb0..8158b375d170 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' | \ |