From: Mark Brown broonie@kernel.org
mainline inclusion from mainline-v6.5-rc5 commit 507ea5dd92d23fcf10e4d1a68a443c86a49753ed category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8E73O CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
-------------------------------------------------
Currently we guard FPSIMD/SVE state conversions with a check for the system supporting SVE but SME only systems may need to sync streaming mode SVE state so add a check for SME support too. These functions are only used by the ptrace code.
Fixes: e12310a0d30f ("arm64/sme: Implement ptrace support for streaming mode SVE registers") Signed-off-by: Mark Brown broonie@kernel.org Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230803-arm64-fix-ptrace-ssve-no-sve-v1-2-49df214... Signed-off-by: Catalin Marinas catalin.marinas@arm.com Signed-off-by: Wang ShaoBo bobo.shaobowang@huawei.com --- arch/arm64/kernel/fpsimd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index bf056f0fbf587..1865813163f14 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -628,7 +628,7 @@ static void fpsimd_to_sve(struct task_struct *task) void *sst = task->thread.sve_state; struct user_fpsimd_state const *fst = &task->thread.uw.fpsimd_state;
- if (!system_supports_sve()) + if (!system_supports_sve() && !system_supports_sme()) return;
vq = sve_vq_from_vl(thread_get_cur_vl(&task->thread)); @@ -654,7 +654,7 @@ static void sve_to_fpsimd(struct task_struct *task) unsigned int i; __uint128_t const *p;
- if (!system_supports_sve()) + if (!system_supports_sve() && !system_supports_sme()) return;
vl = thread_get_cur_vl(&task->thread);