Commit 1ba58f1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0c9f4ac8 e406737b

kernel/seccomp.c

+2 −2
Original line number Diff line number Diff line
@@ -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)];