Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / mm / kasan / quarantine.c

diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index 65793f150d1f6e1f77d32ad64d37966f0ad9704c..b6728a33a4aca104fde8022b90fdf2df5630af31 100644 (file)
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -144,13 +144,15 @@ static void *qlink_to_object(struct qlist_node *qlink, struct kmem_cache *cache)
 static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache)
 {
        void *object = qlink_to_object(qlink, cache);
-       struct kasan_alloc_meta *alloc_info = get_alloc_info(cache, object);
        unsigned long flags;
 
-       local_irq_save(flags);
-       alloc_info->state = KASAN_STATE_FREE;
+       if (IS_ENABLED(CONFIG_SLAB))
+               local_irq_save(flags);
+
        ___cache_free(cache, object, _THIS_IP_);
-       local_irq_restore(flags);
+
+       if (IS_ENABLED(CONFIG_SLAB))
+               local_irq_restore(flags);
 }
 
 static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache)
@@ -196,7 +198,7 @@ void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache)
 
 void quarantine_reduce(void)
 {
-       size_t new_quarantine_size;
+       size_t new_quarantine_size, percpu_quarantines;
        unsigned long flags;
        struct qlist_head to_free = QLIST_INIT;
        size_t size_to_free = 0;
@@ -214,7 +216,12 @@ void quarantine_reduce(void)
         */
        new_quarantine_size = (READ_ONCE(totalram_pages) << PAGE_SHIFT) /
                QUARANTINE_FRACTION;
-       new_quarantine_size -= QUARANTINE_PERCPU_SIZE * num_online_cpus();
+       percpu_quarantines = QUARANTINE_PERCPU_SIZE * num_online_cpus();
+       if (WARN_ONCE(new_quarantine_size < percpu_quarantines,
+               "Too little memory, disabling global KASAN quarantine.\n"))
+               new_quarantine_size = 0;
+       else
+               new_quarantine_size -= percpu_quarantines;
        WRITE_ONCE(quarantine_size, new_quarantine_size);
 
        last = global_quarantine.head;