diff mbox series

[4.9,52/64] x86/uaccess, ubsan: Fix UBSAN vs. SMAP

Message ID	20200526183930.626243998@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=+fRt=7I=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Peter Zijlstra (Intel)" <peterz@infradead.org>, Borislav Petkov <bp@alien8.de>, Dmitry Vyukov <dvyukov@google.com>, Josh Poimboeuf <jpoimboe@redhat.com>, Linus Torvalds <torvalds@linux-foundation.org>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@kernel.org> Subject: [PATCH 4.9 52/64] x86/uaccess, ubsan: Fix UBSAN vs. SMAP Date: Tue, 26 May 2020 20:53:21 +0200 Message-Id: <20200526183930.626243998@linuxfoundation.org> In-Reply-To: <20200526183913.064413230@linuxfoundation.org> References: <20200526183913.064413230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,03/64] padata: get_next is never NULL [4.9,04/64] padata: ensure the reorder timer callback runs on the correct CPU [4.9,06/64] evm: Check also if *tfm is an error pointer in init_desc() [4.9,07/64] ima: Fix return value of ima_write_policy() [4.9,09/64] iommu/amd: Fix over-read of ACPI UID from IVRS table [4.9,12/64] HID: multitouch: add eGalaxTouch P80H84 support [4.9,13/64] configfs: fix config_item refcnt leak in configfs_rmdir() [4.9,16/64] ceph: fix double unlock in handle_cap_export() [4.9,17/64] USB: core: Fix misleading driver bug report [4.9,19/64] ARM: futex: Address build warning [4.9,21/64] padata: set cpu_index of unused CPUs to -1 [4.9,22/64] padata: Replace delayed timer with immediate workqueue in padata_reorder [4.9,25/64] arm64: fix the flush_icache_range arguments in machine_kexec [4.9,32/64] l2tp: remove useless duplicate session detection in l2tp_netlink [4.9,40/64] l2tp: hold tunnel while handling genl TUNNEL_GET commands [4.9,41/64] l2tp: hold tunnel used while creating sessions with netlink [4.9,43/64] l2tp: pass tunnel pointer to ->session_create() [4.9,44/64] l2tp: fix l2tp_eth module loading [4.9,45/64] l2tp: dont register sessions in l2tp_session_create() [4.9,46/64] l2tp: initialise l2tp_eth sessions before registering them [4.9,50/64] dmaengine: tegra210-adma: Fix an error handling path in tegra_adma_probe() [4.9,52/64] x86/uaccess, ubsan: Fix UBSAN vs. SMAP [4.9,53/64] ubsan: build ubsan.c more conservatively [4.9,55/64] libnvdimm/btt: Remove unnecessary code in btt_freelist_init [4.9,56/64] cxgb4: free mac_hlist properly [4.9,58/64] Revert "gfs2: Dont demote a glock until its revokes are written" [4.9,61/64] iio: dac: vf610: Fix an error handling path in vf610_dac_probe() [4.9,63/64] rapidio: fix an error in get_user_pages_fast() error handling [4.9,64/64] iio: sca3000: Remove an erroneous get_device()

Commit Message

Greg Kroah-Hartman May 26, 2020, 6:53 p.m. UTC

From: Peter Zijlstra <peterz@infradead.org>

commit d08965a27e84ca090b504844d50c24fc98587b11 upstream.

UBSAN can insert extra code in random locations; including AC=1
sections. Typically this code is not safe and needs wrapping.

So far, only __ubsan_handle_type_mismatch* have been observed in AC=1
sections and therefore only those are annotated.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
[stable backport: only take the lib/Makefile change to resolve gcc-10
 build issues]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 lib/Makefile |    1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

--- a/lib/Makefile
+++ b/lib/Makefile
@@ -230,5 +230,6 @@  obj-$(CONFIG_UCS2_STRING) += ucs2_string
 obj-$(CONFIG_UBSAN) += ubsan.o
 
 UBSAN_SANITIZE_ubsan.o := n
+CFLAGS_ubsan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)
 
 obj-$(CONFIG_SBITMAP) += sbitmap.o