pa-fazil
/
dragonheart_kernel_oneplus_sm8150
mirror of https://github.com/fazilsheik96/dragonheart_kernel_oneplus_sm8150.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib/vsprintf: Less restrictive hashed pointer printing 

Commit ad67b74d2469 ("printk: hash addresses printed with %p") and
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()'
when not restricting") effectively removed the ability to display
kernel addresses in the kernel log. While this may be a useful feature
in production builds, it is undesirable when trying to debug.

%px is not a possible alternative, because it is unable to differentiate
between a debug and production build.

Change-Id: I139fae7b8488936d214efdd2b5b807fa1c005467
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
[vinmenon@codeaurora.org: fixed the Kconfig conflicts]
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
This commit is contained in:
Patrick Daly 2019-06-07 17:00:54 -07:00 committed by Vinayak Menon
parent 0e58b73952
commit e63732dbfe
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Kconfig.debug
View File

@ -144,6 +144,14 @@ config DEBUG_MODULE_LOAD_INFO
If unsure, say N.
config DEBUG_CONSOLE_UNHASHED_POINTERS
bool "Display unhashed kernel pointers"
depends on DEBUG_KERNEL
help
Pointers %p and %pK are normally hashed prior to being displayed to
prevent leaking kernel addresses. On debug builds, always print
actual pointer values, ignoring the kptr_restrict setting.
Not to be enabled on production builds.
endmenu # "printk and dmesg options"

6
lib/vsprintf.c
View File

@ -1928,7 +1928,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return buf;
}
case 'K':
if (!kptr_restrict)
if (!kptr_restrict ||
IS_ENABLED(CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS))
break;
return restricted_pointer(buf, end, ptr, spec);
case 'N':
@ -1959,6 +1960,9 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return pointer_string(buf, end, ptr, spec);
}
if (IS_ENABLED(CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS))
return pointer_string(buf, end, ptr, spec);
/* default is to _not_ leak addresses, hash before printing */
return ptr_to_id(buf, end, ptr, spec);
}