| Message ID | 20200923173905.11219-11-kristen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Function Granular KASLR | expand |
Hi, On Wed, 23 Sep 2020, Kristen Carlson Accardi wrote: > If any type of function granular randomization is enabled, the sympos > algorithm will fail, as it will be impossible to resolve symbols when > there are duplicates using the previous symbol position. > > Override the value of sympos to always be zero if fgkaslr is enabled for > either the core kernel or modules, forcing the algorithm > to require that only unique symbols are allowed to be patched. > > Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com> > --- > kernel/livepatch/core.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c > index f76fdb925532..da08e40f2da2 100644 > --- a/kernel/livepatch/core.c > +++ b/kernel/livepatch/core.c > @@ -170,6 +170,17 @@ static int klp_find_object_symbol(const char *objname, const char *name, > kallsyms_on_each_symbol(klp_find_callback, &args); > mutex_unlock(&module_mutex); > > + /* > + * If any type of function granular randomization is enabled, it > + * will be impossible to resolve symbols when there are duplicates > + * using the previous symbol position (i.e. sympos != 0). Override > + * the value of sympos to always be zero in this case. This will > + * force the algorithm to require that only unique symbols are > + * allowed to be patched. > + */ > + if (IS_ENABLED(CONFIG_FG_KASLR) || IS_ENABLED(CONFIG_MODULE_FG_KASLR)) > + sympos = 0; This should work, but I wonder if we should make it more explicit. With the change the user will get the error with "unresolvable ambiguity for symbol..." if they specify sympos and the symbol is not unique. It could confuse them. So, how about it making it something like if (IS_ENABLED(CONFIG_FG_KASLR) || IS_ENABLED(CONFIG_MODULE_FG_KASLR)) if (sympos) { pr_err("fgkaslr is enabled, specifying sympos for symbol '%s' in object '%s' does not work.\n", name, objname); *addr = 0; return -EINVAL; } ? (there could be goto to the error out at the end of the function). In that case, if sympos is not specified, the user will get the message which matches the reality. If the user specifies it, they will get the error in case of fgkaslr. Thanks for dealing with it Miroslav
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index f76fdb925532..da08e40f2da2 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -170,6 +170,17 @@ static int klp_find_object_symbol(const char *objname, const char *name, kallsyms_on_each_symbol(klp_find_callback, &args); mutex_unlock(&module_mutex); + /* + * If any type of function granular randomization is enabled, it + * will be impossible to resolve symbols when there are duplicates + * using the previous symbol position (i.e. sympos != 0). Override + * the value of sympos to always be zero in this case. This will + * force the algorithm to require that only unique symbols are + * allowed to be patched. + */ + if (IS_ENABLED(CONFIG_FG_KASLR) || IS_ENABLED(CONFIG_MODULE_FG_KASLR)) + sympos = 0; + /* * Ensure an address was found. If sympos is 0, ensure symbol is unique; * otherwise ensure the symbol position count matches sympos.
If any type of function granular randomization is enabled, the sympos algorithm will fail, as it will be impossible to resolve symbols when there are duplicates using the previous symbol position. Override the value of sympos to always be zero if fgkaslr is enabled for either the core kernel or modules, forcing the algorithm to require that only unique symbols are allowed to be patched. Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com> --- kernel/livepatch/core.c | 11 +++++++++++ 1 file changed, 11 insertions(+)