Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065AbbFYNMy (ORCPT ); Thu, 25 Jun 2015 09:12:54 -0400 Received: from h2.hallyn.com ([78.46.35.8]:50228 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751023AbbFYNMq (ORCPT ); Thu, 25 Jun 2015 09:12:46 -0400 Date: Thu, 25 Jun 2015 08:12:44 -0500 From: "Serge E. Hallyn" To: SF Markus Elfring Cc: David Howells , James Morris , "Serge E. Hallyn" , keyrings@linux-nfs.org, linux-security-module@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH] keys: Delete an unnecessary check before the function call "key_put" Message-ID: <20150625131244.GA25232@mail.hallyn.com> References: <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <546BB427.2050101@users.sourceforge.net> <558AAEAF.7040606@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <558AAEAF.7040606@users.sourceforge.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1294 Lines: 39 On Wed, Jun 24, 2015 at 03:20:47PM +0200, SF Markus Elfring wrote: > From: Markus Elfring > Date: Wed, 24 Jun 2015 15:16:35 +0200 > > The key_put() function tests whether its argument is NULL and then > returns immediately. Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring Acked-by: Serge Hallyn > --- > security/keys/process_keys.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c > index bd536cb..225dd08 100644 > --- a/security/keys/process_keys.c > +++ b/security/keys/process_keys.c > @@ -242,9 +242,7 @@ int install_session_keyring_to_cred(struct cred *cred, struct key *keyring) > old = cred->session_keyring; > rcu_assign_pointer(cred->session_keyring, keyring); > > - if (old) > - key_put(old); > - > + key_put(old); > return 0; > } > > -- > 2.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/