From patchwork Fri Nov 15 22:33:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179527 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126316ilf; Fri, 15 Nov 2019 14:34:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwwyB9VOFv8JC7X60hcces4bkLXOxJUBaNR51ATm/3fl/xYrTKY5LAsXryhkSqTei6tO6Rv X-Received: by 2002:a17:906:fcdb:: with SMTP id qx27mr4365511ejb.255.1573857245934; Fri, 15 Nov 2019 14:34:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857245; cv=none; d=google.com; s=arc-20160816; b=j3tuqxlR0kFxea3j+Y7KRsYlltHBg4xgW5hJ6V9Wc7zlXNoBtZGfNq+uTZvAgMvU9c X2U0QRty7GejLc+2AVWDvP7o4pxCero3RXXbIN/qPH+CFJFrT7XPhJd1kf+h2YTKqEqk 5fH/N44k3KlMg8c/0NuEdRr/V42EA4LoMqiBOTlmgJCueBtMsebP82IpwIhtbfs8KbwE Zi0txuRDhIlkGa86DUaRg+oKn/EFyx7+quBgCRTKGY2F79DpmqPhjbS+PGdvLHwIYNDv 5EpzmEtULuYMCIo69KpTPhkGr6LG8EmKvsDr3snmXyuHyizVnw0V/nCyhinAr+31fFPG XkEA== 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:dkim-signature; bh=pnStBG/T13CIghpMMY37iVdEqu6Tf6ypUdEca+Im12A=; b=E4vfvrd8OWCV+zctc724+j4fHlgF5VZoUaUTBa8mREQFJXMTdHx4Uir2A+uQ+Zg3mC Sk2lB8tSDjYOiCXqUg/Ii8PIIEF1YVDiszPlwsvMpuOzka5PBxTeoYlOdy+3KXCn8P+v M9DtSYcE++8T+1TICOEcUELuf9DhGTEQUN0osvpd9EVnvCMa3UHikx/pPIjPKnSS8xH+ 2hNIDoAMs0QfTyYqhSIChWtwF3eRwZjLAIrSsL1NMCcCNvFCzml4BHPE1nXq1kssTPb5 K1Sp2IxL09AkJ60k0anwJxphVa4tQICKPIQaCBmkr1Uj7WpqYX6rc6Z9kKXwx9uKyAQa VTyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UcNOeX7Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be23si6995091edb.103.2019.11.15.14.34.05; Fri, 15 Nov 2019 14:34:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UcNOeX7Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727220AbfKOWeE (ORCPT + 26 others); Fri, 15 Nov 2019 17:34:04 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:43964 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727178AbfKOWeB (ORCPT ); Fri, 15 Nov 2019 17:34:01 -0500 Received: by mail-pl1-f195.google.com with SMTP id a18so5616516plm.10 for ; Fri, 15 Nov 2019 14:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pnStBG/T13CIghpMMY37iVdEqu6Tf6ypUdEca+Im12A=; b=UcNOeX7QeFUdS+8BsU3HT6dUr5DPakiIHn/4UvPOHLFYqY/K6ujtP4IZer6qWH4PsL kSBTMAw/WQgyxTxeo4ivek0tX/PV86dgJw0UkYo6ERIwQlFRePO6NKrAtfa6NCJ20W2O TsLzkBAGM6YB4DuaLNvOwjU3GdT2dzYF5IIKeZ0U3QUbT9dSuHzqJDl+QXBysh5SV+Ov lw25nX/7WiyUcJ5Xp4DrwnC0HKLo02gWkWh9DR0hT+OxTsQXWX6d6dxK8t070uRMMt9V r9oATtIcUAuwarcVv9V2aewPHt7avcTKRzk1AKnwfy3HSFUqXiDShEdVFb9swtzK8Huo 4nkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pnStBG/T13CIghpMMY37iVdEqu6Tf6ypUdEca+Im12A=; b=S0USZpYOt+njxTIcdLLhWzXZta10kaap4bn3+9R6I6ay9MBNkI9EDCXqACsJ/aVM21 DJGyFZogpvjBEuR+Emrsjn5QsIyTTRQFL2eu57b4SUg01gErJLC6CjL24AkjCkm5DZoR HqI6VrlzmxopzypbQhkB1qbofKdP+6AzDcIYQ8Rs7xZqFSaTz5BPXD2GeaWTBsR6toXu 1/iWSUaX5Lhb6UJkYHBAIfOOgtnuIbkcNqk0fUTvFvTgDv/auDo/oPhuBFGz4+azAA5H 4Tq4Px5sf48TwcHQdNfd4nHUoc1r2EOKLAHNsU9+6n2GfukkLks6tBUICyGRHgXxrzgi qT+A== X-Gm-Message-State: APjAAAV8bz3r+uhXSgQwcVJDj8t5gHzT20wIpcssvb7WEwgyPEdSEGxh FnqMl3oCb5laAXei6IL9Sx+UCw== X-Received: by 2002:a17:902:fe8f:: with SMTP id x15mr17473187plm.343.1573857240779; Fri, 15 Nov 2019 14:34:00 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:00 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 04/20] crypto: stm31/hash - Fix hmac issue more than 256 bytes Date: Fri, 15 Nov 2019 15:33:40 -0700 Message-Id: <20191115223356.27675-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lionel Debieve commit 0acabecebc912b3ba06289e4ef40476acc499a37 upstream Correct condition for the second hmac loop. Key must be only set in the first loop. Initial condition was wrong, HMAC_KEY flag was not properly checked. Signed-off-by: Lionel Debieve Signed-off-by: Herbert Xu Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/crypto/stm32/stm32-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c index 590d7352837e..641b11077f47 100644 --- a/drivers/crypto/stm32/stm32-hash.c +++ b/drivers/crypto/stm32/stm32-hash.c @@ -365,7 +365,7 @@ static int stm32_hash_xmit_cpu(struct stm32_hash_dev *hdev, return -ETIMEDOUT; if ((hdev->flags & HASH_FLAGS_HMAC) && - (hdev->flags & ~HASH_FLAGS_HMAC_KEY)) { + (!(hdev->flags & HASH_FLAGS_HMAC_KEY))) { hdev->flags |= HASH_FLAGS_HMAC_KEY; stm32_hash_write_key(hdev); if (stm32_hash_wait_busy(hdev))