exec/exit: POSIX timer related bugfixes and related cleanups
Status from this message: The following commit has been merged into the timers/core branch of tip:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest8 patches 14 repliesApplied
- v28 patches 48 repliesSuperseded
- v18 patches 7 repliesSuperseded
Patches in v3 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | signal: Prevent exec() racekernel/ kernel/ | +92 | 2 replies | |
| 2/8 | exec: Cleanup POSIX timers right after de_thread()fs/ | +21 | 0 replies | |
| 3/8 | posix-timers: Move posixtimer_exec_cleanup() out of exec.cfs/ include/ kernel/ | +13 | 2 replies | |
| 4/8 | posix-timers: Move POSIX timer group exit related code out of do_exit()include/ include/ kernel/ +1 more | +14 | 1 reply | |
| 5/8 | posix-cpu-timers: Move inlines out of public headerinclude/ kernel/ | +32 | 1 reply | |
| 6/8 | posix-cpu-timers: Use PF_EXITING to indicate exitkernel/ | +1 | 3 replies | |
| 7/8 | posix-cpu-timers: Prevent enqueueing when PF_EXITING is setkernel/ | +28 | 1 reply | |
| 8/8 | posix-timers: Handle exit in do_exit() completelyinclude/ kernel/ kernel/ +2 more | +50 | 3 replies |
Reviews trailers per patch
All 8 patches have a Reviewed-by or Acked-by.
| Patch | Hyunwoo Kim | Oleg Nesterov | Frederic Weisbecker | Kijo Park |
|---|---|---|---|---|
| Series | T-b | |||
| 1/8 | Debugged-by | R-b | R-b | |
| 2/8 | R-b | R-b | ||
| 3/8 | R-b | R-b | ||
| 4/8 | R-b | R-b | ||
| 5/8 | R-b | R-b | ||
| 6/8 | R-b | R-b | ||
| 7/8 | R-b | R-b | ||
| 8/8 | R-b | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.
Cover letter [patch V3 0/8] exec/exit: POSIX timer related bugfixes and related cleanups
This is a follow up to V2 which can be found here:
https://lore.kernel.org/[email protected]
Recent findings from Hyunwoo unearthed two bugs in handling POSIX timers on exec().
The relevant patches, reports and discussions can be found here:
https://patch.msgid.link/aok1rdkBgZsynHZB@v4bel
https://patch.msgid.link/ao7Q8miiuLAPVnWv@v4bel
TLDR:
Both problems are related to non-leader exec(). POSIX CPU timers which are targeted at tasks hold a pid reference of the target task, which is used to look up the task in the related POSIX timer operations.
The non-leader exec() switches the TID of the old and the new leader, which obviously invalidates these references for pid_task(PIDTYPE_PID) lookups.
This causes UAFs due to the resulting list corruptions or premature freeing without removing the underlying POSIX CPU timers from the involved tasks.
The first issue which corrupts the signal pending list is solved by:
- Preventing the queueing of per task signals on a task which has PF_EXITING set.
- Protecting the unlocked setting of PF_EXITING in exit_signals() with sighand lock.
- Flushing all per task signals right in exit_signals()
The second issue which keeps the POSIX CPU timers queued on the new leader is solved by:
- Moving the exec related POSIX timer cleanup right after de_thread() which ensures that the timers queued in new_leader::posix_cputimers are removed before the underlying POSIX timers are deleted.
After looking deeper at the exit() handling it turned out that the POSIX timer cleanups can be done early in do_exit() instead of delaying them until release_task().
The reason for this late cleanup is that POSIX CPU timers can be created, rearmed and deleted as long as a task is visible, i.e. the pid is hashed and sighand is not NULL. This allows to retrieve information from the timer up to the point where the task is gone for real and that can't be changed easily as that'd be a user visible change.
But once PF_EXITING is set on a task the task does not longer expire POSIX CPU timers. So it makes no sense that the timers stay queued in task::posix_cputimers after that point.
The only thing which needs to be prevented is that timers are requeued on task::posix_cputimers once PF_EXITING is set or requeued on signal::posix_cputimers when PF_EXITING is set and signal::live is zero, which indicates that the thread group is dead.
With that solved the timers can be dequeued from task::posix_cputimer pending when a task exits and from signal::posix_cputimer pending once the threadgroup reaches the dead state, i.e. signal::live goes to zero in do_exit().
The changes vs. V2:
- Document in the change log that the non-leader exec() case is properly ordered against the lockless pending list flush. - Frederic, Peter, Alan
- Add a comment to document when a lockless flush is safe
- Cancel pending POSIX CPU timer work only for exit(), not for exec() - Oleg
- Pick up Reviewed-by tags where appropriate
The delta patch against V2 is below.
The series applies on 7.3-rc1 and is avalaible from git:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git posix-timers
Thanks,
tglx
---
kernel/signal.c +14 -0
@@ -457,6 +457,20 @@ static void __sigqueue_free(struct sigqueue *q)kmem_cache_free (sigqueue_cachep, q); } +/* +* flush_sigqueue_list() can only be invoked without holding sighand::siglock in +* the following cases: +* +* 1) When flushing task::pending _after_ setting task::flags PF_EXITING +* +* All functions which try to send a signal to @task will observe PF_EXITING +* and drop the signal. +* +* 2) When flushing task::signal::shared_pending _after_ the last task in a +* thread group was unhashed and task::sighand is NULL. +* +* Nothing can queue a signal anymore because sighand is NULL. +*/ static void flush_sigqueue_list (struct list_head *head) {struct sigqueue *q, *tmp;
kernel/time/posix-cpu-timers.c +3 -0
@@ -1270,6 +1270,9 @@ static void posix_cpu_timers_work(struct callback_head *work)static inline void posix_cpu_timers_exit_work (void ) { +/* Canceling the work is only valid for exit() but not for exec() */ +if (!(current->flags &PF_EXITING )) +return ;/* * current->flags has PF_EXITING set so this can be done lockless and * with interrupts enabled as PF_EXITING prevents the interrupt from