From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Sasha Levin <sashal@kernel.org>,
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 [thread overview]
Message-ID: <20211108174644.1187889-18-sashal@kernel.org> (raw)
In-Reply-To: <20211108174644.1187889-1-sashal@kernel.org>
From: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>
[ 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 <dan.carpenter@oracle.com>
Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2021-11-09 1:04 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 17:44 [PATCH AUTOSEL 5.14 001/138] dma-buf: WARN on dmabuf release with pending attachments Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 002/138] drm: panel-orientation-quirks: Update the Lenovo Ideapad D330 quirk (v2) Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 003/138] drm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1 Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 004/138] drm: panel-orientation-quirks: Add quirk for the Samsung Galaxy Book 10.6 Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 005/138] Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg() Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 006/138] Bluetooth: fix use-after-free error in lock_sock_nested() Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 007/138] drm/panel-orientation-quirks: add Valve Steam Deck Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 008/138] rcutorture: Avoid problematic critical section nesting on PREEMPT_RT Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 009/138] platform/x86: wmi: do not fail if disabling fails Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 010/138] MIPS: lantiq: dma: add small delay after reset Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 011/138] MIPS: lantiq: dma: reset correct number of channel Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 012/138] locking/lockdep: Avoid RCU-induced noinstr fail Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 013/138] net: sched: update default qdisc visibility after Tx queue cnt changes Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 014/138] ACPI: resources: Add DMI-based legacy IRQ override quirk Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 015/138] rcu-tasks: Move RTGS_WAIT_CBS to beginning of rcu_tasks_kthread() loop Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 016/138] smackfs: Fix use-after-free in netlbl_catmap_walk() Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 017/138] ath11k: Align bss_chan_info structure with firmware Sasha Levin
2021-11-08 17:44 ` Sasha Levin [this message]
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 019/138] NET: IPV4: fix error "do not initialise globals to 0" Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 020/138] x86/mm/64: Improve stack overflow warnings Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 021/138] x86: Increase exception stack sizes Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 022/138] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 023/138] mwifiex: Properly initialize private structure on interface type changes Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 024/138] spi: Check we have a spi_device_id for each DT compatible Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 025/138] fscrypt: allow 256-bit master keys with AES-256-XTS Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 026/138] drm/amdgpu: Fix MMIO access page fault Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 027/138] drm/amd/display: Fix null pointer dereference for encoders Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 028/138] selftests: net: fib_nexthops: Wait before checking reported idle time Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 029/138] leds: trigger: use RCU to protect the led_cdevs list Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 030/138] ath11k: Avoid reg rules update during firmware recovery Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 031/138] ath11k: add handler for scan event WMI_SCAN_EVENT_DEQUEUED Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 032/138] ath11k: Change DMA_FROM_DEVICE to DMA_TO_DEVICE when map reinjected packets Sasha Levin
2021-11-08 17:44 ` [PATCH AUTOSEL 5.14 033/138] ath10k: high latency fixes for beacon buffer Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 034/138] octeontx2-pf: Enable promisc/allmulti match MCAM entries Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 035/138] media: mt9p031: Fix corrupted frame after restarting stream Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 036/138] media: netup_unidvb: handle interrupt properly according to the firmware Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 037/138] media: atomisp: Fix error handling in probe Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 038/138] media: stm32: Potential NULL pointer dereference in dcmi_irq_thread() Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 039/138] media: uvcvideo: Set capability in s_param Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 040/138] media: uvcvideo: Return -EIO for control errors Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 041/138] media: uvcvideo: Set unique vdev name based in type Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 042/138] media: vidtv: Fix memory leak in remove Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 043/138] media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe() Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 044/138] media: s5p-mfc: Add checking to s5p_mfc_probe() Sasha Levin
2021-11-08 17:45 ` [PATCH AUTOSEL 5.14 045/138] media: videobuf2: rework vb2_mem_ops API Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211108174644.1187889-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Herbert@vger.kernel.org \
--cc=bp@alien8.de \
--cc=chouhan.shreyansh630@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox