diff --git a/lib/Makefile b/lib/Makefile
index 9f6898648b1c23163d8a064e977cba7c127bff53..1d7a705d72074aaa1fc931bfa36d08f28c9e90fd 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -269,7 +269,8 @@ obj-$(CONFIG_UCS2_STRING) += ucs2_string.o
 obj-$(CONFIG_UBSAN) += ubsan.o
 
 UBSAN_SANITIZE_ubsan.o := n
-CFLAGS_ubsan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)
+KASAN_SANITIZE_ubsan.o := n
+CFLAGS_ubsan.o := $(call cc-option, -fno-stack-protector) $(DISABLE_STACKLEAK_PLUGIN)
 
 obj-$(CONFIG_SBITMAP) += sbitmap.o