1 files changed, 11 insertions, 0 deletions

diff --git a/mm/cma.c b/mm/cma.c
index 4cb76121a3ab..c7b39dd3b4f6 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -407,6 +407,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
         unsigned long pfn = -1;
         unsigned long start = 0;
         unsigned long bitmap_maxno, bitmap_no, bitmap_count;
+        size_t i;
         struct page *page = NULL;
         int ret = -ENOMEM;
 
@@ -466,6 +467,16 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
 
         trace_cma_alloc(pfn, page, count, align);
 
+        /*
+         * CMA can allocate multiple page blocks, which results in different
+         * blocks being marked with different tags. Reset the tags to ignore
+         * those page blocks.
+         */
+        if (page) {
+                for (i = 0; i < count; i++)
+                        page_kasan_tag_reset(page + i);
+        }
+
         if (ret && !no_warn) {
                 pr_err("%s: alloc failed, req-size: %zu pages, ret: %d\n",
                         __func__, count, ret);