linux-next: build failure after merge of the akpm tree

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

 



Hi all,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/kasan/quarantine.c: In function 'quarantine_put':
mm/kasan/quarantine.c:197:15: error: 'info' undeclared (first use in this function)
  197 |   qlink_free(&info->quarantine_link, cache);
      |               ^~~~
mm/kasan/quarantine.c:197:15: note: each undeclared identifier is reported only once for each function it appears in
mm/kasan/quarantine.c:199:3: error: 'return' with no value, in function returning non-void [-Werror=return-type]
  199 |   return;
      |   ^~~~~~
mm/kasan/quarantine.c:171:6: note: declared here
  171 | bool quarantine_put(struct kmem_cache *cache, void *object)
      |      ^~~~~~~~~~~~~~

Caused by patches

  "kasan: rename get_alloc/free_info"
  "kasan: sanitize objects when metadata doesn't fit"

I have applied the following fix patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 3 Dec 2020 19:41:49 +1100
Subject: [PATCH] kasan-rename-get_alloc-free_info-fix

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/kasan/quarantine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index feae26ea5cbb..d98b516f372f 100644
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -194,9 +194,9 @@ bool quarantine_put(struct kmem_cache *cache, void *object)
 
 	q = this_cpu_ptr(&cpu_quarantine);
 	if (q->offline) {
-		qlink_free(&info->quarantine_link, cache);
+		qlink_free(&meta->quarantine_link, cache);
 		local_irq_restore(flags);
-		return;
+		return false;
 	}
 	qlist_put(q, &meta->quarantine_link, cache->size);
 	if (unlikely(q->bytes > QUARANTINE_PERCPU_SIZE)) {
-- 
2.29.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpe82SsMEdII.pgp
Description: OpenPGP digital signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux