tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hardening-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening update from Kees Cook:
- Fix kheaders array declaration to avoid tripping FORTIFY_SOURCE
* tag 'hardening-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
kheaders: Use array declaration instead of char
+5
-5
+5
-5
kernel/kheaders.c
+5
-5
kernel/kheaders.c
···
26
26
" .popsection \n"
27
27
);
28
28
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[];
31
31
32
32
static ssize_t
33
33
ikheaders_read(struct file *file, struct kobject *kobj,
34
34
struct bin_attribute *bin_attr,
35
35
char *buf, loff_t off, size_t len)
36
36
{
37
-
memcpy(buf, &kernel_headers_data + off, len);
37
+
memcpy(buf, &kernel_headers_data[off], len);
38
38
return len;
39
39
}
40
40
···
48
48
49
49
static int __init ikheaders_init(void)
50
50
{
51
-
kheaders_attr.size = (&kernel_headers_data_end -
52
-
&kernel_headers_data);
51
+
kheaders_attr.size = (kernel_headers_data_end -
52
+
kernel_headers_data);
53
53
return sysfs_create_bin_file(kernel_kobj, &kheaders_attr);
54
54
}
55
55