From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756638Ab0EQWxN (ORCPT ); Mon, 17 May 2010 18:53:13 -0400 Received: from tundra.namei.org ([65.99.196.166]:42295 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755831Ab0EQWxJ (ORCPT ); Mon, 17 May 2010 18:53:09 -0400 Date: Tue, 18 May 2010 08:51:43 +1000 (EST) From: James Morris To: David Howells cc: torvalds@osdl.org, Andrew Morton , Oleg Nesterov , keyrings@linux-nfs.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , stable@kernel.org Subject: Re: [PATCH] KEYS: Return more accurate error codes In-Reply-To: <20100517134235.19013.90388.stgit@warthog.procyon.org.uk> Message-ID: References: <20100517134235.19013.90388.stgit@warthog.procyon.org.uk> User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 17 May 2010, David Howells wrote: > From: Dan Carpenter > > We were using the wrong variable here so the error codes weren't being returned > properly. The original code returns -ENOKEY. > > Signed-off-by: Dan Carpenter > Signed-off-by: David Howells Queued for Linus -- is also likely a -stable candidate. > --- > > security/keys/process_keys.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c > index 06c2ccf..20a38fe 100644 > --- a/security/keys/process_keys.c > +++ b/security/keys/process_keys.c > @@ -508,7 +508,7 @@ try_again: > > ret = install_thread_keyring(); > if (ret < 0) { > - key = ERR_PTR(ret); > + key_ref = ERR_PTR(ret); > goto error; > } > goto reget_creds; > @@ -526,7 +526,7 @@ try_again: > > ret = install_process_keyring(); > if (ret < 0) { > - key = ERR_PTR(ret); > + key_ref = ERR_PTR(ret); > goto error; > } > goto reget_creds; > @@ -585,7 +585,7 @@ try_again: > > case KEY_SPEC_GROUP_KEYRING: > /* group keyrings are not yet supported */ > - key = ERR_PTR(-EINVAL); > + key_ref = ERR_PTR(-EINVAL); > goto error; > > case KEY_SPEC_REQKEY_AUTH_KEY: > -- James Morris