diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 23:56:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 23:56:36 +0300 |
| commit | 1ba58f1ae9b2c07e2b736d187eb25ac8910a7613 (patch) | |
| tree | 110bc1c03099de457dd7b996fcce968374feda0a /kernel | |
| parent | 0c9f4ac808b017a0013cee92a30de980550145d5 (diff) | |
| parent | e406737b11103752838cf50fd197ec8e9352bbf7 (diff) | |
| download | linux-1ba58f1ae9b2c07e2b736d187eb25ac8910a7613.tar.xz | |
Merge tag 'seccomp-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp update from Kees Cook:
- Prepare for sysctl table constification
* tag 'seccomp-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
seccomp: Constify sysctl subhelpers
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/seccomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index aca7b437882e..f70e031e06a8 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -2334,7 +2334,7 @@ static bool seccomp_actions_logged_from_names(u32 *actions_logged, char *names) return true; } -static int read_actions_logged(struct ctl_table *ro_table, void *buffer, +static int read_actions_logged(const struct ctl_table *ro_table, void *buffer, size_t *lenp, loff_t *ppos) { char names[sizeof(seccomp_actions_avail)]; @@ -2352,7 +2352,7 @@ static int read_actions_logged(struct ctl_table *ro_table, void *buffer, return proc_dostring(&table, 0, buffer, lenp, ppos); } -static int write_actions_logged(struct ctl_table *ro_table, void *buffer, +static int write_actions_logged(const struct ctl_table *ro_table, void *buffer, size_t *lenp, loff_t *ppos, u32 *actions_logged) { char names[sizeof(seccomp_actions_avail)]; |