tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Alexander Gordeev:

- Fix incorrectly dropped dereferencing of the stack nth entry
introduced with a previous KASAN false positive fix

- Use a proper memdup_array_user() helper to prevent overflow in a
protected key size calculation

* tag 's390-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ptrace: Fix pointer dereferencing in regs_get_kernel_stack_nth()
s390/pkey: Prevent overflow in size calculation for memdup_user()

Linus Torvalds 51df97f9 9c2f9705

+2 -2
+1 -1
arch/s390/include/asm/ptrace.h
··· 265 265 addr = kernel_stack_pointer(regs) + n * sizeof(long); 266 266 if (!regs_within_kernel_stack(regs, addr)) 267 267 return 0; 268 - return READ_ONCE_NOCHECK(addr); 268 + return READ_ONCE_NOCHECK(*(unsigned long *)addr); 269 269 } 270 270 271 271 /**
+1 -1
drivers/s390/crypto/pkey_api.c
··· 86 86 if (!uapqns || nr_apqns == 0) 87 87 return NULL; 88 88 89 - return memdup_user(uapqns, nr_apqns * sizeof(struct pkey_apqn)); 89 + return memdup_array_user(uapqns, nr_apqns, sizeof(struct pkey_apqn)); 90 90 } 91 91 92 92 static int pkey_ioctl_genseck(struct pkey_genseck __user *ugs)