From patchwork Thu May 18 11:26:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 100088 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp670333qge; Thu, 18 May 2017 04:28:26 -0700 (PDT) X-Received: by 10.84.135.129 with SMTP id 1mr4318701plj.57.1495106906172; Thu, 18 May 2017 04:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495106906; cv=none; d=google.com; s=arc-20160816; b=PXExBYOdVxxBKLHP0CiiyevnuhQYWKejjCPHYCWapTYHccQ/0PJPobKWbJgX3y2hoV ZC0wLE4+Mcci+rL35YDpp7VbtSvcavp3om80b/nX7IQtjuHvR9saoU1x2YfksBOEkCmH S+9sbfA+0K18T7DV+uMJaWg63f4Zo+typFlf5q+At4s6DYLuRMdKr9rrYYoUBz6QTfHr 7VRM5BXbEqLXEOFfCsCe30LNgUPYWLx65atuOdokUH6IJX4fGR4X65pjA62gvIPrpQRK DGKsG0r/KT2X/Ob1f962haWFppSLUT5P9HkRZtiJI1Xb76MUEQK9ih65iol8xIIq4R4e pFFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=I15hSdpXKDpVO53ZJZBWV4xmQKgjfnzzvk+hUA2InRM=; b=PnS2XSrhIQZNYxHJjiDGVrK2TW06nfhWmJDZlvWlB1Xy6ushwa3WYo4iwiezopTozq 4Pozvn+0TbFmIxcAXQ9+eymmRbCb7WjW1P90tepV9cCHPUnQSb2ufF9ysroXYUK6Yj5l OCWQgYIRgiLRZI3MXy2UD+f7HEPxkQ+96TNUlI7xQKRIP9Pq+AjbeuJZtjb6ihJM9t9f KCI/qxcT6bnTZ/iKvZykhBU6sJS/m4JzZKQF8b5Nzquo/leLbtC0qwvuwt86tM5wrCt/ xbnu5MYjJMZ+6LVikuofL10yh0j9/sZJYQcG/EMWbm50YQEfeCDhr7qna4T083vybIzY df1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 8si4935253pfy.378.2017.05.18.04.28.25; Thu, 18 May 2017 04:28:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933593AbdERL2S (ORCPT + 6 others); Thu, 18 May 2017 07:28:18 -0400 Received: from foss.arm.com ([217.140.101.70]:58670 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933519AbdERL05 (ORCPT ); Thu, 18 May 2017 07:26:57 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 33E421435; Thu, 18 May 2017 04:26:57 -0700 (PDT) Received: from gby.emea.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4D9663F3E1; Thu, 18 May 2017 04:26:55 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells Cc: Ofir Drang , stable@vger.kernel.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH v2 1/4] crypto: handle EBUSY due to backlog correctly Date: Thu, 18 May 2017 14:26:43 +0300 Message-Id: <1495106806-2292-2-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495106806-2292-1-git-send-email-gilad@benyossef.com> References: <1495106806-2292-1-git-send-email-gilad@benyossef.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org public_key_verify_signature() was passing the CRYPTO_TFM_REQ_MAY_BACKLOG flag to akcipher_request_set_callback() but was not handling correctly the case where a -EBUSY error could be returned from the call to crypto_akcipher_verify() if backlog was used, possibly casuing data corruption due to use-after-free of buffers. Resolve this by handling -EBUSY correctly. Signed-off-by: Gilad Ben-Yossef CC: stable@vger.kernel.org --- crypto/asymmetric_keys/public_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.1.4 diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d3a989e..3cd6e12 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -141,7 +141,7 @@ int public_key_verify_signature(const struct public_key *pkey, * signature and returns that to us. */ ret = crypto_akcipher_verify(req); - if (ret == -EINPROGRESS) { + if ((ret == -EINPROGRESS) || (ret == -EBUSY)) { wait_for_completion(&compl.completion); ret = compl.err; }