Skip to content

Commit 7f2cd14

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes and cleanups from Catalin Marinas: - Fix the memset() size when re-initialising the SVE state. - Mark __stack_chk_guard as __ro_after_init. - Remove duplicate include. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Mark __stack_chk_guard as __ro_after_init arm64/kernel: remove duplicate include in process.c arm64/sve: Use correct size when reinitialising SVE state
2 parents c6460da + 9fcb2e9 commit 7f2cd14

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/arm64/kernel/fpsimd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ size_t sve_state_size(struct task_struct const *task)
513513
void sve_alloc(struct task_struct *task)
514514
{
515515
if (task->thread.sve_state) {
516-
memset(task->thread.sve_state, 0, sve_state_size(current));
516+
memset(task->thread.sve_state, 0, sve_state_size(task));
517517
return;
518518
}
519519

arch/arm64/kernel/process.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <linux/mman.h>
1919
#include <linux/mm.h>
2020
#include <linux/nospec.h>
21-
#include <linux/sched.h>
2221
#include <linux/stddef.h>
2322
#include <linux/sysctl.h>
2423
#include <linux/unistd.h>
@@ -58,7 +57,7 @@
5857

5958
#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
6059
#include <linux/stackprotector.h>
61-
unsigned long __stack_chk_guard __read_mostly;
60+
unsigned long __stack_chk_guard __ro_after_init;
6261
EXPORT_SYMBOL(__stack_chk_guard);
6362
#endif
6463

0 commit comments

Comments
 (0)