android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reapply "kasan: print the original fault addr when access invalid shadow"

Browse Source 
This reverts commit a2eefda9e3.

This issue is fixed properly in 6.1.70 so no longer needed here as it
will cause merge issues.

Change-Id: Ie80acf8e96dbcedd4a5d61701db8cbd3871258e2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-01-05 08:44:52 +00:00
parent 1ac76d45aa
commit 0b58f24c02
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/kasan.h
View File

@ -475,10 +475,10 @@ static inline void kasan_free_module_shadow(const struct vm_struct *vm) {}
#endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */ #endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
#ifdef CONFIG_KASAN_INLINE #ifdef CONFIG_KASAN
void kasan_non_canonical_hook(unsigned long addr); void kasan_non_canonical_hook(unsigned long addr);
#else /* CONFIG_KASAN_INLINE */ #else /* CONFIG_KASAN */
static inline void kasan_non_canonical_hook(unsigned long addr) { } static inline void kasan_non_canonical_hook(unsigned long addr) { }
#endif /* CONFIG_KASAN_INLINE */ #endif /* CONFIG_KASAN */
#endif /* LINUX_KASAN_H */ #endif /* LINUX_KASAN_H */

4
mm/kasan/report.c
View File

@ -560,9 +560,8 @@ void kasan_report_async(void)
} }
#endif /* CONFIG_KASAN_HW_TAGS */ #endif /* CONFIG_KASAN_HW_TAGS */
#ifdef CONFIG_KASAN_INLINE
/* /*
* With CONFIG_KASAN_INLINE, accesses to bogus pointers (outside the high * With CONFIG_KASAN, accesses to bogus pointers (outside the high
* canonical half of the address space) cause out-of-bounds shadow memory reads * canonical half of the address space) cause out-of-bounds shadow memory reads
* before the actual access. For addresses in the low canonical half of the * before the actual access. For addresses in the low canonical half of the
* address space, as well as most non-canonical addresses, that out-of-bounds * address space, as well as most non-canonical addresses, that out-of-bounds
@ -598,4 +597,3 @@ void kasan_non_canonical_hook(unsigned long addr)
pr_alert("KASAN: %s in range [0x%016lx-0x%016lx]\n", bug_type, pr_alert("KASAN: %s in range [0x%016lx-0x%016lx]\n", bug_type,
orig_addr, orig_addr + KASAN_GRANULE_SIZE - 1); orig_addr, orig_addr + KASAN_GRANULE_SIZE - 1);
} }
#endif