From patchwork Thu May 11 11:53:42 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: 99623 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp689406qge; Thu, 11 May 2017 04:54:05 -0700 (PDT) X-Received: by 10.84.217.222 with SMTP id d30mr15891108plj.156.1494503645291; Thu, 11 May 2017 04:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494503645; cv=none; d=google.com; s=arc-20160816; b=hnD4T8SkI8HLx5DffdnBap67iWDcDK0+t506NxQ+QxYqjDQO8fND4CCKzSWIC4N9yN 6CH8qb91Pem1F58MHncirx5o0mMeQvRs+TLMVPKNxaAXaMPaEu2hvbkltNpgN5gIvSjW xNG1IbUeUmfzVWiFN0yB2xP3rsfWVobFLKBBIb/CJ/xrnwlJRg5CzrLJQCEUTkW5+kfP V78GjasWP9czAVpkEKExBwDkQRMS2zHcA81wwWpdJ0ar+VCoKlUPQEY3GB90rrvLq0Z1 5Z1Ud3ns+ASfvD6nwDP0CDKV0vXsf6wG2pUMGKtL8dI+H1aIxNpsD8rZFeI9ZOaojmTr RqWA== 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=N2gwHnGwFbZ1u2RMoaE0qce0ncoZLdpyzNLoP+Kk5Tn2vLDOv0OK4w386YZTWCVpVL Zavwf8cI8v5p0XlJYNfeXb1AqJ7hql+1ZtZDLgLfXM+bSf24H8NOdhTf04K1cvF1ZXGl nSKYrqgCdIxftRF5K9I5FutxNvHvdXVxT4WBFsVNLnwjqmdo2ndfcAEYQk+s7hPOXNIy J2Gk45nAcjMVVuirsdFpdvNDudkPYTB2yvFQJ7RM3iYVhorg7cTSqRA9NXXTwSMdc2Lh HsC2L0k60J+MLkhFtMeSv8kg6OJcUAej4JsVkBiwvtTXpQjj97e2CSsv6P6wdzGr1nMz 02/A== 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 e11si1732101pln.291.2017.05.11.04.54.05; Thu, 11 May 2017 04:54:05 -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 S932596AbdEKLyD (ORCPT + 6 others); Thu, 11 May 2017 07:54:03 -0400 Received: from foss.arm.com ([217.140.101.70]:46594 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932385AbdEKLyA (ORCPT ); Thu, 11 May 2017 07:54:00 -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 45B731516; Thu, 11 May 2017 04:54:00 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7071D3F4FF; Thu, 11 May 2017 04:53:57 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells Cc: Ofir Drang , Gilad Ben-Yossef , Eric Biggers , 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 1/4] crypto: handle EBUSY due to backlog correctly Date: Thu, 11 May 2017 14:53:42 +0300 Message-Id: <1494503626-15877-2-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494503626-15877-1-git-send-email-gilad@benyossef.com> References: <1494503626-15877-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; }