From: Kees Cook <keescook@chromium.org>
To: Kristen Carlson Accardi <kristen@linux.intel.com>
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
arjan@linux.intel.com, x86@kernel.org,
linux-kernel@vger.kernel.org,
kernel-hardening@lists.openwall.com, rick.p.edgecombe@intel.com,
Tony Luck <tony.luck@intel.com>
Subject: Re: [PATCH v4 09/10] kallsyms: Hide layout
Date: Sun, 19 Jul 2020 18:25:31 -0700 [thread overview]
Message-ID: <202007191815.D39859C@keescook> (raw)
In-Reply-To: <20200717170008.5949-10-kristen@linux.intel.com>
On Fri, Jul 17, 2020 at 10:00:06AM -0700, Kristen Carlson Accardi wrote:
> This patch makes /proc/kallsyms display in a random order, rather
> than sorted by address in order to hide the newly randomized address
> layout.
Ah! Much nicer. Is there any reason not to just do this unconditionally,
regardless of FGKASLR? It's a smallish dynamic allocation, and
displaying kallsyms is hardly fast-path...
>
> Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
> Reviewed-by: Tony Luck <tony.luck@intel.com>
> Tested-by: Tony Luck <tony.luck@intel.com>
> ---
> kernel/kallsyms.c | 163 +++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 162 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
> index bb14e64f62a4..45d147f7f10e 100644
> --- a/kernel/kallsyms.c
> +++ b/kernel/kallsyms.c
> @@ -446,6 +446,12 @@ struct kallsym_iter {
> int show_value;
> };
>
> +struct kallsyms_shuffled_iter {
> + struct kallsym_iter iter;
> + loff_t total_syms;
> + loff_t shuffled_index[];
> +};
> +
> int __weak arch_get_kallsym(unsigned int symnum, unsigned long *value,
> char *type, char *name)
> {
> @@ -661,7 +667,7 @@ bool kallsyms_show_value(const struct cred *cred)
> }
> }
>
> -static int kallsyms_open(struct inode *inode, struct file *file)
> +static int __kallsyms_open(struct inode *inode, struct file *file)
> {
> /*
> * We keep iterator in m->private, since normal case is to
> @@ -682,6 +688,161 @@ static int kallsyms_open(struct inode *inode, struct file *file)
> return 0;
> }
>
> +/*
> + * When function granular kaslr is enabled, we need to print out the symbols
> + * at random so we don't reveal the new layout.
> + */
> +#if defined(CONFIG_FG_KASLR)
> +static int update_random_pos(struct kallsyms_shuffled_iter *s_iter,
> + loff_t pos, loff_t *new_pos)
> +{
> + loff_t new;
> +
> + if (pos >= s_iter->total_syms)
> + return 0;
> +
> + new = s_iter->shuffled_index[pos];
> +
> + /*
> + * normally this would be done as part of update_iter, however,
> + * we want to avoid triggering this in the event that new is
> + * zero since we don't want to blow away our pos end indicators.
> + */
> + if (new == 0) {
> + s_iter->iter.name[0] = '\0';
> + s_iter->iter.nameoff = get_symbol_offset(new);
> + s_iter->iter.pos = new;
> + }
> +
> + *new_pos = new;
> + return 1;
> +}
> +
> +static void *shuffled_start(struct seq_file *m, loff_t *pos)
> +{
> + struct kallsyms_shuffled_iter *s_iter = m->private;
> + loff_t new_pos;
> +
> + if (!update_random_pos(s_iter, *pos, &new_pos))
> + return NULL;
> +
> + return s_start(m, &new_pos);
> +}
> +
> +static void *shuffled_next(struct seq_file *m, void *p, loff_t *pos)
> +{
> + struct kallsyms_shuffled_iter *s_iter = m->private;
> + loff_t new_pos;
> +
> + (*pos)++;
> +
> + if (!update_random_pos(s_iter, *pos, &new_pos))
> + return NULL;
> +
> + if (!update_iter(m->private, new_pos))
> + return NULL;
> +
> + return p;
> +}
> +
> +/*
> + * shuffle_index_list()
> + * Use a Fisher Yates algorithm to shuffle a list of text sections.
> + */
> +static void shuffle_index_list(loff_t *indexes, loff_t size)
> +{
> + int i;
> + unsigned int j;
> + loff_t temp;
> +
> + for (i = size - 1; i > 0; i--) {
> + /* pick a random index from 0 to i */
> + get_random_bytes(&j, sizeof(j));
> + j = j % (i + 1);
> +
> + temp = indexes[i];
> + indexes[i] = indexes[j];
> + indexes[j] = temp;
> + }
> +}
> +
> +static const struct seq_operations kallsyms_shuffled_op = {
> + .start = shuffled_start,
> + .next = shuffled_next,
> + .stop = s_stop,
> + .show = s_show
> +};
> +
> +static int kallsyms_random_open(struct inode *inode, struct file *file)
> +{
> + loff_t pos;
> + struct kallsyms_shuffled_iter *shuffled_iter;
> + struct kallsym_iter iter;
> + bool show_value;
> +
> + /*
> + * If privileged, go ahead and use the normal algorithm for
> + * displaying symbols
> + */
> + show_value = kallsyms_show_value(file->f_cred);
> + if (show_value)
> + return __kallsyms_open(inode, file);
> +
> + /*
> + * we need to figure out how many extra symbols there are
> + * to print out past kallsyms_num_syms
> + */
> + pos = kallsyms_num_syms;
> + reset_iter(&iter, 0);
> + do {
> + if (!update_iter(&iter, pos))
> + break;
> + pos++;
> + } while (1);
Can this be tracked separately instead of needing to search for it every
time? (Looks like it's modules and ftrace? Could they each have a
*_num_sysms?)
(I need to go read how kallsyms doesn't miscount in general when the
symbol table changes out from under it...)
--
Kees Cook
next prev parent reply other threads:[~2020-07-20 1:25 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 16:59 [PATCH v4 00/10] Function Granular KASLR Kristen Carlson Accardi
2020-07-17 16:59 ` [PATCH v4 01/10] objtool: Do not assume order of parent/child functions Kristen Carlson Accardi
2020-07-17 16:59 ` [PATCH v4 02/10] x86: tools/relocs: Support >64K section headers Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 03/10] x86/boot: Allow a "silent" kaslr random byte fetch Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 04/10] x86: Makefile: Add build and config option for CONFIG_FG_KASLR Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 05/10] x86: Make sure _etext includes function sections Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 06/10] x86/tools: Add relative relocs for randomized functions Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 07/10] x86/boot/compressed: Avoid duplicate malloc() implementations Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 08/10] x86: Add support for function granular KASLR Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 09/10] kallsyms: Hide layout Kristen Carlson Accardi
2020-07-20 1:25 ` Kees Cook [this message]
2020-07-20 16:59 ` Kristen Carlson Accardi
2020-07-17 17:00 ` [PATCH v4 10/10] module: Reorder functions Kristen Carlson Accardi
2020-07-28 17:29 ` Jessica Yu
2020-07-22 9:27 ` [PATCH v4 00/10] Function Granular KASLR Miroslav Benes
2020-07-22 14:39 ` Kees Cook
2020-07-22 14:51 ` Joe Lawrence
2020-07-22 14:56 ` Joe Lawrence
2020-07-22 18:24 ` Kristen Carlson Accardi
2020-07-22 16:07 ` Josh Poimboeuf
2020-07-22 19:42 ` Kees Cook
2020-07-22 19:56 ` Kristen Carlson Accardi
2020-07-22 21:33 ` Josh Poimboeuf
2020-08-21 23:02 ` Kristen Carlson Accardi
2020-08-25 16:16 ` Joe Lawrence
2020-08-28 10:21 ` Miroslav Benes
2020-08-28 19:24 ` Josh Poimboeuf
2021-01-23 22:59 ` Fangrui Song
2021-01-25 17:21 ` Josh Poimboeuf
2020-08-03 11:39 ` Evgenii Shatokhin
2020-08-03 17:45 ` Kees Cook
2020-08-03 18:17 ` Joe Lawrence
2020-08-03 19:38 ` Frank Ch. Eigler
2020-08-03 20:11 ` Kees Cook
2020-08-03 21:12 ` Frank Ch. Eigler
2020-08-03 21:41 ` Kees Cook
2020-08-04 0:48 ` Frank Ch. Eigler
2020-08-04 17:04 ` Jessica Yu
2020-08-04 18:23 ` Joe Lawrence
2020-08-07 16:38 ` Kristen Carlson Accardi
2020-08-07 17:20 ` Kees Cook
2020-08-10 16:10 ` Kristen Carlson Accardi
2020-08-12 17:18 ` Kristen Carlson Accardi
2020-08-06 15:32 ` Ingo Molnar
2020-08-06 19:24 ` Kristen Carlson Accardi
2020-08-06 19:27 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202007191815.D39859C@keescook \
--to=keescook@chromium.org \
--cc=arjan@linux.intel.com \
--cc=bp@alien8.de \
--cc=kernel-hardening@lists.openwall.com \
--cc=kristen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).