From: Jisheng Zhang <jszhang3@mail.ustc.edu.cn> To: "Paul Walmsley" <paul.walmsley@sifive.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Albert Ou" <aou@eecs.berkeley.edu>, "Andrey Ryabinin" <ryabinin.a.a@gmail.com>, "Alexander Potapenko" <glider@google.com>, "Andrey Konovalov" <andreyknvl@gmail.com>, "Dmitry Vyukov" <dvyukov@google.com>, " Björn Töpel" <bjorn@kernel.org>, "Alexei Starovoitov" <ast@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Andrii Nakryiko" <andrii@kernel.org>, "Martin KaFai Lau" <kafai@fb.com>, "Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>, "John Fastabend" <john.fastabend@gmail.com>, "KP Singh" <kpsingh@kernel.org>, "Luke Nelson" <luke.r.nels@gmail.com>, "Xi Wang" <xi.wang@gmail.com> Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 3/9] riscv: Constify sys_call_table Date: Tue, 30 Mar 2021 02:23:24 +0800 [thread overview] Message-ID: <20210330022324.6737116c@xhacker> (raw) In-Reply-To: <20210330022144.150edc6e@xhacker> From: Jisheng Zhang <jszhang@kernel.org> Constify the sys_call_table so that it will be placed in the .rodata section. This will cause attempts to modify the table to fail when strict page permissions are in place. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- arch/riscv/include/asm/syscall.h | 2 +- arch/riscv/kernel/syscall_table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.h index 49350c8bd7b0..b933b1583c9f 100644 --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -15,7 +15,7 @@ #include <linux/err.h> /* The array of function pointers for syscalls. */ -extern void *sys_call_table[]; +extern void * const sys_call_table[]; /* * Only the low 32 bits of orig_r0 are meaningful, so we return int. diff --git a/arch/riscv/kernel/syscall_table.c b/arch/riscv/kernel/syscall_table.c index f1ead9df96ca..a63c667c27b3 100644 --- a/arch/riscv/kernel/syscall_table.c +++ b/arch/riscv/kernel/syscall_table.c @@ -13,7 +13,7 @@ #undef __SYSCALL #define __SYSCALL(nr, call) [nr] = (call), -void *sys_call_table[__NR_syscalls] = { +void * const sys_call_table[__NR_syscalls] = { [0 ... __NR_syscalls - 1] = sys_ni_syscall, #include <asm/unistd.h> }; -- 2.31.0
WARNING: multiple messages have this Message-ID (diff)
From: Jisheng Zhang <jszhang3@mail.ustc.edu.cn> To: "Paul Walmsley" <paul.walmsley@sifive.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Albert Ou" <aou@eecs.berkeley.edu>, "Andrey Ryabinin" <ryabinin.a.a@gmail.com>, "Alexander Potapenko" <glider@google.com>, "Andrey Konovalov" <andreyknvl@gmail.com>, "Dmitry Vyukov" <dvyukov@google.com>, " Björn Töpel" <bjorn@kernel.org>, "Alexei Starovoitov" <ast@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Andrii Nakryiko" <andrii@kernel.org>, "Martin KaFai Lau" <kafai@fb.com>, "Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>, "John Fastabend" <john.fastabend@gmail.com>, "KP Singh" <kpsingh@kernel.org>, "Luke Nelson" <luke.r.nels@gmail.com>, "Xi Wang" <xi.wang@gmail.com> Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 3/9] riscv: Constify sys_call_table Date: Tue, 30 Mar 2021 02:23:24 +0800 [thread overview] Message-ID: <20210330022324.6737116c@xhacker> (raw) In-Reply-To: <20210330022144.150edc6e@xhacker> From: Jisheng Zhang <jszhang@kernel.org> Constify the sys_call_table so that it will be placed in the .rodata section. This will cause attempts to modify the table to fail when strict page permissions are in place. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- arch/riscv/include/asm/syscall.h | 2 +- arch/riscv/kernel/syscall_table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.h index 49350c8bd7b0..b933b1583c9f 100644 --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -15,7 +15,7 @@ #include <linux/err.h> /* The array of function pointers for syscalls. */ -extern void *sys_call_table[]; +extern void * const sys_call_table[]; /* * Only the low 32 bits of orig_r0 are meaningful, so we return int. diff --git a/arch/riscv/kernel/syscall_table.c b/arch/riscv/kernel/syscall_table.c index f1ead9df96ca..a63c667c27b3 100644 --- a/arch/riscv/kernel/syscall_table.c +++ b/arch/riscv/kernel/syscall_table.c @@ -13,7 +13,7 @@ #undef __SYSCALL #define __SYSCALL(nr, call) [nr] = (call), -void *sys_call_table[__NR_syscalls] = { +void * const sys_call_table[__NR_syscalls] = { [0 ... __NR_syscalls - 1] = sys_ni_syscall, #include <asm/unistd.h> }; -- 2.31.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2021-03-29 18:29 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-29 18:21 [PATCH 0/9] riscv: improve self-protection Jisheng Zhang 2021-03-29 18:21 ` Jisheng Zhang 2021-03-29 18:22 ` [PATCH 1/9] riscv: add __init section marker to some functions Jisheng Zhang 2021-03-29 18:22 ` Jisheng Zhang 2021-03-29 18:22 ` [PATCH 2/9] riscv: Mark some global variables __ro_after_init Jisheng Zhang 2021-03-29 18:22 ` Jisheng Zhang 2021-03-29 18:23 ` Jisheng Zhang [this message] 2021-03-29 18:23 ` [PATCH 3/9] riscv: Constify sys_call_table Jisheng Zhang 2021-03-29 18:23 ` [PATCH 4/9] riscv: Constify sbi_ipi_ops Jisheng Zhang 2021-03-29 18:23 ` Jisheng Zhang 2021-03-29 18:24 ` [PATCH 5/9] riscv: kprobes: Implement alloc_insn_page() Jisheng Zhang 2021-03-29 18:24 ` Jisheng Zhang 2021-03-29 18:24 ` [PATCH 6/9] riscv: bpf: Move bpf_jit_alloc_exec() and bpf_jit_free_exec() to core Jisheng Zhang 2021-03-29 18:24 ` Jisheng Zhang 2021-03-29 20:41 ` Luke Nelson 2021-03-29 20:41 ` Luke Nelson 2021-03-29 18:25 ` [PATCH 7/9] riscv: bpf: Avoid breaking W^X Jisheng Zhang 2021-03-29 18:25 ` Jisheng Zhang 2021-03-30 16:39 ` kernel test robot 2021-06-11 14:10 ` Andreas Schwab 2021-06-11 14:10 ` Andreas Schwab 2021-06-11 16:23 ` Jisheng Zhang 2021-06-11 16:23 ` Jisheng Zhang 2021-06-11 16:41 ` Andreas Schwab 2021-06-11 16:41 ` Andreas Schwab 2021-06-13 17:05 ` Jisheng Zhang 2021-06-13 17:05 ` Jisheng Zhang 2021-06-13 19:50 ` Andreas Schwab 2021-06-13 19:50 ` Andreas Schwab 2021-06-14 16:49 ` [PATCH] riscv: Ensure BPF_JIT_REGION_START aligned with PMD size Jisheng Zhang 2021-06-14 16:49 ` Jisheng Zhang 2021-06-15 12:29 ` Daniel Borkmann 2021-06-15 12:29 ` Daniel Borkmann 2021-06-15 18:54 ` Alex Ghiti 2021-06-15 18:54 ` Alex Ghiti 2021-06-16 0:03 ` Jisheng Zhang 2021-06-16 0:03 ` Jisheng Zhang 2021-06-17 7:23 ` Alex Ghiti 2021-06-17 7:23 ` Alex Ghiti 2021-06-17 17:17 ` Jisheng Zhang 2021-06-17 17:17 ` Jisheng Zhang 2021-06-17 7:30 ` Palmer Dabbelt 2021-06-17 7:30 ` Palmer Dabbelt 2021-06-17 8:09 ` Alex Ghiti 2021-06-17 8:09 ` Alex Ghiti 2021-06-17 14:18 ` Alex Ghiti 2021-06-17 14:18 ` Alex Ghiti 2021-06-17 17:27 ` Jisheng Zhang 2021-06-17 17:27 ` Jisheng Zhang 2021-06-17 17:46 ` Jisheng Zhang 2021-06-17 17:46 ` Jisheng Zhang 2021-06-17 18:10 ` Jisheng Zhang 2021-06-17 18:10 ` Jisheng Zhang 2021-06-17 18:15 ` [PATCH v2] " Jisheng Zhang 2021-06-17 18:15 ` Jisheng Zhang 2021-06-18 6:48 ` Alex Ghiti 2021-06-18 6:48 ` Alex Ghiti 2021-03-29 18:25 ` [PATCH 8/9] riscv: module: Create module allocations without exec permissions Jisheng Zhang 2021-03-29 18:25 ` Jisheng Zhang 2021-03-29 18:26 ` [PATCH 9/9] riscv: Set ARCH_HAS_STRICT_MODULE_RWX if MMU Jisheng Zhang 2021-03-29 18:26 ` Jisheng Zhang 2021-04-23 1:48 ` [PATCH 0/9] riscv: improve self-protection Palmer Dabbelt 2021-04-23 1:48 ` Palmer Dabbelt
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=20210330022324.6737116c@xhacker \ --to=jszhang3@mail.ustc.edu.cn \ --cc=andreyknvl@gmail.com \ --cc=andrii@kernel.org \ --cc=aou@eecs.berkeley.edu \ --cc=ast@kernel.org \ --cc=bjorn@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=daniel@iogearbox.net \ --cc=dvyukov@google.com \ --cc=glider@google.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kasan-dev@googlegroups.com \ --cc=kpsingh@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=luke.r.nels@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=ryabinin.a.a@gmail.com \ --cc=songliubraving@fb.com \ --cc=xi.wang@gmail.com \ --cc=yhs@fb.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.