af_unix: Set gc_in_progress to true in unix_gc().
Subsystems (3)
PATCH 1/1 af_unix: Set gc_in_progress to true in unix_gc().
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit d82ba05263c69fa2437fe93e4e561cc40f4c03af ]
Igor Ushakov reported that unix_gc() could run with gc_in_progress being false if the work is scheduled while running:
Thread 1 Thread 2 Thread 3
-------- -------- --------
unix_schedule_gc() unix_schedule_gc()
`- if (!gc_in_progress) `- if (!gc_in_progress)
|- gc_in_progress = true |
`- queue_work() |
unix_gc() <----------------/ |
| |- gc_in_progress = true
... `- queue_work()
| |
`- gc_in_progress = false |
| unix_gc() <---------------------------------------------' |
... /* gc_in_progress == false */
|
`- gc_in_progress = false
unix_peek_fpl() relies on gc_in_progress not to confuse GC by MSG_PEEK.
Let's set gc_in_progress to true in unix_gc().
Fixes 8b90a9f819dc ("af_unix: Run GC on only one CPU.")
Reported-by Igor Ushakov <[email protected]>
Signed-off-by Kuniyuki Iwashima <[email protected]>
Signed-off-by Jakub Kicinski <[email protected]>
Signed-off-by Igor Ushakov <[email protected]>
--- net/unix/garbage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/unix/garbage.c +3 -3
@@ -607,6 +607,8 @@ static void unix_gc(struct work_struct *work)struct sk_buff_head hitlist;struct sk_buff *skb; +WRITE_ONCE (gc_in_progress, true); +spin_lock (&unix_gc_lock);if (unix_graph_state ==UNIX_GRAPH_NOT_CYCLIC ) {
@@ -649,10 +651,8 @@ void unix_schedule_gc(struct user_struct *user) READ_ONCE(user->unix_inflight) < UNIX_INFLIGHT_SANE_USER)return ; -if (!READ_ONCE (gc_in_progress)) { -WRITE_ONCE (gc_in_progress, true); +if (!READ_ONCE (gc_in_progress))queue_work (system_dfl_wq, &unix_gc_work); - }if (user &&READ_ONCE (unix_graph_cyclic_sccs))flush_work (&unix_gc_work);
Signature · 1 line
2.47.3