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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 196B3C3B1A4 for ; Fri, 14 Feb 2020 17:01:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA1832067D for ; Fri, 14 Feb 2020 17:01:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rudAAhZa"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="RElQ+4Lx"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="wnvP+A9g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA1832067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NNVL0tsJ6i/PvKCY2NfzC+uMiZtuSAJFC8erN93rgeo=; b=rudAAhZarpxnWI HMRaQTf2mJjBEPrVukhlm1ezoQ7vVbGjYgbxiQVvKZl1mDsjn0M/CICwnUm89P5jxuhFRWHtPOylJ cVBC0HwHFPuCWTFNDNs7c58wmQSfxBRJ6iE5p//gN5wvI5qjql1VI9ZbWDSsBuwhmpRiKDWqZB7r5 BdaUWHldAVRh9wpAeh1QgV5XHeNTlg4CncjxiVQNppYv8IIK1YqfL7bPchJXoO9s2HBsNaEHLUJpw lmhdaJos7WvuEmnywx/aDkhm8C77HsQ61jAlzyMKKd0qjJv8D2BmKjnyKL306CyDrAbJ1MnMeJfG3 VELbAaFFCbsaiaoL8x+A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2eLQ-00033b-GN; Fri, 14 Feb 2020 17:01:36 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2e78-0000Ga-O5 for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Feb 2020 16:46:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=mVcJT4sMvTKIPxMjl4IriqWkrqIIRIDzSUi0pAsqwds=; b=RElQ+4LxbDcMdLvcGSj33pyDZX xUBcEVFxcOHPazgqzcbgCjqTMN2GSGJQQj9XQHrWpRnMmTSA715t/K+aWjI3Jzs3NGu5Lyd1QYPzU qAecAWi/jIH3s+CSCMCphP8xEmJ25d4t0emq5rAT0Rw6O8jH/d9YNsqZWEsNUKpaHkSgZX62AJx8Y pDDm/TXK1H0b1kIoTgPhJVzQnEE5u6tS/z/TC8h8xTpQlMe1Iqzj+mXBnr14G4U1g84oeUDxEYQoc vOMOocjJKU+9wg7r+9Ke+Vu+U0vJz5vX+eFDCZaQHF1Le2Pv1/jWXx7ZPHlvBYMQAZbqldaH8bRXd 6vIZcpCg==; Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2dc6-0007VQ-Ec for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2020 16:14:47 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A3446246D1; Fri, 14 Feb 2020 16:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696885; bh=IfYo5GkUeVfcL4RXB4WcxTzZDrn3bEBNAepBs8eLd9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wnvP+A9gBkSDekrajdkmddNjILaFH0cXlzZ3FRtALqKDHsoSNbhZIBGbiZ0Kso/jX mF5idyLazO9UrNum2pPkFZcQb9egRuHd1GydDMLVLbzePYnUIVkBLohPw7mjVVD+9H e1GQ5EU6C0iNRJBZZi/YcoXFX1WxzGXW4qqtH8Cs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 139/252] crypto: atmel-sha - fix error handling when setting hmac key Date: Fri, 14 Feb 2020 11:09:54 -0500 Message-Id: <20200214161147.15842-139-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214161147.15842-1-sashal@kernel.org> References: <20200214161147.15842-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Alexandre Belloni , Herbert Xu , Tudor Ambarus , Eric Biggers , Ludovic Desroches , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Eric Biggers [ Upstream commit b529f1983b2dcc46354f311feda92e07b6e9e2da ] HMAC keys can be of any length, and atmel_sha_hmac_key_set() can only fail due to -ENOMEM. But atmel_sha_hmac_setkey() incorrectly treated any error as a "bad key length" error. Fix it to correctly propagate the -ENOMEM error code and not set any tfm result flags. Fixes: 81d8750b2b59 ("crypto: atmel-sha - add support to hmac(shaX)") Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Signed-off-by: Eric Biggers Reviewed-by: Tudor Ambarus Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/atmel-sha.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index ef125d4be8fc4..cb548a0506c54 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -1921,12 +1921,7 @@ static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, { struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm); - if (atmel_sha_hmac_key_set(&hmac->hkey, key, keylen)) { - crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -EINVAL; - } - - return 0; + return atmel_sha_hmac_key_set(&hmac->hkey, key, keylen); } static int atmel_sha_hmac_init(struct ahash_request *req) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel