From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A4D7C433E2 for ; Mon, 20 Jul 2020 16:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1607B20773 for ; Mon, 20 Jul 2020 16:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260853; bh=WWdC/8JRDZCpZNHg7v589mBckIuYNk/cwpy8NeYCGjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yWEV+u/F0Frl2oUU3FAk/Vkpcm54wfMgmsQzyYlCAE/oMWEA/7YQ3UmF2AtfHc5qw CTG20LwAk3oagkoUh5Kx3uSNt5aV1uh3xc1SWeN8rl6OBcrowePRZ6wrEalXRMy2Qj Eyq+Vpay8cxtBxc5THVFWNOn/Xtw3X0ttTabg4OY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732064AbgGTQAv (ORCPT ); Mon, 20 Jul 2020 12:00:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:33900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732073AbgGTQAr (ORCPT ); Mon, 20 Jul 2020 12:00:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3318820684; Mon, 20 Jul 2020 16:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260846; bh=WWdC/8JRDZCpZNHg7v589mBckIuYNk/cwpy8NeYCGjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqxRr1SIg7JeNxYNAfSz4BFqhVA/5RNjJotMq9MfB7IHjkMjHSET4khI9HCqi1xOZ rn+zqVAFGftEzjNGOy95JGXkL8iOD2GxfzgViQA2WITz8x2bTzpR0s83qdLDp9VuW3 iGcxUfT/+WX1why3nwhTjJGZvVkaLKWmh2bfHthc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , David Howells , Linus Torvalds , Sasha Levin Subject: [PATCH 5.4 117/215] keys: asymmetric: fix error return code in software_key_query() Date: Mon, 20 Jul 2020 17:36:39 +0200 Message-Id: <20200720152825.762641619@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 6cbba1f9114a8134cff9138c79add15012fd52b9 ] Fix to return negative error code -ENOMEM from kmalloc() error handling case instead of 0, as done elsewhere in this function. Fixes: f1774cb8956a ("X.509: parse public key parameters from x509 for akcipher") Signed-off-by: Wei Yongjun Signed-off-by: David Howells Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- crypto/asymmetric_keys/public_key.c | 1 + 1 file changed, 1 insertion(+) diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d7f43d4ea925a..e5fae4e838c06 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -119,6 +119,7 @@ static int software_key_query(const struct kernel_pkey_params *params, if (IS_ERR(tfm)) return PTR_ERR(tfm); + ret = -ENOMEM; key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, GFP_KERNEL); if (!key) -- 2.25.1