Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[mirror_ubuntu-jammy-kernel.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index e362dc3d2028c331b87bc663cea053da092ad763..5e252d91eb14b1e717daf28f934462f47f12ee87 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1169,8 +1169,10 @@ static bool update_checksum(struct kmemleak_object *object)
        u32 old_csum = object->checksum;
 
        kasan_disable_current();
+       kcsan_disable_current();
        object->checksum = crc32(0, (void *)object->pointer, object->size);
        kasan_enable_current();
+       kcsan_enable_current();
 
        return object->checksum != old_csum;
 }