[folded-merged] mm-kasan-add-object-validation-in-ksize-v4.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-kasan-add-object-validation-in-ksize-v4
has been removed from the -mm tree.  Its filename was
     mm-kasan-add-object-validation-in-ksize-v4.patch

This patch was dropped because it was folded into mm-kasan-add-object-validation-in-ksize.patch

------------------------------------------------------
From: Marco Elver <elver@xxxxxxxxxx>
Subject: mm-kasan-add-object-validation-in-ksize-v4

s/BUG_ON/WARN_ON_ONCE/, per Kees

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199359
Link: http://lkml.kernel.org/r/20190627094445.216365-6-elver@xxxxxxxxxx
Signed-off-by: Marco Elver <elver@xxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/slab_common.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/mm/slab_common.c~mm-kasan-add-object-validation-in-ksize-v4
+++ a/mm/slab_common.c
@@ -1615,7 +1615,8 @@ size_t ksize(const void *objp)
 {
 	size_t size;
 
-	BUG_ON(!objp);
+	if (WARN_ON_ONCE(!objp))
+		return 0;
 	/*
 	 * We need to check that the pointed to object is valid, and only then
 	 * unpoison the shadow memory below. We use __kasan_check_read(), to
_

Patches currently in -mm which might be from elver@xxxxxxxxxx are

mm-kasan-print-frame-description-for-stack-bugs.patch
lib-test_kasan-add-bitops-tests.patch
x86-use-static_cpu_has-in-uaccess-region-to-avoid-instrumentation.patch
asm-generic-x86-add-bitops-instrumentation-for-kasan.patch
mm-kasan-introduce-__kasan_check_readwrite.patch
mm-kasan-change-kasan_check_readwrite-to-return-boolean.patch
lib-test_kasan-add-test-for-double-kzfree-detection.patch
mm-slab-refactor-common-ksize-kasan-logic-into-slab_commonc.patch
mm-kasan-add-object-validation-in-ksize.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux