Linux 6.18.41
Greg Kroah-Hartman
maintainerI'm announcing the release of the 6.18.41 kernel.
All users of the 6.18 kernel series must upgrade.
The updated 6.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.18.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 kernel/exit.c | 7 + kernel/signal.c | 10 +- kernel/time/alarmtimer.c | 6 - kernel/time/posix-cpu-timers.c | 185 +++++++++++++++++++++++++++-------------- kernel/time/posix-timers.c | 6 - kernel/time/posix-timers.h | 4 7 files changed, 148 insertions(+), 72 deletions(-)
Greg Kroah-Hartman (1):
Linux 6.18.41
Thomas Gleixner (2):
posix-timers: Expand timer_[re]arm() callbacks with a boolean return value
posix-cpu-timers: Prevent UAF caused by non-leader exec() race
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 18 -SUBLEVEL = 40 +SUBLEVEL = 41 EXTRAVERSION = NAME = Baby Opossum Posse
kernel/exit.c +6 -1
@@ -212,7 +212,12 @@ static void __exit_signal(struct release_task_post *post, struct task_struct *ts__unhash_process (post, tsk, group_dead);write_sequnlock (&sig->stats_lock); - tsk->sighand =NULL ; +/* +* Ensure that all preceeding state is visible. Pairs with +* the smp_acquire__after_ctrl_dep() in the sighand == NULL +* path of lock_task_sighand(). +*/ +smp_store_release (&tsk->sighand,NULL );spin_unlock (&sighand->siglock);__cleanup_sighand (sighand);
kernel/signal.c +9 -1
@@ -1364,8 +1364,16 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,rcu_read_lock ();for (;;) { sighand =rcu_dereference (tsk->sighand); -if (unlikely (sighand ==NULL )) +if (unlikely (sighand ==NULL )) { +/* +* Pairs with the smp_store_release() in +* __exit_signal(). It ensures that all state +* modifications to the task preceeding the store are +* visible to the callers of lock_task_sighand(). +*/ +smp_acquire__after_ctrl_dep ();break ; + }/* * This sighand can be already freed and even reused, but
kernel/time/alarmtimer.c +4 -2
@@ -521,12 +521,13 @@ static void alarm_handle_timer(struct alarm *alarm, ktime_t now)* alarm_timer_rearm - Posix timer callback for rearming timer * @timr: Pointer to the posixtimer data struct */ -static void alarm_timer_rearm (struct k_itimer *timr) +static bool alarm_timer_rearm (struct k_itimer *timr) {struct alarm *alarm = &timr->it.alarm.alarmtimer; timr->it_overrun +=alarm_forward_now (alarm, timr->it_interval);alarm_start (alarm, alarm->node.expires); +return true; }/**
@@ -582,7 +583,7 @@ static void alarm_timer_wait_running(struct k_itimer *timr)* @absolute: Expiry value is absolute time * @sigev_none: Posix timer does not deliver signals */ -static void alarm_timer_arm (struct k_itimer *timr,ktime_t expires, +static bool alarm_timer_arm (struct k_itimer *timr,ktime_t expires,bool absolute,bool sigev_none) {struct alarm *alarm = &timr->it.alarm.alarmtimer;
@@ -594,6 +595,7 @@ static void alarm_timer_arm(struct k_itimer *timr, ktime_t expires, alarm->node.expires = expires; else alarm_start(&timr->it.alarm.alarmtimer, expires); +return true; }/**
kernel/time/posix-cpu-timers.c +122 -63
263 lines not on this page · raw message
kernel/time/posix-timers.c +4 -2
@@ -295,12 +295,13 @@ static inline int timer_overrun_to_int(struct k_itimer *timr)return (int )timr->it_overrun_last; } -static void common_hrtimer_rearm (struct k_itimer *timr) +static bool common_hrtimer_rearm (struct k_itimer *timr) {struct hrtimer *timer = &timr->it.real.timer; timr->it_overrun +=hrtimer_forward_now (timer, timr->it_interval);hrtimer_restart (timer); +return true; }static bool __posixtimer_deliver_signal (struct kernel_siginfo *info,struct k_itimer *timr)
@@ -802,7 +803,7 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)return timer_overrun_to_int (scoped_timer); } -static void common_hrtimer_arm (struct k_itimer *timr,ktime_t expires, +static bool common_hrtimer_arm (struct k_itimer *timr,ktime_t expires,bool absolute,bool sigev_none) {struct hrtimer *timer = &timr->it.real.timer;
@@ -829,6 +830,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,if (!sigev_none)hrtimer_start_expires (timer,HRTIMER_MODE_ABS ); +return true; }static int common_hrtimer_try_to_cancel (struct k_itimer *timr)
kernel/time/posix-timers.h +2 -2
@@ -27,11 +27,11 @@ struct k_clock {int (*timer_del)(struct k_itimer *timr);void (*timer_get)(struct k_itimer *timr,struct itimerspec64 *cur_setting); -void (*timer_rearm)(struct k_itimer *timr); +bool (*timer_rearm)(struct k_itimer *timr);s64 (*timer_forward)(struct k_itimer *timr,ktime_t now);ktime_t (*timer_remaining)(struct k_itimer *timr,ktime_t now);int (*timer_try_to_cancel)(struct k_itimer *timr); -void (*timer_arm)(struct k_itimer *timr,ktime_t expires, +bool (*timer_arm)(struct k_itimer *timr,ktime_t expires,bool absolute,bool sigev_none);void (*timer_wait_running)(struct k_itimer *timr); };