Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 534fb8a8 authored by Johannes Berg's avatar Johannes Berg Committed by Sasha Levin
Browse files

cfg80211: make certificate generation more robust 



commit b5642479b0f7168fe16d156913533fe65ab4f8d5 upstream.

If all net/wireless/certs/*.hex files are deleted, the build
will hang at this point since the 'cat' command will have no
arguments. Do "echo | cat - ..." so that even if the "..."
part is empty, the whole thing won't hang.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210618133832.c989056c3664.Ic3b77531d00b30b26dcd69c64e55ae2f60c3f31e@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d1224a9

net/wireless/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.hex) 
	@$(kecho) "  GEN     $@"

	@$(kecho) "  GEN     $@"

	@(echo '#include "reg.h"'; \

	@(echo '#include "reg.h"'; \

	  echo 'const u8 shipped_regdb_certs[] = {'; \

	  echo 'const u8 shipped_regdb_certs[] = {'; \

	  cat $^ ; \

	  echo | cat - $^ ; \

	  echo '};'; \

	  echo '};'; \

	  echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \

	  echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \

	 ) > $@

	 ) > $@