pstore: fix crypto dependencies without compression
PATCH 1/1 pstore: fix crypto dependencies without compression
Commit 58eb5b670747 ("pstore: fix crypto dependencies") fixed up the crypto dependencies but missed the case when no compression is selected.
With CONFIG_PSTORE=y, CONFIG_PSTORE_COMPRESS=n and CONFIG_CRYPTO=m we see the following link error:
fs/pstore/platform.o: In function `pstore_register':
(.text+0x1b1): undefined reference to crypto_has_alg' (.text+0x205): undefined reference to crypto_alloc_base' fs/pstore/platform.o: In function `pstore_unregister':
(.text+0x3b0): undefined reference to `crypto_destroy_tfm'
Fix this by selecting CONFIG_CRYPTO unconditionally.
--- fs/pstore/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/Kconfig +1 -1
@@ -1,6 +1,6 @@ config PSTORE tristate "Persistent store support" - select CRYPTO if PSTORE_COMPRESS + select CRYPTO default n help This option enables generic access to platform level
Signature · 1 line
2.16.3
Quoted 12 lines · Tobias Regnery
Commit
58eb5b670747("pstore: fix crypto dependencies") fixed up the crypto dependencies but missed the case when no compression is selected.With
CONFIG_PSTORE=y,CONFIG_PSTORE_COMPRESS=nandCONFIG_CRYPTO=mwe see the following link error:
fs/pstore/platform.o: In function `pstore_register':
(.text+0x1b1): undefined reference tocrypto_has_alg' (.text+0x205): undefined reference tocrypto_alloc_base'fs/pstore/platform.o: In function `pstore_unregister':
(.text+0x3b0): undefined reference to `crypto_destroy_tfm'
Quoted 4 lines
Fix this by selecting
CONFIG_CRYPTOunconditionally.Fixes 58eb5b670747 ("pstore: fix crypto dependencies")Signed-off-by Tobias Regnery <[email protected]>
Thanks, I wonder how I missed this one. Thanks for fixing it up. It's a bit unfortunate that it now disallows the otherwise valid CONFIG_PSTORE=y, CONFIG_PSTORE_COMPRESS=n
and CONFIG_CRYPTO=n configuration, though.
Could we do this by making the calls compile-time configured in the pstore code instead? Please try the untested version below.
Arnd
fs/pstore/platform.c +2 -2
@@ -258,7 +258,7 @@ static int pstore_decompress(void *in, void *out,static void allocate_buf_for_compression (void ) { -if (!zbackend) +if (!IS_ENABLED (CONFIG_PSTORE_COMPRESS ) || !zbackend)return ;if (!crypto_has_comp (zbackend->name,0 ,0 )) {
@@ -287,7 +287,7 @@ static void allocate_buf_for_compression(void)static void free_buf_for_compression (void ) { -if (!IS_ERR_OR_NULL (tfm)) +if (IS_ENABLED (CONFIG_PSTORE_COMPRESS ) && !IS_ERR_OR_NULL (tfm))crypto_free_comp (tfm);kfree (big_oops_buf); big_oops_buf =NULL ;
Quoted 43 lines · Arnd Bergmann
Quoted 12 lines · Tobias Regnery
Commit
58eb5b670747("pstore: fix crypto dependencies") fixed up the crypto dependencies but missed the case when no compression is selected.With
CONFIG_PSTORE=y,CONFIG_PSTORE_COMPRESS=nandCONFIG_CRYPTO=mwe see the following link error:
fs/pstore/platform.o: In function `pstore_register':
(.text+0x1b1): undefined reference tocrypto_has_alg' (.text+0x205): undefined reference tocrypto_alloc_base'fs/pstore/platform.o: In function `pstore_unregister':
(.text+0x3b0): undefined reference to `crypto_destroy_tfm'Quoted 4 lines
Fix this by selecting
CONFIG_CRYPTOunconditionally.Fixes 58eb5b670747 ("pstore: fix crypto dependencies")Signed-off-by Tobias Regnery <[email protected]>Thanks, I wonder how I missed this one. Thanks for fixing it up. It's a bit unfortunate that it now disallows the otherwise valid
CONFIG_PSTORE=y,CONFIG_PSTORE_COMPRESS=n
andCONFIG_CRYPTO=nconfiguration, though.Could we do this by making the calls compile-time configured in the pstore code instead? Please try the untested version below.
Arnd
fs/pstore/platform.c +1
-1@@ -258,7 +258,7 @@ static int pstore_decompress(void *in, void *out,static void allocate_buf_for_compression (void ) { -if (!zbackend) +if (!IS_ENABLED (CONFIG_PSTORE_COMPRESS ) || !zbackend)return ;if (!crypto_has_comp (zbackend->name,0 ,0 )) {
fs/pstore/platform.c static void allocate_buf_for_compression(void) · line 293
Quoted 8 lines
fs/pstore/platform.c +1
-1@@ -287,7 +287,7 @@ static void allocate_buf_for_compression(void)static void free_buf_for_compression (void ) { -if (!IS_ERR_OR_NULL (tfm)) +if (IS_ENABLED (CONFIG_PSTORE_COMPRESS ) && !IS_ERR_OR_NULL (tfm))crypto_free_comp (tfm);kfree (big_oops_buf); big_oops_buf =NULL ;
Hi Arnd,
this seems to be the better fix, the link error goes away with this change. Thanks for the suggestion, I will send an updated patch.
--
Tobias