From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbeAEJlY (ORCPT + 1 other); Fri, 5 Jan 2018 04:41:24 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:63615 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbeAEJlV (ORCPT ); Fri, 5 Jan 2018 04:41:21 -0500 From: Arnd Bergmann To: Andrew Morton , Andrey Ryabinin Cc: Arnd Bergmann , Alexander Potapenko , Dmitry Vyukov , Stephen Rothwell , Andrey Konovalov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] kasan: add declarations for internal functions Date: Fri, 5 Jan 2018 10:40:41 +0100 Message-Id: <20180105094112.2690475-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:CCj2ylcPabjhAGZwtcgZKUC7E8JNb+TSL+8rFdJUEOlVuvSlNfp D1yWgvvkoyeYFAXjvHsrJ+IN/2p2q6etgOqeBTpX40Le0S8993+3Ci0oZMzrGHkhDpDaOva TPGNEz4xWdTJA0V5tZC2FQ5fdNjuG4MyDMn36c2LCjFXpZOv9IYYbgGnqlB8MGDmJx9r/nx HGiqGFiKUX+I9FegQM7xw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Tog19hLpoTI=:DEqGK9bW632Ep8xhR7FBA9 vVfRDefZSpkvC8lxbH/qpqHPB+dLnOZQ4U6VKmn9i2B7Pyi40KtnOCyluGfTkR+kzQRwVviAz nBsau81g9KbysEb4XWOwENtfM0ylRov8Rl1tovrmwtnjCcpHK4AUDu5Ljpuvy2sRzdWbYty94 v17pHYDWgKWYTaWWgU5ZO4xrTWWISy8cxZmxh0Rm6oM5vMGM2uMe5nwZxKCCJ7vb6OowpgIaO Ae2MHwHaXkiQSfSAkdAg9uDhjTFpEjNgsWzZ/WBeZWazNtDx7otQs/UpeZSmDoC8TrFm1e1J+ mB1ChLoa1Uiv0pyrw/sPf/seNqwUMd1d3TErKuBfwS/Hv1bfBCULkb/icOO8+IqHv3pEfhUGV GtU8wN2WvD0C1ZkFq9JKlLPk9eYpuV8SdCx2EEAKgmKIDZbv8kST6u1dcOYS4H7PF1Hij7ops 6BVM7lN8DjruUQ46faXtUNjsIrNQ3tLHFrVeK75Dg3mMKwEPC3JKNqigds958eBoEDBVcp8HG Cs8PZU1ozqRF3HQgeYXyFISpGa/nkJE3BQpgCOgwfDq2lnPaZbMI/Va/v8CMhfWLMoAmTk1zx Hm8AzU0Pfi9I0UShDBWAFubiXs8B7+70t5OHRAHBLI7A/eOsr9xj3dERyKXy5euyEDnn0FADm g6M5th4WQ7nRMtQNAKmWz1ENFEwQklidBR/oneJLUG6l10wWhwjQWa04ugA6koipJqzWqWfXO Yjs7MCkvll2vJRpzOUIRThTtPqPwFO5YymVb+g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: A patch got merged that made newly added functions static, leading to a warning about unused functions as well as a link error when they are actually used: mm/kasan/kasan.c:780:7: error: '__asan_set_shadow_f8' defined but not used [-Werror=unused-function] mm/kasan/kasan.c:791:8: note: in expansion of macro 'DEFINE_ASAN_SET_SHADOW' mm/kasan/kasan.c:780:7: error: '__asan_set_shadow_f5' defined but not used [-Werror=unused-function] It turns out the underlying problem is that a lot of the internal interfaces of the kasan implementation are only ever called from code generated by the compiler. These don't need any declarations to work fine, but cause warnings both with sparse and with 'make W=1': mm/kasan/kasan.c:695:1: warning: symbol '__asan_load1' was not declared. Should it be static? mm/kasan/kasan.c:695:1: warning: symbol '__asan_store1' was not declared. Should it be static? mm/kasan/kasan.c:696:1: warning: symbol '__asan_load2' was not declared. Should it be static? mm/kasan/kasan.c:696:1: warning: symbol '__asan_store2' was not declared. Should it be static? mm/kasan/kasan.c:697:1: warning: symbol '__asan_load4' was not declared. Should it be static? This removes the bogus 'static' annotation and adds declarations for all affected interfaces. Fixes: mmotm ("kasan: __asan_set_shadow_00 can be static") Signed-off-by: Arnd Bergmann --- mm/kasan/kasan.c | 12 ++++++------ mm/kasan/kasan.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index 83a11e7e3700..3fb497d4fbf8 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -783,12 +783,12 @@ EXPORT_SYMBOL(__asan_allocas_unpoison); } \ EXPORT_SYMBOL(__asan_set_shadow_##byte) -static DEFINE_ASAN_SET_SHADOW(00); -static DEFINE_ASAN_SET_SHADOW(f1); -static DEFINE_ASAN_SET_SHADOW(f2); -static DEFINE_ASAN_SET_SHADOW(f3); -static DEFINE_ASAN_SET_SHADOW(f5); -static DEFINE_ASAN_SET_SHADOW(f8); +DEFINE_ASAN_SET_SHADOW(00); +DEFINE_ASAN_SET_SHADOW(f1); +DEFINE_ASAN_SET_SHADOW(f2); +DEFINE_ASAN_SET_SHADOW(f3); +DEFINE_ASAN_SET_SHADOW(f5); +DEFINE_ASAN_SET_SHADOW(f8); #ifdef CONFIG_MEMORY_HOTPLUG static int __meminit kasan_mem_notifier(struct notifier_block *nb, diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 2792de927fcd..c12dcfde2ebd 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -120,4 +120,48 @@ static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif +/* + * Exported functions for interfaces called from assembly or from generated + * code. Declarations here to avoid warning about missing declarations. + */ +asmlinkage void kasan_unpoison_task_stack_below(const void *watermark); +void __asan_register_globals(struct kasan_global *globals, size_t size); +void __asan_unregister_globals(struct kasan_global *globals, size_t size); +void __asan_loadN(unsigned long addr, size_t size); +void __asan_storeN(unsigned long addr, size_t size); +void __asan_handle_no_return(void); +void __asan_poison_stack_memory(const void *addr, size_t size); +void __asan_unpoison_stack_memory(const void *addr, size_t size); +void __asan_alloca_poison(unsigned long addr, size_t size); +void __asan_allocas_unpoison(const void *stack_top, const void *stack_bottom); + +void __asan_load1(unsigned long addr); +void __asan_store1(unsigned long addr); +void __asan_load2(unsigned long addr); +void __asan_store2(unsigned long addr); +void __asan_load4(unsigned long addr); +void __asan_store4(unsigned long addr); +void __asan_load8(unsigned long addr); +void __asan_store8(unsigned long addr); +void __asan_load16(unsigned long addr); +void __asan_store16(unsigned long addr); + +void __asan_load1_noabort(unsigned long addr); +void __asan_store1_noabort(unsigned long addr); +void __asan_load2_noabort(unsigned long addr); +void __asan_store2_noabort(unsigned long addr); +void __asan_load4_noabort(unsigned long addr); +void __asan_store4_noabort(unsigned long addr); +void __asan_load8_noabort(unsigned long addr); +void __asan_store8_noabort(unsigned long addr); +void __asan_load16_noabort(unsigned long addr); +void __asan_store16_noabort(unsigned long addr); + +void __asan_set_shadow_00(const void *addr, size_t size); +void __asan_set_shadow_f1(const void *addr, size_t size); +void __asan_set_shadow_f2(const void *addr, size_t size); +void __asan_set_shadow_f3(const void *addr, size_t size); +void __asan_set_shadow_f5(const void *addr, size_t size); +void __asan_set_shadow_f8(const void *addr, size_t size); + #endif -- 2.9.0