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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58CB6C433FE for ; Tue, 9 Nov 2021 01:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3918A61A8A for ; Tue, 9 Nov 2021 01:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239865AbhKIBH1 (ORCPT ); Mon, 8 Nov 2021 20:07:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:60044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237200AbhKIBFg (ORCPT ); Mon, 8 Nov 2021 20:05:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 699BF619EC; Tue, 9 Nov 2021 01:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419722; bh=W0ELrzJMxGLWNUf0TkqG30Vy8t8GwFJcoOZnhnjEX60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qLM4rTh33MinQarXMdYbx6XmbLXPsaDqMoG5WXIhRlQaFpOx4FMlGmhR4lOeBsrri uJIRyVywejRQa5kOQ1D66Z2GN5lA/n6WmZlnks2VsWBRfM5g4Nvwe38zapofL+jtn6 3pFaLeW+jqCsfLOxepJdGhOEMU6TSI3RAboFpPlUrvzPGCZFuw6vw+jjtH/MOgU4qW XWfcAGD+oex4ztEw0LpkG+tIeHZVap83DDS3wscXwejx637HJoAjtqWyERzIn/ESNC o+m0zVsrOkmFOKiU9E5LY/hArRVjig7XSmfwy7prTM8K1fdfucLZSTOb/ZKad8+ef3 8lg+HNcFeJTVA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shreyansh Chouhan , Dan Carpenter , Herbert Xu , Sasha Levin , Herbert@vger.kernel.org, davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 018/138] crypto: aesni - check walk.nbytes instead of err Date: Mon, 8 Nov 2021 12:44:44 -0500 Message-Id: <20211108174644.1187889-18-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108174644.1187889-1-sashal@kernel.org> References: <20211108174644.1187889-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shreyansh Chouhan [ Upstream commit a2d3cbc80d2527b435154ff0f89b56ef4b84370f ] In the code for xts_crypt(), we check for the err value returned by skcipher_walk_virt() and return from the function if it is non zero. However, skcipher_walk_virt() can set walk.nbytes to 0, which would cause us to call kernel_fpu_begin(), and then skip the kernel_fpu_end() call. This patch checks for the walk.nbytes value instead, and returns if walk.nbytes is 0. This prevents us from calling kernel_fpu_begin() in the first place and also covers the case of having a non zero err value returned from skcipher_walk_virt(). Reported-by: Dan Carpenter Signed-off-by: Shreyansh Chouhan Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- arch/x86/crypto/aesni-intel_glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 0fc961bef299c..e09f4672dd382 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -866,7 +866,7 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt) req = &subreq; err = skcipher_walk_virt(&walk, req, false); - if (err) + if (!walk.nbytes) return err; } else { tail = 0; -- 2.33.0