Commit 9c21dae2 authored Sep 04, 2018 by Davidlohr Bueso Committed by Linus Torvalds Sep 04, 2018

ipc/shm: properly return EIDRM in shm_lock()

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: 82061c57 ("ipc: drop ipc_lock()")
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Reported-by: kernel test robot <rong.a.chen@intel.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 464c7ffb

ipc/shm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();
		/*