Skip to content

Commit a4046c0

Browse files
peter50216torvalds
authored andcommitted
include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
Use offsetof() to calculate offset of a field to take advantage of compiler built-in version when possible, and avoid UBSAN warning when compiling with Clang: UBSAN: Undefined behaviour in mm/swapfile.c:3010:38 member access within null pointer of type 'union swap_header' CPU: 6 PID: 1833 Comm: swapon Tainted: G S 4.19.23 #43 Call trace: dump_backtrace+0x0/0x194 show_stack+0x20/0x2c __dump_stack+0x20/0x28 dump_stack+0x70/0x94 ubsan_epilogue+0x14/0x44 ubsan_type_mismatch_common+0xf4/0xfc __ubsan_handle_type_mismatch_v1+0x34/0x54 __se_sys_swapon+0x654/0x1084 __arm64_sys_swapon+0x1c/0x24 el0_svc_common+0xa8/0x150 el0_svc_compat_handler+0x2c/0x38 el0_svc_compat+0x8/0x18 Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Pi-Hsun Shih <[email protected]> Acked-by: Michal Hocko <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 1741560 commit a4046c0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/swap.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ struct swap_extent {
157157
/*
158158
* Max bad pages in the new format..
159159
*/
160-
#define __swapoffset(x) ((unsigned long)&((union swap_header *)0)->x)
161160
#define MAX_SWAP_BADPAGES \
162-
((__swapoffset(magic.magic) - __swapoffset(info.badpages)) / sizeof(int))
161+
((offsetof(union swap_header, magic.magic) - \
162+
offsetof(union swap_header, info.badpages)) / sizeof(int))
163163

164164
enum {
165165
SWP_USED = (1 << 0), /* is slot in swap_info[] used? */

0 commit comments

Comments
 (0)