From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932958Ab0J1MQ1 (ORCPT ); Thu, 28 Oct 2010 08:16:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45245 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932745Ab0J1MQY (ORCPT ); Thu, 28 Oct 2010 08:16:24 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH] Fix install_process_keyring error handling To: torvalds@osdl.org, akpm@linux-foundation.org From: David Howells Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 28 Oct 2010 13:16:13 +0100 Message-ID: <20101028121613.10181.55944.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.15-97-g9680-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Fix incorrect error check that returns 1 for error instead of the expected error code. Signed-off-by: Andi Kleen Signed-off-by: David Howells --- security/keys/process_keys.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index f8e7251..504bdd2 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -207,7 +207,7 @@ static int install_process_keyring(void) ret = install_process_keyring_to_cred(new); if (ret < 0) { abort_creds(new); - return ret != -EEXIST ?: 0; + return ret != -EEXIST ? ret : 0; } return commit_creds(new);