From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Pi-Hsun Shih <pihsun@chromium.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.4 16/16] include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
Date: Fri, 29 Mar 2019 21:32:00 -0400 [thread overview]
Message-ID: <20190330013200.1130-16-sashal@kernel.org> (raw)
In-Reply-To: <20190330013200.1130-1-sashal@kernel.org>
From: Pi-Hsun Shih <pihsun@chromium.org>
[ Upstream commit a4046c06be50a4f01d435aa7fe57514818e6cc82 ]
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/20190312081902.223764-1-pihsun@chromium.org
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
include/linux/swap.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index d8ca2eaa3a8b..0a0b7529dae4 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -135,9 +135,9 @@ struct swap_extent {
/*
* Max bad pages in the new format..
*/
-#define __swapoffset(x) ((unsigned long)&((union swap_header *)0)->x)
#define MAX_SWAP_BADPAGES \
- ((__swapoffset(magic.magic) - __swapoffset(info.badpages)) / sizeof(int))
+ ((offsetof(union swap_header, magic.magic) - \
+ offsetof(union swap_header, info.badpages)) / sizeof(int))
enum {
SWP_USED = (1 << 0), /* is slot in swap_info[] used? */
--
2.19.1
prev parent reply other threads:[~2019-03-30 1:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 1:31 [PATCH AUTOSEL 4.4 01/16] rsi: improve kernel thread handling to fix kernel panic Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 02/16] 9p: do not trust pdu content for stat item size Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 03/16] 9p locks: add mount option for lock retry interval Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 04/16] f2fs: fix to do sanity check with current segment number Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 05/16] serial: uartps: console_setup() can't be placed to init section Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 06/16] ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 07/16] ACPI / SBS: Fix GPE storm on recent MacBookPro's Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 08/16] cifs: fallback to older infolevels on findfirst queryinfo retry Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 09/16] crypto: sha256/arm - fix crash bug in Thumb2 build Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 10/16] crypto: sha512/arm " Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 11/16] iommu/dmar: Fix buffer overflow during PCI bus notification Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 12/16] ext4: prohibit fstrim in norecovery mode Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 13/16] ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 14/16] appletalk: Fix use-after-free in atalk_proc_exit Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.4 15/16] lib/div64.c: off by one in shift Sasha Levin
2019-03-30 1:32 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330013200.1130-16-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pihsun@chromium.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).