* [PATCH AUTOSEL 5.0 95/98] kasan: fix variable 'tag' set but not used warning
[not found] <20190422194205.10404-1-sashal@kernel.org>
@ 2019-04-22 19:42 ` Sasha Levin
0 siblings, 0 replies; only message in thread
From: Sasha Levin @ 2019-04-22 19:42 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Qian Cai, Andrey Ryabinin, Alexander Potapenko, Dmitry Vyukov,
Andrew Morton, Linus Torvalds, Sasha Levin, kasan-dev, linux-mm
From: Qian Cai <cai@lca.pw>
[ Upstream commit c412a769d2452161e97f163c4c4f31efc6626f06 ]
set_tag() compiles away when CONFIG_KASAN_SW_TAGS=n, so make
arch_kasan_set_tag() a static inline function to fix warnings below.
mm/kasan/common.c: In function '__kasan_kmalloc':
mm/kasan/common.c:475:5: warning: variable 'tag' set but not used [-Wunused-but-set-variable]
u8 tag;
^~~
Link: http://lkml.kernel.org/r/20190307185244.54648-1-cai@lca.pw
Signed-off-by: Qian Cai <cai@lca.pw>
Reviewed-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
---
mm/kasan/kasan.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index ea51b2d898ec..c980ce43e3ba 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -164,7 +164,10 @@ static inline u8 random_tag(void)
#endif
#ifndef arch_kasan_set_tag
-#define arch_kasan_set_tag(addr, tag) ((void *)(addr))
+static inline const void *arch_kasan_set_tag(const void *addr, u8 tag)
+{
+ return addr;
+}
#endif
#ifndef arch_kasan_reset_tag
#define arch_kasan_reset_tag(addr) ((void *)(addr))
--
2.19.1
^ permalink raw reply related [flat|nested] only message in thread