mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
78eb4ea25c
const qualify the struct ctl_table argument in the proc_handler function
signatures. This is a prerequisite to moving the static ctl_table
structs into .rodata data which will ensure that proc_handler function
pointers cannot be modified.
This patch has been generated by the following coccinelle script:
```
virtual patch
@r1@
identifier ctl, write, buffer, lenp, ppos;
identifier func !~ "appldata_(timer|interval)_handler|sched_(rt|rr)_handler|rds_tcp_skbuf_handler|proc_sctp_do_(hmac_alg|rto_min|rto_max|udp_port|alpha_beta|auth|probe_interval)";
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos);
@r2@
identifier func, ctl, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos)
{ ... }
@r3@
identifier func;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int , void *, size_t *, loff_t *);
@r4@
identifier func, ctl;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int , void *, size_t *, loff_t *);
@r5@
identifier func, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int write, void *buffer, size_t *lenp, loff_t *ppos);
```
* Code formatting was adjusted in xfs_sysctl.c to comply with code
conventions. The xfs_stats_clear_proc_handler,
xfs_panic_mask_proc_handler and xfs_deprecated_dointvec_minmax where
adjusted.
* The ctl_table argument in proc_watchdog_common was const qualified.
This is called from a proc_handler itself and is calling back into
another proc_handler, making it necessary to change it as part of the
proc_handler migration.
Co-developed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Co-developed-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Joel Granados <j.granados@samsung.com>
54 lines
1.5 KiB
C
54 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef LINUX_PID_SYSCTL_H
|
|
#define LINUX_PID_SYSCTL_H
|
|
|
|
#include <linux/pid_namespace.h>
|
|
|
|
#if defined(CONFIG_SYSCTL) && defined(CONFIG_MEMFD_CREATE)
|
|
static int pid_mfd_noexec_dointvec_minmax(const struct ctl_table *table,
|
|
int write, void *buf, size_t *lenp, loff_t *ppos)
|
|
{
|
|
struct pid_namespace *ns = task_active_pid_ns(current);
|
|
struct ctl_table table_copy;
|
|
int err, scope, parent_scope;
|
|
|
|
if (write && !ns_capable(ns->user_ns, CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
|
|
table_copy = *table;
|
|
|
|
/* You cannot set a lower enforcement value than your parent. */
|
|
parent_scope = pidns_memfd_noexec_scope(ns->parent);
|
|
/* Equivalent to pidns_memfd_noexec_scope(ns). */
|
|
scope = max(READ_ONCE(ns->memfd_noexec_scope), parent_scope);
|
|
|
|
table_copy.data = &scope;
|
|
table_copy.extra1 = &parent_scope;
|
|
|
|
err = proc_dointvec_minmax(&table_copy, write, buf, lenp, ppos);
|
|
if (!err && write)
|
|
WRITE_ONCE(ns->memfd_noexec_scope, scope);
|
|
return err;
|
|
}
|
|
|
|
static struct ctl_table pid_ns_ctl_table_vm[] = {
|
|
{
|
|
.procname = "memfd_noexec",
|
|
.data = &init_pid_ns.memfd_noexec_scope,
|
|
.maxlen = sizeof(init_pid_ns.memfd_noexec_scope),
|
|
.mode = 0644,
|
|
.proc_handler = pid_mfd_noexec_dointvec_minmax,
|
|
.extra1 = SYSCTL_ZERO,
|
|
.extra2 = SYSCTL_TWO,
|
|
},
|
|
};
|
|
static inline void register_pid_ns_sysctl_table_vm(void)
|
|
{
|
|
register_sysctl("vm", pid_ns_ctl_table_vm);
|
|
}
|
|
#else
|
|
static inline void register_pid_ns_sysctl_table_vm(void) {}
|
|
#endif
|
|
|
|
#endif /* LINUX_PID_SYSCTL_H */
|