[folded-merged] mm-slab-sanity-check-page-type-when-looking-up-cache-fix.patch removed from -mm tree

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

 



The patch titled
     Subject: mm/slab: restore IRQs in kfree()
has been removed from the -mm tree.  Its filename was
     mm-slab-sanity-check-page-type-when-looking-up-cache-fix.patch

This patch was dropped because it was folded into mm-slab-sanity-check-page-type-when-looking-up-cache.patch

------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: mm/slab: restore IRQs in kfree()

We added a new return here but we need to restore the IRQs before we
leave.

Link: http://lkml.kernel.org/r/20190613065637.GE16334@mwanda
Fixes: 4f5d94fd4ed5 ("mm/slab: sanity-check page type when looking up cache")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

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

--- a/mm/slab.c~mm-slab-sanity-check-page-type-when-looking-up-cache-fix
+++ a/mm/slab.c
@@ -3745,8 +3745,10 @@ void kfree(const void *objp)
 	local_irq_save(flags);
 	kfree_debugcheck(objp);
 	c = virt_to_cache(objp);
-	if (!c)
+	if (!c) {
+		local_irq_restore(flags);
 		return;
+	}
 	debug_check_no_locks_freed(objp, c->object_size);
 
 	debug_check_no_obj_freed(objp, c->object_size);
_

Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are

mm-slab-sanity-check-page-type-when-looking-up-cache.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