Skip to content

Commit

Permalink
ipc/sem.c: synchronize the proc interface
Browse files Browse the repository at this point in the history
The proc interface is not aware of sem_lock(), it instead calls
ipc_lock_object() directly.  This means that simple semop() operations
can run in parallel with the proc interface.  Right now, this is
uncritical, because the implementation doesn't do anything that requires
a proper synchronization.

But it is dangerous and therefore should be fixed.

Signed-off-by: Manfred Spraul <[email protected]>
Cc: Davidlohr Bueso <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Rik van Riel <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
manfred-colorfu authored and torvalds committed Sep 30, 2013
1 parent 6d07b68 commit d8c6337
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ipc/sem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2103,6 +2103,14 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
struct sem_array *sma = it;
time_t sem_otime;

/*
* The proc interface isn't aware of sem_lock(), it calls
* ipc_lock_object() directly (in sysvipc_find_ipc).
* In order to stay compatible with sem_lock(), we must wait until
* all simple semop() calls have left their critical regions.
*/
sem_wait_array(sma);

sem_otime = get_semotime(sma);

return seq_printf(s,
Expand Down

0 comments on commit d8c6337

Please sign in to comment.