Commit 59cf0a93 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

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;

Fixes: 82061c57 ("ipc: drop ipc_lock()")
Signed-off-by: default avatarKees Cook <>
Cc: Davidlohr Bueso <>
Cc: Manfred Spraul <>
Cc: Arnd Bergmann <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 51896864
......@@ -206,7 +206,7 @@ static inline struct shmid_kernel *shm_lock(struct ipc_namespace *ns, int id)
* 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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment