From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751920AbdIUU7l (ORCPT ); Thu, 21 Sep 2017 16:59:41 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34133 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbdIUU7K (ORCPT ); Thu, 21 Sep 2017 16:59:10 -0400 X-Google-Smtp-Source: AOwi7QAnm+qk9VuHGy50hKElTG4AbyYQcBuJnSGb/g72g0AMlQXNgUVJH0YkqceIku5udVIp2Lfo+A== From: Eric Biggers To: keyrings@vger.kernel.org Cc: David Howells , Michael Halcrow , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH v2 2/3] KEYS: don't revoke uninstantiated key in request_key_auth_new() Date: Thu, 21 Sep 2017 13:57:41 -0700 Message-Id: <20170921205742.144596-3-ebiggers3@gmail.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7-goog In-Reply-To: <20170921205742.144596-1-ebiggers3@gmail.com> References: <20170921205742.144596-1-ebiggers3@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Biggers If key_instantiate_and_link() were to fail (which fortunately isn't possible currently), the call to key_revoke(authkey) would crash with a NULL pointer dereference in request_key_auth_revoke() because the key has not yet been instantiated. Fix this by removing the call to key_revoke(). key_put() is sufficient, as it's not possible for an uninstantiated authkey to have been used for anything yet. Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys") Signed-off-by: Eric Biggers --- security/keys/request_key_auth.c | 1 - 1 file changed, 1 deletion(-) diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 8f12645945ca..2df92b619a38 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -220,7 +220,6 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info, return authkey; error_put_authkey: - key_revoke(authkey); key_put(authkey); error_free_rka: free_request_key_auth(rka); -- 2.14.1.821.g8fa685d3b7-goog