mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-28 02:53:16 -04:00
Merge tags 'ipc-7.3-rc1.misc' and 'kernel-7.3-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull misc ipc and core updates from Christian Brauner: - reject mq_notify() with a zero signal number - fix coding style in the exit path * tag 'ipc-7.3-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: mqueue: reject mq_notify with signo 0 * tag 'kernel-7.3-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: kernel: exit: fix coding style missing spaces
This commit is contained in:
@@ -790,7 +790,6 @@ static void __do_notify(struct mqueue_inode_info *info)
|
||||
struct kernel_siginfo sig_i;
|
||||
struct task_struct *task;
|
||||
|
||||
/* do_mq_notify() accepts sigev_signo == 0, why?? */
|
||||
if (!info->notify.sigev_signo)
|
||||
break;
|
||||
|
||||
@@ -1281,9 +1280,9 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
|
||||
notification->sigev_notify != SIGEV_THREAD))
|
||||
return -EINVAL;
|
||||
if (notification->sigev_notify == SIGEV_SIGNAL &&
|
||||
!valid_signal(notification->sigev_signo)) {
|
||||
(!notification->sigev_signo ||
|
||||
!valid_signal(notification->sigev_signo)))
|
||||
return -EINVAL;
|
||||
}
|
||||
if (notification->sigev_notify == SIGEV_THREAD) {
|
||||
long timeo;
|
||||
|
||||
|
||||
@@ -1116,7 +1116,7 @@ void __noreturn make_task_dead(int signr)
|
||||
|
||||
SYSCALL_DEFINE1(exit, int, error_code)
|
||||
{
|
||||
do_exit((error_code&0xff)<<8);
|
||||
do_exit((error_code & 0xff) << 8);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user