Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2671339ybt; Mon, 22 Jun 2020 04:19:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTBxinFJr289J3BsLbNU8/GaclvXnthNb7aMuXDHK4B3hODxZBr8HEc1mTxYPANzvuM9GU X-Received: by 2002:a05:6402:17f6:: with SMTP id t22mr3440299edy.141.1592824766357; Mon, 22 Jun 2020 04:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592824766; cv=none; d=google.com; s=arc-20160816; b=UIiTwdXqzdexhdRuFphD1253U4Ql7NL8GuNHQAQ7Rkfe8lW0l711zeWJHXGc94qvNd FQ1zK4kUIycXGNiD/thNz5Vl+WxPwCZVl1hqgFZgQfzq7t6SnAjH+nLEPYoJR7H9u1y5 JaK1htaCN2dt8IhN/45TAXbkc9lH5VF41FERU/5tPKTHndrDUuPW7zDV6hzE8tiJYnwB CMqxj4OcamvGB9OY+7c2U2apbFOtD3LlMWHoM9pdV7My+MnfQkxIWpJkBaz+O5NCOHXU QpEXbMyN29DHsGp8MPCPI4BlTHUeyZaeFWkolx20LskKEgDH6JRA7g631SKWRBgI0hNo ykYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=oox+r6GDDpTbulBJM/q1F9Yz3ORpcVUrayVuE4z4pRU=; b=0ARAmZp4Jlh/dmFL8X70o8UqUXR3BzEMnVD68+9oQpfwHAzvVLa8D5zK745JtiL7rL VhIQTSZRJ8HB6V1mmISjsux7y6I2nq7OV+2bsuN1JRdUuTJXtSRD+HxYS/Gcb081I2zC gzcc3jHVFbbbdliZ2zr5amv6KlGz80T5NX65+V7ZJdAycLUqMsi3q74UYy6ok7Okkkn/ fFNLKxDCgBRembZsVyDFU4O62j8TBoqjXkd7qln6jUUjYdhV148HI+QXmHOIFH5enSR1 wp51Q3lRyH4SIsHh9/3dVXAbOgMqTbakhGlUqtb9rmEd68TLHeuBwJfZzdLhM/hbcQmk JYvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ss12si8789892ejb.188.2020.06.22.04.19.02; Mon, 22 Jun 2020 04:19:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729064AbgFVLS4 (ORCPT + 99 others); Mon, 22 Jun 2020 07:18:56 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:6383 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728635AbgFVLSW (ORCPT ); Mon, 22 Jun 2020 07:18:22 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 6657613E2A665F574F36; Mon, 22 Jun 2020 19:18:19 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Mon, 22 Jun 2020 19:18:09 +0800 From: Wei Yongjun To: David Howells , Herbert Xu , Vitaly Chikunov CC: Wei Yongjun , , , Subject: [PATCH] KEYS: asymmetric: fix error return code in software_key_query() Date: Mon, 22 Jun 2020 11:21:36 +0000 Message-ID: <20200622112136.72745-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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 --- crypto/asymmetric_keys/public_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d7f43d4ea925..c15bde024b4c 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)