* [PATCH v2 1/2] crypto: sunxi - don't print confusing data
@ 2016-01-26 13:44 ` Arnd Bergmann
0 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2016-01-26 13:44 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-arm-kernel, Arnd Bergmann, Corentin Labbe, David S. Miller,
Maxime Ripard, Chen-Yu Tsai, linux-crypto, linux-kernel
gcc correctly warns that the printk output contains a variable that
it thinks is not initialized in some cases:
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
A closer look at the function reveals that the variable is always
initialized at this point (ileft is guaranteed to be positive at the
start), but its contents are not well-defined:
Depending on some other variables, it might be either a count in
words or bytes, and it could refer to either input or output.
The easiest solution apparently is to remove the confusing output
and let the reader figure out the state from the other variables.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
index a19ee127edca..7be3fbcd8d78 100644
--- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
@@ -251,11 +251,10 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
spaces = readl(ss->base + SS_FCSR);
rx_cnt = SS_RXFIFO_SPACES(spaces);
tx_cnt = SS_TXFIFO_SPACES(spaces);
- dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u %u\n",
+ dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n",
mode,
oi, mi.length, ileft, areq->nbytes, rx_cnt,
- oo, mo.length, oleft, areq->nbytes, tx_cnt,
- todo, ob);
+ oo, mo.length, oleft, areq->nbytes, tx_cnt, ob);
if (tx_cnt == 0)
continue;
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] crypto: sunxi - don't print confusing data
@ 2016-01-26 13:44 ` Arnd Bergmann
0 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2016-01-26 13:44 UTC (permalink / raw)
To: linux-arm-kernel
gcc correctly warns that the printk output contains a variable that
it thinks is not initialized in some cases:
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
A closer look at the function reveals that the variable is always
initialized at this point (ileft is guaranteed to be positive at the
start), but its contents are not well-defined:
Depending on some other variables, it might be either a count in
words or bytes, and it could refer to either input or output.
The easiest solution apparently is to remove the confusing output
and let the reader figure out the state from the other variables.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
index a19ee127edca..7be3fbcd8d78 100644
--- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
@@ -251,11 +251,10 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
spaces = readl(ss->base + SS_FCSR);
rx_cnt = SS_RXFIFO_SPACES(spaces);
tx_cnt = SS_TXFIFO_SPACES(spaces);
- dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u %u\n",
+ dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n",
mode,
oi, mi.length, ileft, areq->nbytes, rx_cnt,
- oo, mo.length, oleft, areq->nbytes, tx_cnt,
- todo, ob);
+ oo, mo.length, oleft, areq->nbytes, tx_cnt, ob);
if (tx_cnt == 0)
continue;
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] crypto: jitterentropy - always select CRYPTO_RNG
2016-01-26 13:44 ` Arnd Bergmann
@ 2016-01-26 13:47 ` Arnd Bergmann
-1 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2016-01-26 13:47 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-arm-kernel, Arnd Bergmann, David S. Miller, linux-crypto,
linux-kernel
When building the jitterentropy driver by itself, we get a link error
when CRYPTO_RNG is not enabled as well:
crypto/built-in.o: In function `jent_mod_init':
jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng'
crypto/built-in.o: In function `jent_mod_exit':
jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng'
This adds a 'select CRYPTO_RNG' to CRYPTO_JITTERENTROPY to ensure the API
is always there when it's used, not just when DRBG is also enabled.
CRYPTO_DRBG would set it implicitly through CRYPTO_JITTERENTROPY now,
but this leaves it in place to make it explicit what the driver does.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
crypto/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3be07ad1d80d..88248821af82 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1595,6 +1595,7 @@ endif # if CRYPTO_DRBG_MENU
config CRYPTO_JITTERENTROPY
tristate "Jitterentropy Non-Deterministic Random Number Generator"
+ select CRYPTO_RNG
help
The Jitterentropy RNG is a noise that is intended
to provide seed to another RNG. The RNG does not
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] crypto: jitterentropy - always select CRYPTO_RNG
@ 2016-01-26 13:47 ` Arnd Bergmann
0 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2016-01-26 13:47 UTC (permalink / raw)
To: linux-arm-kernel
When building the jitterentropy driver by itself, we get a link error
when CRYPTO_RNG is not enabled as well:
crypto/built-in.o: In function `jent_mod_init':
jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng'
crypto/built-in.o: In function `jent_mod_exit':
jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng'
This adds a 'select CRYPTO_RNG' to CRYPTO_JITTERENTROPY to ensure the API
is always there when it's used, not just when DRBG is also enabled.
CRYPTO_DRBG would set it implicitly through CRYPTO_JITTERENTROPY now,
but this leaves it in place to make it explicit what the driver does.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
crypto/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3be07ad1d80d..88248821af82 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1595,6 +1595,7 @@ endif # if CRYPTO_DRBG_MENU
config CRYPTO_JITTERENTROPY
tristate "Jitterentropy Non-Deterministic Random Number Generator"
+ select CRYPTO_RNG
help
The Jitterentropy RNG is a noise that is intended
to provide seed to another RNG. The RNG does not
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] crypto: sunxi - don't print confusing data
2016-01-26 13:44 ` Arnd Bergmann
@ 2016-01-27 14:17 ` Herbert Xu
-1 siblings, 0 replies; 10+ messages in thread
From: Herbert Xu @ 2016-01-27 14:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Corentin Labbe, David S. Miller, Maxime Ripard,
Chen-Yu Tsai, linux-crypto, linux-kernel
On Tue, Jan 26, 2016 at 02:44:50PM +0100, Arnd Bergmann wrote:
> gcc correctly warns that the printk output contains a variable that
> it thinks is not initialized in some cases:
>
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
>
> A closer look at the function reveals that the variable is always
> initialized at this point (ileft is guaranteed to be positive at the
> start), but its contents are not well-defined:
> Depending on some other variables, it might be either a count in
> words or bytes, and it could refer to either input or output.
>
> The easiest solution apparently is to remove the confusing output
> and let the reader figure out the state from the other variables.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] crypto: sunxi - don't print confusing data
@ 2016-01-27 14:17 ` Herbert Xu
0 siblings, 0 replies; 10+ messages in thread
From: Herbert Xu @ 2016-01-27 14:17 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 26, 2016 at 02:44:50PM +0100, Arnd Bergmann wrote:
> gcc correctly warns that the printk output contains a variable that
> it thinks is not initialized in some cases:
>
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
>
> A closer look at the function reveals that the variable is always
> initialized at this point (ileft is guaranteed to be positive at the
> start), but its contents are not well-defined:
> Depending on some other variables, it might be either a count in
> words or bytes, and it could refer to either input or output.
>
> The easiest solution apparently is to remove the confusing output
> and let the reader figure out the state from the other variables.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] crypto: jitterentropy - always select CRYPTO_RNG
2016-01-26 13:47 ` Arnd Bergmann
@ 2016-01-27 14:17 ` Herbert Xu
-1 siblings, 0 replies; 10+ messages in thread
From: Herbert Xu @ 2016-01-27 14:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, David S. Miller, linux-crypto, linux-kernel
On Tue, Jan 26, 2016 at 02:47:10PM +0100, Arnd Bergmann wrote:
> When building the jitterentropy driver by itself, we get a link error
> when CRYPTO_RNG is not enabled as well:
>
> crypto/built-in.o: In function `jent_mod_init':
> jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng'
> crypto/built-in.o: In function `jent_mod_exit':
> jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng'
>
> This adds a 'select CRYPTO_RNG' to CRYPTO_JITTERENTROPY to ensure the API
> is always there when it's used, not just when DRBG is also enabled.
> CRYPTO_DRBG would set it implicitly through CRYPTO_JITTERENTROPY now,
> but this leaves it in place to make it explicit what the driver does.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] crypto: jitterentropy - always select CRYPTO_RNG
@ 2016-01-27 14:17 ` Herbert Xu
0 siblings, 0 replies; 10+ messages in thread
From: Herbert Xu @ 2016-01-27 14:17 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 26, 2016 at 02:47:10PM +0100, Arnd Bergmann wrote:
> When building the jitterentropy driver by itself, we get a link error
> when CRYPTO_RNG is not enabled as well:
>
> crypto/built-in.o: In function `jent_mod_init':
> jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng'
> crypto/built-in.o: In function `jent_mod_exit':
> jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng'
>
> This adds a 'select CRYPTO_RNG' to CRYPTO_JITTERENTROPY to ensure the API
> is always there when it's used, not just when DRBG is also enabled.
> CRYPTO_DRBG would set it implicitly through CRYPTO_JITTERENTROPY now,
> but this leaves it in place to make it explicit what the driver does.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] crypto: sunxi - don't print confusing data
2016-01-26 13:44 ` Arnd Bergmann
@ 2016-01-27 19:42 ` Corentin LABBE
-1 siblings, 0 replies; 10+ messages in thread
From: Corentin LABBE @ 2016-01-27 19:42 UTC (permalink / raw)
To: Arnd Bergmann, Herbert Xu
Cc: linux-arm-kernel, David S. Miller, Maxime Ripard, Chen-Yu Tsai,
linux-crypto, linux-kernel
Le 26/01/2016 14:44, Arnd Bergmann a écrit :
> gcc correctly warns that the printk output contains a variable that
> it thinks is not initialized in some cases:
>
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
>
> A closer look at the function reveals that the variable is always
> initialized at this point (ileft is guaranteed to be positive at the
> start), but its contents are not well-defined:
> Depending on some other variables, it might be either a count in
> words or bytes, and it could refer to either input or output.
>
> The easiest solution apparently is to remove the confusing output
> and let the reader figure out the state from the other variables.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> index a19ee127edca..7be3fbcd8d78 100644
> --- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> +++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> @@ -251,11 +251,10 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
> spaces = readl(ss->base + SS_FCSR);
> rx_cnt = SS_RXFIFO_SPACES(spaces);
> tx_cnt = SS_TXFIFO_SPACES(spaces);
> - dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u %u\n",
> + dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n",
> mode,
> oi, mi.length, ileft, areq->nbytes, rx_cnt,
> - oo, mo.length, oleft, areq->nbytes, tx_cnt,
> - todo, ob);
> + oo, mo.length, oleft, areq->nbytes, tx_cnt, ob);
>
> if (tx_cnt == 0)
> continue;
>
Hello
A bit late but Acked-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Thanks
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] crypto: sunxi - don't print confusing data
@ 2016-01-27 19:42 ` Corentin LABBE
0 siblings, 0 replies; 10+ messages in thread
From: Corentin LABBE @ 2016-01-27 19:42 UTC (permalink / raw)
To: linux-arm-kernel
Le 26/01/2016 14:44, Arnd Bergmann a ?crit :
> gcc correctly warns that the printk output contains a variable that
> it thinks is not initialized in some cases:
>
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c: In function 'sun4i_ss_cipher_poll':
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:254:76: warning: 'todo' may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c:144:15: note: 'todo' was declared here
>
> A closer look at the function reveals that the variable is always
> initialized at this point (ileft is guaranteed to be positive at the
> start), but its contents are not well-defined:
> Depending on some other variables, it might be either a count in
> words or bytes, and it could refer to either input or output.
>
> The easiest solution apparently is to remove the confusing output
> and let the reader figure out the state from the other variables.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> index a19ee127edca..7be3fbcd8d78 100644
> --- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> +++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
> @@ -251,11 +251,10 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
> spaces = readl(ss->base + SS_FCSR);
> rx_cnt = SS_RXFIFO_SPACES(spaces);
> tx_cnt = SS_TXFIFO_SPACES(spaces);
> - dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u %u\n",
> + dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n",
> mode,
> oi, mi.length, ileft, areq->nbytes, rx_cnt,
> - oo, mo.length, oleft, areq->nbytes, tx_cnt,
> - todo, ob);
> + oo, mo.length, oleft, areq->nbytes, tx_cnt, ob);
>
> if (tx_cnt == 0)
> continue;
>
Hello
A bit late but Acked-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Thanks
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-01-27 19:42 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-26 13:44 [PATCH v2 1/2] crypto: sunxi - don't print confusing data Arnd Bergmann
2016-01-26 13:44 ` Arnd Bergmann
2016-01-26 13:47 ` [PATCH v2 2/2] crypto: jitterentropy - always select CRYPTO_RNG Arnd Bergmann
2016-01-26 13:47 ` Arnd Bergmann
2016-01-27 14:17 ` Herbert Xu
2016-01-27 14:17 ` Herbert Xu
2016-01-27 14:17 ` [PATCH v2 1/2] crypto: sunxi - don't print confusing data Herbert Xu
2016-01-27 14:17 ` Herbert Xu
2016-01-27 19:42 ` Corentin LABBE
2016-01-27 19:42 ` Corentin LABBE
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.