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

This reverts commit 01cd7d153d.
This commit is contained in:
Ksawlii 2024-11-18 11:06:01 +01:00
parent 0a74aadb81
commit 115068e08d
2 changed files with 6 additions and 4 deletions

View file

@ -456,10 +456,10 @@ static inline void kasan_free_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 #ifdef CONFIG_KASAN_INLINE
void kasan_non_canonical_hook(unsigned long addr); void kasan_non_canonical_hook(unsigned long addr);
#else /* CONFIG_KASAN */ #else /* CONFIG_KASAN_INLINE */
static inline void kasan_non_canonical_hook(unsigned long addr) { } static inline void kasan_non_canonical_hook(unsigned long addr) { }
#endif /* CONFIG_KASAN */ #endif /* CONFIG_KASAN_INLINE */
#endif /* LINUX_KASAN_H */ #endif /* LINUX_KASAN_H */

View file

@ -434,8 +434,9 @@ bool kasan_report(unsigned long addr, size_t size, bool is_write,
return ret; return ret;
} }
#ifdef CONFIG_KASAN_INLINE
/* /*
* With CONFIG_KASAN, accesses to bogus pointers (outside the high * With CONFIG_KASAN_INLINE, 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
@ -471,3 +472,4 @@ 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