diff mbox series

[4.19,12/58] dm integrity: select CRYPTO_SKCIPHER

Message ID 20210125183157.221452946@linuxfoundation.org
State Superseded
Headers show
Series None | expand

Commit Message

Greg Kroah-Hartman Jan. 25, 2021, 6:39 p.m. UTC 
From: Anthony Iliopoulos <ailiop@suse.com>

[ Upstream commit f7b347acb5f6c29d9229bb64893d8b6a2c7949fb ]

The integrity target relies on skcipher for encryption/decryption, but
certain kernel configurations may not enable CRYPTO_SKCIPHER, leading to
compilation errors due to unresolved symbols. Explicitly select
CRYPTO_SKCIPHER for DM_INTEGRITY, since it is unconditionally dependent
on it.

Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/md/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Pavel Machek Jan. 25, 2021, 6:58 p.m. UTC | #1 
Hi!

> From: Anthony Iliopoulos <ailiop@suse.com>
> 
> [ Upstream commit f7b347acb5f6c29d9229bb64893d8b6a2c7949fb ]
> 
> The integrity target relies on skcipher for encryption/decryption, but
> certain kernel configurations may not enable CRYPTO_SKCIPHER, leading to
> compilation errors due to unresolved symbols. Explicitly select
> CRYPTO_SKCIPHER for DM_INTEGRITY, since it is unconditionally dependent
> on it.

There is no such config option in 4.19. This patch is not suitable
here.

grep -r CRYPTO_SKCIPHER .
./include/crypto/skcipher.h:#ifndef _CRYPTO_SKCIPHER_H
./include/crypto/skcipher.h:#define _CRYPTO_SKCIPHER_H
./include/crypto/skcipher.h:#endif	/* _CRYPTO_SKCIPHER_H */

Best regards,
								Pavel

> +++ b/drivers/md/Kconfig
> @@ -527,6 +527,7 @@ config DM_INTEGRITY
>  	select BLK_DEV_INTEGRITY
>  	select DM_BUFIO
>  	select CRYPTO
> +	select CRYPTO_SKCIPHER
>  	select ASYNC_XOR
>  	---help---
>  	  This device-mapper target emulates a block device that has
Greg Kroah-Hartman Jan. 26, 2021, 8:47 a.m. UTC | #2 
On Mon, Jan 25, 2021 at 07:58:29PM +0100, Pavel Machek wrote:
> Hi!
> 
> > From: Anthony Iliopoulos <ailiop@suse.com>
> > 
> > [ Upstream commit f7b347acb5f6c29d9229bb64893d8b6a2c7949fb ]
> > 
> > The integrity target relies on skcipher for encryption/decryption, but
> > certain kernel configurations may not enable CRYPTO_SKCIPHER, leading to
> > compilation errors due to unresolved symbols. Explicitly select
> > CRYPTO_SKCIPHER for DM_INTEGRITY, since it is unconditionally dependent
> > on it.
> 
> There is no such config option in 4.19. This patch is not suitable
> here.
> 
> grep -r CRYPTO_SKCIPHER .
> ./include/crypto/skcipher.h:#ifndef _CRYPTO_SKCIPHER_H
> ./include/crypto/skcipher.h:#define _CRYPTO_SKCIPHER_H
> ./include/crypto/skcipher.h:#endif	/* _CRYPTO_SKCIPHER_H */
> 
> Best regards,
> 								Pavel
> 
> > +++ b/drivers/md/Kconfig
> > @@ -527,6 +527,7 @@ config DM_INTEGRITY
> >  	select BLK_DEV_INTEGRITY
> >  	select DM_BUFIO
> >  	select CRYPTO
> > +	select CRYPTO_SKCIPHER
> >  	select ASYNC_XOR
> >  	---help---
> >  	  This device-mapper target emulates a block device that has

Good catch, now dropped, thanks.

greg k-h
diff mbox series

Patch

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 8b8c123cae66f..7d61ef03cb187 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -527,6 +527,7 @@  config DM_INTEGRITY
 	select BLK_DEV_INTEGRITY
 	select DM_BUFIO
 	select CRYPTO
+	select CRYPTO_SKCIPHER
 	select ASYNC_XOR
 	---help---
 	  This device-mapper target emulates a block device that has