Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1543282 > unrolled thread

[patch] KEYS: Fix an error code in request_master_key()

Back to article view | Back to linux.kernel

Contents

  [patch] KEYS: Fix an error code in request_master_key() Dan Carpenter <dan.carpenter@oracle.com> - 2016-12-16 10:10 +0100
    Re: [patch] KEYS: Fix an error code in request_master_key() Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-12-16 18:00 +0100

#1543282 — [patch] KEYS: Fix an error code in request_master_key()

This function has two callers and neither are able to handle a NULL
return.  Really, -EINVAL is the correct thing return here anyway.  This
fixes some static checker warnings like:

	security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt()
	error: uninitialized symbol 'master_key'.

Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 17a06105ccb6..d7a4969b2dd3 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -437,7 +437,7 @@ static struct skcipher_request *init_skcipher_req(const u8 *key,
 static struct key *request_master_key(struct encrypted_key_payload *epayload,
 				      const u8 **master_key, size_t *master_keylen)
 {
-	struct key *mkey = NULL;
+	struct key *mkey = ERR_PTR(-EINVAL);
 
 	if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,
 		     KEY_TRUSTED_PREFIX_LEN)) {

[toc] | [next] | [standalone]

#1543596

Hi Dan,

On Fri, 2016-12-16 at 12:08 +0300, Dan Carpenter wrote:
> This function has two callers and neither are able to handle a NULL
> return.  Really, -EINVAL is the correct thing return here anyway.  This
> fixes some static checker warnings like:
> 
> 	security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt()
> 	error: uninitialized symbol 'master_key'.
> 
> Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks!

Mimi

> diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
> index 17a06105ccb6..d7a4969b2dd3 100644
> --- a/security/keys/encrypted-keys/encrypted.c
> +++ b/security/keys/encrypted-keys/encrypted.c
> @@ -437,7 +437,7 @@ static struct skcipher_request *init_skcipher_req(const u8 *key,
>  static struct key *request_master_key(struct encrypted_key_payload *epayload,
>  				      const u8 **master_key, size_t *master_keylen)
>  {
> -	struct key *mkey = NULL;
> +	struct key *mkey = ERR_PTR(-EINVAL);
> 
>  	if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,
>  		     KEY_TRUSTED_PREFIX_LEN)) {
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web