diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-29 02:11:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-29 02:11:02 +0300 |
| commit | b75f94727023c9d362eb875609dcc71a88a67480 (patch) | |
| tree | cdd8d4f6434f04902b6e02c1b6a1ab3ccb9b6fc1 /arch/s390 | |
| parent | 093d9603b60093a9aaae942db56107f6432a5dca (diff) | |
| parent | 1c07c9be87dd3dd0634033bf08728b32465f08fb (diff) | |
| download | linux-b75f94727023c9d362eb875609dcc71a88a67480.tar.xz | |
Merge tag 'hardening-v6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- Remove invalid tty __counted_by annotation (Nathan Chancellor)
- Add missing MODULE_DESCRIPTION()s for KUnit string tests (Jeff
Johnson)
- Remove non-functional per-arch kstack entropy filtering
* tag 'hardening-v6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
tty: mxser: Remove __counted_by from mxser_board.ports[]
randomize_kstack: Remove non-functional per-arch entropy filtering
string: kunit: add missing MODULE_DESCRIPTION() macros
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/entry-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/entry-common.h b/arch/s390/include/asm/entry-common.h index 7f5004065e8a..35555c944630 100644 --- a/arch/s390/include/asm/entry-common.h +++ b/arch/s390/include/asm/entry-common.h @@ -54,7 +54,7 @@ static __always_inline void arch_exit_to_user_mode(void) static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs, unsigned long ti_work) { - choose_random_kstack_offset(get_tod_clock_fast() & 0xff); + choose_random_kstack_offset(get_tod_clock_fast()); } #define arch_exit_to_user_mode_prepare arch_exit_to_user_mode_prepare |