kmsan: fix sparse warnings
Subsystems (2)
cover kmsan: fix sparse warnings
Hi,
Kernel test robot reported several sparse warnings in the KMSAN code base [1]. They belong to two broad classes; fix each in a separate commit.
Best regards,
Ilya
[1] https://lore.kernel.org/linux-mm/[email protected]/
Ilya Leoshkevich (2):
kmsan: add missing __user tags
kmsan: do not pass NULL pointers as 0
mm/kmsan/core.c | 4 ++-- mm/kmsan/hooks.c | 15 ++++++++------- mm/kmsan/instrumentation.c | 4 ++-- mm/kmsan/kmsan.h | 6 +++--- mm/kmsan/report.c | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/2 kmsan: add missing __user tags
sparse complains that __user pointers are being passed to functions that expect non-__user ones. In all cases, these functions are in fact working with user pointers, only the tag is missing. Add it.
--- mm/kmsan/core.c | 4 ++-- mm/kmsan/kmsan.h | 6 +++--- mm/kmsan/report.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
mm/kmsan/core.c +2 -2
@@ -249,8 +249,8 @@ struct page *kmsan_vmalloc_to_page_or_null(void *vaddr)return NULL ; } -void kmsan_internal_check_memory (void *addr,size_t size,const void *user_addr, -int reason) +void kmsan_internal_check_memory (void *addr,size_t size, +const void __user *user_addr,int reason) {depot_stack_handle_t cur_origin =0 , new_origin =0 ;unsigned long addr64 = (unsigned long )addr;
mm/kmsan/kmsan.h +3 -3
@@ -73,7 +73,7 @@ void kmsan_print_origin(depot_stack_handle_t origin);* @off_last corresponding to different @origin values. */ void kmsan_report (depot_stack_handle_t origin,void *address,int size, -int off_first,int off_last,const void *user_addr, +int off_first,int off_last,const void __user *user_addr,enum kmsan_bug_reason reason); DECLARE_PER_CPU(struct kmsan_ctx, kmsan_percpu_ctx);
@@ -163,8 +163,8 @@ depot_stack_handle_t kmsan_internal_chain_origin(depot_stack_handle_t id);void kmsan_internal_task_create (struct task_struct *task);bool kmsan_metadata_is_contiguous (void *addr,size_t size); -void kmsan_internal_check_memory (void *addr,size_t size,const void *user_addr, -int reason); +void kmsan_internal_check_memory (void *addr,size_t size, +const void __user *user_addr,int reason);struct page *kmsan_vmalloc_to_page_or_null (void *vaddr); void kmsan_setup_meta(struct page *page, struct page *shadow,
mm/kmsan/report.c +1 -1
@@ -148,7 +148,7 @@ void kmsan_print_origin(depot_stack_handle_t origin) }void kmsan_report (depot_stack_handle_t origin,void *address,int size, -int off_first,int off_last,const void *user_addr, +int off_first,int off_last,const void __user *user_addr,enum kmsan_bug_reason reason) {unsigned long stack_entries[KMSAN_STACK_DEPTH ];
Signature · 1 line
2.45.2
Re: [PATCH 1/2] kmsan: add missing __user tags
Quoted 4 lines · Ilya Leoshkevich
sparse complains that
__userpointers are being passed to functions that expect non-__user ones. In all cases, these functions are in fact working with user pointers, only the tag is missing. Add it.
Thanks!
Quoted 4 lines
PATCH 2/2 kmsan: do not pass NULL pointers as 0
In reply to Ilya Leoshkevichsparse complains about passing NULL pointers as 0. Fix all instances.
--- mm/kmsan/hooks.c | 15 ++++++++------- mm/kmsan/instrumentation.c | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-)
mm/kmsan/hooks.c +8 -7
@@ -303,7 +303,8 @@ void kmsan_handle_urb(const struct urb *urb, bool is_out)if (is_out)kmsan_internal_check_memory (urb->transfer_buffer, urb->transfer_buffer_length, -/*user_addr*/ 0 ,REASON_SUBMIT_URB ); +/*user_addr*/ NULL , +REASON_SUBMIT_URB );else kmsan_internal_unpoison_memory(urb->transfer_buffer, urb->transfer_buffer_length,
@@ -316,14 +317,14 @@ static void kmsan_handle_dma_page(const void *addr, size_t size, {switch (dir) {case DMA_BIDIRECTIONAL : -kmsan_internal_check_memory ((void *)addr, size,/*user_addr*/ 0 , -REASON_ANY ); +kmsan_internal_check_memory ((void *)addr, size, +/*user_addr*/ NULL ,REASON_ANY );kmsan_internal_unpoison_memory ((void *)addr, size,/*checked*/ false);break ;case DMA_TO_DEVICE : -kmsan_internal_check_memory ((void *)addr, size,/*user_addr*/ 0 , -REASON_ANY ); +kmsan_internal_check_memory ((void *)addr, size, +/*user_addr*/ NULL ,REASON_ANY );break ;case DMA_FROM_DEVICE : kmsan_internal_unpoison_memory((void *)addr, size,
@@ -418,8 +419,8 @@ void kmsan_check_memory(const void *addr, size_t size) {if (!kmsan_enabled)return ; -return kmsan_internal_check_memory ((void *)addr, size,/*user_addr*/ 0 , -REASON_ANY ); +return kmsan_internal_check_memory ((void *)addr, size, +/*user_addr*/ NULL ,REASON_ANY ); }EXPORT_SYMBOL (kmsan_check_memory);
mm/kmsan/instrumentation.c +2 -2
@@ -315,8 +315,8 @@ void __msan_warning(u32 origin)if (!kmsan_enabled ||kmsan_in_runtime ())return ;kmsan_enter_runtime (); -kmsan_report (origin,/*address*/ 0 ,/*size*/ 0 , -/*off_first*/ 0 ,/*off_last*/ 0 ,/*user_addr*/ 0 , +kmsan_report (origin,/*address*/ NULL ,/*size*/ 0 , +/*off_first*/ 0 ,/*off_last*/ 0 ,/*user_addr*/ NULL ,REASON_ANY );kmsan_leave_runtime (); }
Signature · 1 line
2.45.2
Re: [PATCH 2/2] kmsan: do not pass NULL pointers as 0
Quoted 2 lines · Ilya Leoshkevich
sparse complains about passing NULL pointers as 0. Fix all instances.
Thanks a lot for fixing this!
Quoted 2 lines
Rant: I noticed recently that checkpatch.pl aggressively demands having the Closes: tag follow Reported-by:, even when it is not strictly necessary per
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#using-reported-by-tested-by-reviewed-by-suggested-by-and-fixes.
Quoted 1 line
Signed-off-by Ilya Leoshkevich <[email protected]>