diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-15 03:05:50 +0530 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-15 03:05:50 +0530 |
| commit | 37c405aeaa5c2cbe04c3c727e3989a16a2e9f30f (patch) | |
| tree | 88594b10c60e16fd03223136a230ed72e42fce62 /ipc | |
| parent | 9c9e6bd4cca02f2d183eb260451fb6018f9ee67e (diff) | |
| parent | ee8ab98f831226d69d43ccd93f53c50e6f19b389 (diff) | |
Merge tag 'kernel-7.2-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull misc kernel updates from Christian Brauner:
"Fixes
- rhashtable: give each instance its own lockdep class
syzbot reported a circular locking dependency between ht->mutex and
fs_reclaim via the simple_xattrs rhashtable being torn down during
inode eviction.
The predicted deadlock cannot occur: rhashtable_free_and_destroy()
cancels the deferred worker before taking ht->mutex and
acquisitions on distinct rhashtables are on distinct mutexes.
Lockdep flags a cycle anyway because every ht->mutex in the kernel
shared the single static lockdep class from
rhashtable_init_noprof().
The lockdep key is lifted to a per-call-site static key so every
rhashtable instance gets its own class.
- selftests/clone3: fix misuse of the libcap library interface in the
cap_checkpoint_restore test and remove unused variables
- selftests/pid_namespace: compute the pid_max test limits
dynamically instead of hardcoding values below the kernel-enforced
minimum of PIDS_PER_CPU_MIN * num_possible_cpus() which made the
tests fail on machines with many possible CPUs
- selftests: fix the Makefile TARGETS entry for nsfs which wasn't
adjusted when the tests moved under filesystems/
Cleanups
- ipc/sem.c: use unsigned int for nsops to match the declaration in
syscalls.h"
* tag 'kernel-7.2-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
selftests/clone3: remove unused variables
selftests/clone3: fix libcap interface usage
ipc/sem.c: use unsigned int for nsops
selftests: Fix Makefile target for nsfs
rhashtable: give each instance its own lockdep class
selftests/pid_namespace: compute pid_max test limits dynamically
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/sem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/sem.c b/ipc/sem.c index 6cdf862b1f5c..5ec41de7e85b 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -1981,7 +1981,7 @@ out: } long __do_semtimedop(int semid, struct sembuf *sops, - unsigned nsops, const struct timespec64 *timeout, + unsigned int nsops, const struct timespec64 *timeout, struct ipc_namespace *ns) { int error = -EINVAL; @@ -2220,7 +2220,7 @@ out: } static long do_semtimedop(int semid, struct sembuf __user *tsops, - unsigned nsops, const struct timespec64 *timeout) + unsigned int nsops, const struct timespec64 *timeout) { struct sembuf fast_sops[SEMOPM_FAST]; struct sembuf *sops = fast_sops; @@ -2294,7 +2294,7 @@ SYSCALL_DEFINE4(semtimedop_time32, int, semid, struct sembuf __user *, tsems, #endif SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops, - unsigned, nsops) + unsigned int, nsops) { return do_semtimedop(semid, tsops, nsops, NULL); } |
