diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 13:31:37 +0200 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 13:31:37 +0200 |
| commit | ba15533275dd70238b523417d222d43fb40dac9d (patch) | |
| tree | e97f6b804994d20ce476dc5a123fc074799e9584 /ipc/sem.c | |
| parent | f75410a406e934e4cf31e0a7ec151799a6bf38cf (diff) | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
| download | linux-ba15533275dd70238b523417d222d43fb40dac9d.tar.gz linux-ba15533275dd70238b523417d222d43fb40dac9d.tar.bz2 linux-ba15533275dd70238b523417d222d43fb40dac9d.zip | |
Merge tag 'v5.6' into mips-next
Linux 5.6
Diffstat (limited to 'ipc/sem.c')
| -rw-r--r-- | ipc/sem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ipc/sem.c b/ipc/sem.c index 4f4303f32077..3687b71151b3 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -2384,11 +2384,9 @@ void exit_sem(struct task_struct *tsk) ipc_assert_locked_object(&sma->sem_perm); list_del(&un->list_id); - /* we are the last process using this ulp, acquiring ulp->lock - * isn't required. Besides that, we are also protected against - * IPC_RMID as we hold sma->sem_perm lock now - */ + spin_lock(&ulp->lock); list_del_rcu(&un->list_proc); + spin_unlock(&ulp->lock); /* perform adjustments registered in un */ for (i = 0; i < sma->sem_nsems; i++) { |