Commit bb1a6ddc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-urgent-2025-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Ingo Molnar:
 "Fix a memory leak in the posix timer creation logic"

* tag 'timers-urgent-2025-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix-timers: Plug potential memory leak in do_timer_create()
parents fa3ade5e e0fd4d42

kernel/time/posix-timers.c

+6 −6
Original line number Diff line number Diff line
@@ -475,12 +475,6 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, 
	if (!kc->timer_create)

		return -EOPNOTSUPP;



	new_timer = alloc_posix_timer();

	if (unlikely(!new_timer))

		return -EAGAIN;



	spin_lock_init(&new_timer->it_lock);



	/* Special case for CRIU to restore timers with a given timer ID. */

	if (unlikely(current->signal->timer_create_restore_ids)) {

		if (copy_from_user(&req_id, created_timer_id, sizeof(req_id)))
@@ -490,6 +484,12 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, 
			return -EINVAL;

	}



	new_timer = alloc_posix_timer();

	if (unlikely(!new_timer))

		return -EAGAIN;



	spin_lock_init(&new_timer->it_lock);



	/*

	 * Add the timer to the hash table. The timer is not yet valid

	 * after insertion, but has a unique ID allocated.