* [patch] KEYS: Fix an error code in request_master_key()
@ 2016-12-16 9:08 Dan Carpenter
2016-12-16 16:50 ` Mimi Zohar
2017-01-12 13:08 ` David Howells
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2016-12-16 9:08 UTC (permalink / raw)
To: Mimi Zohar
Cc: David Safford, David Howells, James Morris, Serge E. Hallyn,
linux-security-module, keyrings, linux-kernel, kernel-janitors
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)) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch] KEYS: Fix an error code in request_master_key()
2016-12-16 9:08 [patch] KEYS: Fix an error code in request_master_key() Dan Carpenter
@ 2016-12-16 16:50 ` Mimi Zohar
2017-01-12 13:08 ` David Howells
1 sibling, 0 replies; 4+ messages in thread
From: Mimi Zohar @ 2016-12-16 16:50 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Safford, David Howells, James Morris, Serge E. Hallyn,
linux-security-module, keyrings, linux-kernel, kernel-janitors
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)) {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] KEYS: Fix an error code in request_master_key()
2016-12-16 9:08 [patch] KEYS: Fix an error code in request_master_key() Dan Carpenter
2016-12-16 16:50 ` Mimi Zohar
@ 2017-01-12 13:08 ` David Howells
2017-01-16 13:58 ` Mimi Zohar
1 sibling, 1 reply; 4+ messages in thread
From: David Howells @ 2017-01-12 13:08 UTC (permalink / raw)
To: Mimi Zohar
Cc: dhowells, Dan Carpenter, David Safford, James Morris,
Serge E. Hallyn, linux-security-module, keyrings, linux-kernel,
kernel-janitors
Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
> 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!
Can I put that down as an Acked-by or Reviewed-by?
David
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] KEYS: Fix an error code in request_master_key()
2017-01-12 13:08 ` David Howells
@ 2017-01-16 13:58 ` Mimi Zohar
0 siblings, 0 replies; 4+ messages in thread
From: Mimi Zohar @ 2017-01-16 13:58 UTC (permalink / raw)
To: David Howells
Cc: Dan Carpenter, David Safford, James Morris, Serge E. Hallyn,
linux-security-module, keyrings, linux-kernel, kernel-janitors
On Thu, 2017-01-12 at 13:08 +0000, David Howells wrote:
> Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
>
> > 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!
>
> Can I put that down as an Acked-by or Reviewed-by?
Feel free to add by "Acked-by" on both this patch and Dan's other patch
"KEYS: Use memzero_explicit() for secret data".
Mimi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-16 13:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-16 9:08 [patch] KEYS: Fix an error code in request_master_key() Dan Carpenter
2016-12-16 16:50 ` Mimi Zohar
2017-01-12 13:08 ` David Howells
2017-01-16 13:58 ` Mimi Zohar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).