Skip to content

Commit b69edab

Browse files
committed
kheaders: Use array declaration instead of char
Under CONFIG_FORTIFY_SOURCE, memcpy() will check the size of destination and source buffers. Defining kernel_headers_data as "char" would trip this check. Since these addresses are treated as byte arrays, define them as arrays (as done everywhere else). This was seen with: $ cat /sys/kernel/kheaders.tar.xz >> /dev/null detected buffer overflow in memcpy kernel BUG at lib/string_helpers.c:1027! ... RIP: 0010:fortify_panic+0xf/0x20 [...] Call Trace: <TASK> ikheaders_read+0x45/0x50 [kheaders] kernfs_fop_read_iter+0x1a4/0x2f0 ... Reported-by: Jakub Kicinski <kuba@kernel.org> Link: https://lore.kernel.org/bpf/20230302112130.6e402a98@kernel.org/ Acked-by: Joel Fernandes (Google) <joel@joelfernandes.org> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> Tested-by: Jakub Kicinski <kuba@kernel.org> Fixes: 43d8ce9 ("Provide in-kernel headers to make extending kernel easier") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20230302224946.never.243-kees@kernel.org
1 parent eeac8ed commit b69edab

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

kernel/kheaders.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ asm (
2626
" .popsection \n"
2727
);
2828

29-
extern char kernel_headers_data;
30-
extern char kernel_headers_data_end;
29+
extern char kernel_headers_data[];
30+
extern char kernel_headers_data_end[];
3131

3232
static ssize_t
3333
ikheaders_read(struct file *file, struct kobject *kobj,
3434
struct bin_attribute *bin_attr,
3535
char *buf, loff_t off, size_t len)
3636
{
37-
memcpy(buf, &kernel_headers_data + off, len);
37+
memcpy(buf, &kernel_headers_data[off], len);
3838
return len;
3939
}
4040

@@ -48,8 +48,8 @@ static struct bin_attribute kheaders_attr __ro_after_init = {
4848

4949
static int __init ikheaders_init(void)
5050
{
51-
kheaders_attr.size = (&kernel_headers_data_end -
52-
&kernel_headers_data);
51+
kheaders_attr.size = (kernel_headers_data_end -
52+
kernel_headers_data);
5353
return sysfs_create_bin_file(kernel_kobj, &kheaders_attr);
5454
}
5555

0 commit comments

Comments
 (0)