From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1807417-1527159933-2-1929702652198722883 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1527159931; b=L4GZx8yiAda7A7knpFf3L/eNqhOWcBKUBbC/XU/bnr6XjopVim gYkBMPYTbaWdPVRz8YB7ddK487ri81zVCKUhN3DRGy/zJ381qBlZbtmnQlmCZegW u7fXWUz1VynR1e051qQFwnV67oNpUMbGmfd2/Ac+koPlDzxkjoe80EWmU9WueJwA qTEVYkupd/8JWlQ4Dcd7sP4w7KqRNcBAvXchdZxENSRmJ9tyZbZ2OOcrMcq4CDTZ IccvAaMTKVdtDLfkpiQTnXXUlvtyFZaRmMnvrNDf+UhlbjaaXzgqh8UjBY4F029A 1W46NT9dCPlLbhWRRxfCCqPNYUssh8NESgOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1527159931; bh=cJNZXs4FXDsHIbMvTWaruoltkzAUWD s+36pCc0w3N9U=; b=THlh1oJnzZNvGK/zNbdfRC+CKOSBr6/cK6UPdnBm7358Vv Wzhu5QUXh/XaXGAFRjV366ENwi77lJTWv6uqLyCmhRHlbXE5UD+Tbjf0cRcCV5Oi hvbYOO4V/mKuBUIa4D+v24cgAj56IfEDyGsBmsKAsWQZ6V9S1Gn/c0xVxHutq2AU 7QMKL5KC0uPqvSoAtqA+QVz+eEOCK/4ipI5BebsKZPOyZQeDX8w2QitoaMGtnpm5 KtUHPe70XmCpDzE2tZH07JkUVUVQDXu7SWqrTksl8VBrgWxmEnEgePynHUilRYUR sYEClkKSfDwT8k+s8SQ+odYt11upuvIdFDyNcCeQ== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=ICyMt+4v x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=ICyMt+4v x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOOPj4FFpXXcBOiRC+Byd099oK07CqhwH97rvJ6x0oSf05e6hi14XpAaACUSGY23U9U5hcAvyFc6s8OIvsW70Hq7NESVuVsT2ZynS/aBvu7O24/oqWpw wwQhfqVhqG1cNg2SVIz0UIEP/tjBSILXL/IMBRIUe4UIT5UuvfEWhuoEVvXwtH+N6rzAQWDiL1a6ULgnwicYs5SSMmd8JsS4cWmMJRrRkLOrpg4JRlBjothM X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=VUJBJC2UJ8kA:10 a=P-IC7800AAAA:8 a=M5GUcnROAAAA:8 a=FNyBlpCuAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=ZFebjw2IMqqkrzxeGdgA:9 a=QEXdDO2ut3YA:10 a=d3PnA9EDa4IxuAV0gXij:22 a=OBjm3rFKGHvpk9ecZwUJ:22 a=RlW-AWeGUCXs_Nkyno-6:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030216AbeEXLF3 (ORCPT ); Thu, 24 May 2018 07:05:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968304AbeEXJzQ (ORCPT ); Thu, 24 May 2018 05:55:16 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ofer Heifetz , Antoine Tenart , Herbert Xu , Sasha Levin Subject: [PATCH 4.14 091/165] crypto: inside-secure - wait for the request to complete if in the backlog Date: Thu, 24 May 2018 11:38:17 +0200 Message-Id: <20180524093625.706758718@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524093621.979359379@linuxfoundation.org> References: <20180524093621.979359379@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Antoine Tenart [ Upstream commit 4dc5475ae0375ea4f9283dfd9b2ddc91b20d4c4b ] This patch updates the safexcel_hmac_init_pad() function to also wait for completion when the digest return code is -EBUSY, as it would mean the request is in the backlog to be processed later. Fixes: 1b44c5a60c13 ("crypto: inside-secure - add SafeXcel EIP197 crypto engine driver") Suggested-by: Ofer Heifetz Signed-off-by: Antoine Tenart Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/inside-secure/safexcel_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/inside-secure/safexcel_hash.c +++ b/drivers/crypto/inside-secure/safexcel_hash.c @@ -819,7 +819,7 @@ static int safexcel_hmac_init_pad(struct init_completion(&result.completion); ret = crypto_ahash_digest(areq); - if (ret == -EINPROGRESS) { + if (ret == -EINPROGRESS || ret == -EBUSY) { wait_for_completion_interruptible(&result.completion); ret = result.error; }