kcsan: Never set up watchpoints on NULL pointers
Marco Elver
maintainerPATCH 1/1 kcsan: Never set up watchpoints on NULL pointers
Avoid setting up watchpoints on NULL pointers, as otherwise we would crash inside the KCSAN runtime (when checking for value changes) instead of the instrumented code.
Because that may be confusing, skip any address less than PAGE_SIZE.
Signed-off-by Marco Elver <[email protected]>
--- kernel/kcsan/encoding.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/kcsan/encoding.h +5 -1
@@ -48,7 +48,11 @@static inline bool check_encodable (unsigned long addr,size_t size) { -return size <=MAX_ENCODABLE_SIZE ; +/* +* While we can encode addrs<PAGE_SIZE, avoid crashing with a NULL +* pointer deref inside KCSAN. +*/ +return addr >=PAGE_SIZE && size <=MAX_ENCODABLE_SIZE ; } static inline long
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
Marco Elver
maintainerQuoted 9 lines · Marco Elver
Avoid setting up watchpoints on NULL pointers, as otherwise we would crash inside the KCSAN runtime (when checking for value changes) instead of the instrumented code.
Because that may be confusing, skip any address less than
PAGE_SIZE.Signed-off-by Marco Elver <[email protected]>---
Please use the series at:
https://lkml.kernel.org/r/[email protected]
which includes a prerequisite patch that was missing.
Thanks,
-- Marco