Skip to content

Commit

Permalink
ipc/shm: properly return EIDRM in shm_lock()
Browse files Browse the repository at this point in the history 
When getting rid of the general ipc_lock(), this was missed furthermore,
making the comment around the ipc object validity check bogus.  Under
EIDRM conditions, callers will in turn not see the error and continue
with the operation.

Link: http://lkml.kernel.org/r/20180824030920.GD3677@linux-r8p5
Link: http://lkml.kernel.org/r/20180823024051.GC13343@shao2-debian
Fixes: 82061c5 ("ipc: drop ipc_lock()")
Signed-off-by: Davidlohr Bueso <[email protected]>
Reported-by: kernel test robot <[email protected]>
Cc: Manfred Spraul <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@torvalds
Davidlohr Bueso authored and torvalds committed Sep 4, 2018
1 parent 464c7ff commit 9c21dae
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions ipc/shm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ static inline struct shmid_kernel *shm_lock(struct ipc_namespace *ns, int id)
}

ipc_unlock_object(ipcp);
ipcp = ERR_PTR(-EIDRM);
err:
rcu_read_unlock();
/*
Expand Down

0 comments on commit 9c21dae

Please sign in to comment.