Commit 59cf0a93 authored Oct 05, 2018 by Kees Cook Committed by Greg Kroah-Hartman Oct 05, 2018

ipc/shm.c: use ERR_CAST() for shm_lock() error return

This uses ERR_CAST() instead of an open-coded cast, as it is casting
across structure pointers, which upsets __randomize_layout:

ipc/shm.c: In function `shm_lock':
ipc/shm.c:209:9: note: randstruct: casting between randomized structure pointer types (ssa): `struct shmid_kernel' and `struct kern_ipc_perm'

  return (void *)ipcp;
         ^~~~~~~~~~~~

Link: http://lkml.kernel.org/r/20180919180722.GA15073@beast


Fixes: 82061c57 ("ipc: drop ipc_lock()")
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 51896864

ipc/shm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ err:
		* Callers of shm_lock() must validate the status of the returned ipc
		* object pointer and error out as appropriate.
		*/
		return (void *)ipcp;
		return ERR_CAST(ipcp);
		}

		static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)

Admin message