Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 59cf0a9339ca4b0226e9b4329dfb0a5b8b0b9bc2

Authored by Kees Cook
Committed by Greg Kroah-Hartman
1 parent 5189686457
Exists in smarc_imx_lf-5.15.y and in 15 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb-lf-6.6.52-2.2.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, pitx_8mp_lf-5.10.y, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y

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: 82061c57ce93 ("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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -206,7 +206,7 @@
206 206 * Callers of shm_lock() must validate the status of the returned ipc
207 207 * object pointer and error out as appropriate.
208 208 */
209   - return (void *)ipcp;
  209 + return ERR_CAST(ipcp);
210 210 }
211 211  
212 212 static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)