From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mimi Zohar Date: Fri, 16 Dec 2016 16:50:33 +0000 Subject: Re: [patch] KEYS: Fix an error code in request_master_key() Message-Id: <1481907033.17553.78.camel@linux.vnet.ibm.com> List-Id: References: <20161216090827.GA7285@elgon.mountain> In-Reply-To: <20161216090827.GA7285@elgon.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: David Safford , David Howells , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org 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 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)) { >