Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/addnote: Fix overflow on 32-bit builds

The PUT_64[LB]E() macros need to cast the value to unsigned long long
like the GET_64[LB]E() macros. Caused lots of warnings when compiled
on 32-bit, and clobbered addresses (36-bit P4080).

Signed-off-by: Ben Collins <bcollins@kernel.org>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/2025042122-mustard-wrasse-694572@boujee-and-buff

authored by

Ben Collins and committed by
Madhavan Srinivasan
825ce89a cbc8bd1b

+4 -3
+4 -3
arch/powerpc/boot/addnote.c
··· 68 68 #define PUT_16BE(off, v)(buf[off] = ((v) >> 8) & 0xff, \ 69 69 buf[(off) + 1] = (v) & 0xff) 70 70 #define PUT_32BE(off, v)(PUT_16BE((off), (v) >> 16L), PUT_16BE((off) + 2, (v))) 71 - #define PUT_64BE(off, v)((PUT_32BE((off), (v) >> 32L), \ 72 - PUT_32BE((off) + 4, (v)))) 71 + #define PUT_64BE(off, v)((PUT_32BE((off), (unsigned long long)(v) >> 32L), \ 72 + PUT_32BE((off) + 4, (unsigned long long)(v)))) 73 73 74 74 #define GET_16LE(off) ((buf[off]) + (buf[(off)+1] << 8)) 75 75 #define GET_32LE(off) (GET_16LE(off) + (GET_16LE((off)+2U) << 16U)) ··· 78 78 #define PUT_16LE(off, v) (buf[off] = (v) & 0xff, \ 79 79 buf[(off) + 1] = ((v) >> 8) & 0xff) 80 80 #define PUT_32LE(off, v) (PUT_16LE((off), (v)), PUT_16LE((off) + 2, (v) >> 16L)) 81 - #define PUT_64LE(off, v) (PUT_32LE((off), (v)), PUT_32LE((off) + 4, (v) >> 32L)) 81 + #define PUT_64LE(off, v) (PUT_32LE((off), (unsigned long long)(v)), \ 82 + PUT_32LE((off) + 4, (unsigned long long)(v) >> 32L)) 82 83 83 84 #define GET_16(off) (e_data == ELFDATA2MSB ? GET_16BE(off) : GET_16LE(off)) 84 85 #define GET_32(off) (e_data == ELFDATA2MSB ? GET_32BE(off) : GET_32LE(off))