From 1ffaaad78b8cccec7497e87bbcb27652f3864790 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Jul 2023 17:17:44 +0000 Subject: [PATCH] ANDROID: GKI: Update gki_defconfig for CONFIG_UBSAN_LOCAL_BOUNDS In commit 2d47c6956ab3 ("ubsan: Tighten UBSAN_BOUNDS on GCC"), the dependancies for CONFIG_UBSAN_LOCAL_BOUNDS changed, so there is no need to explicitly enable it in the gki_defconfig files. So remove it from the gki_defconfig files, which fixes the build. Fixes: 2d47c6956ab3 ("ubsan: Tighten UBSAN_BOUNDS on GCC") Change-Id: I16b2ac370150ad02fd8975051ae992d5a96239e6 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/configs/gki_defconfig | 1 - arch/riscv/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 532915f65ba3..25f6faabf017 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -681,7 +681,6 @@ CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y # CONFIG_UBSAN_SHIFT is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig index 909feec05bd9..ad67c343f797 100644 --- a/arch/riscv/configs/gki_defconfig +++ b/arch/riscv/configs/gki_defconfig @@ -625,7 +625,6 @@ CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y # CONFIG_UBSAN_SHIFT is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 20457fe457d4..3abeca0f7025 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -633,7 +633,6 @@ CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y # CONFIG_UBSAN_SHIFT is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set