nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

sysctl: allow registration of const struct ctl_table

Browse source 
Putting structure, especially those containing function pointers,
into read-only memory makes the safer and easier to reason about.
Change the sysctl registration APIs to allow registration of
"const struct ctl_table".

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org> # security/*
Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Thomas Weißschuh 2024-08-05 11:39:38 +02:00 committed by Joel Granados
parent 29e1095bb1
commit 7abc9b53bd
2 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
fs/proc/proc_sysctl.c
View file

@ -1359,7 +1359,7 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)
*/ */
struct ctl_table_header *__register_sysctl_table( struct ctl_table_header *__register_sysctl_table(
struct ctl_table_set *set, struct ctl_table_set *set,
const char *path, struct ctl_table *table, size_t table_size) const char *path, const struct ctl_table *table, size_t table_size)
{ {
struct ctl_table_root *root = set->dir.header.root; struct ctl_table_root *root = set->dir.header.root;
struct ctl_table_header *header; struct ctl_table_header *header;
@ -1420,7 +1420,7 @@ struct ctl_table_header *__register_sysctl_table(
* *
* See __register_sysctl_table for more details. * See __register_sysctl_table for more details.
*/ */
struct ctl_table_header *register_sysctl_sz(const char *path, struct ctl_table *table, struct ctl_table_header *register_sysctl_sz(const char *path, const struct ctl_table *table,
size_t table_size) size_t table_size)
{ {
return __register_sysctl_table(&sysctl_table_root.default_set, return __register_sysctl_table(&sysctl_table_root.default_set,
@ -1449,7 +1449,7 @@ EXPORT_SYMBOL(register_sysctl_sz);
* *
* Context: if your base directory does not exist it will be created for you. * Context: if your base directory does not exist it will be created for you.
*/ */
void __init __register_sysctl_init(const char *path, struct ctl_table *table, void __init __register_sysctl_init(const char *path, const struct ctl_table *table,
const char *table_name, size_t table_size) const char *table_name, size_t table_size)
{ {
struct ctl_table_header *hdr = register_sysctl_sz(path, table, table_size); struct ctl_table_header *hdr = register_sysctl_sz(path, table, table_size);

10
include/linux/sysctl.h
View file

@ -223,13 +223,13 @@ extern void retire_sysctl_set(struct ctl_table_set *set);
struct ctl_table_header *__register_sysctl_table( struct ctl_table_header *__register_sysctl_table(
struct ctl_table_set *set, struct ctl_table_set *set,
const char *path, struct ctl_table *table, size_t table_size); const char *path, const struct ctl_table *table, size_t table_size);
struct ctl_table_header *register_sysctl_sz(const char *path, struct ctl_table *table, struct ctl_table_header *register_sysctl_sz(const char *path, const struct ctl_table *table,
size_t table_size); size_t table_size);
void unregister_sysctl_table(struct ctl_table_header * table); void unregister_sysctl_table(struct ctl_table_header * table);
extern int sysctl_init_bases(void); extern int sysctl_init_bases(void);
extern void __register_sysctl_init(const char *path, struct ctl_table *table, extern void __register_sysctl_init(const char *path, const struct ctl_table *table,
const char *table_name, size_t table_size); const char *table_name, size_t table_size);
#define register_sysctl_init(path, table) \ #define register_sysctl_init(path, table) \
__register_sysctl_init(path, table, #table, ARRAY_SIZE(table)) __register_sysctl_init(path, table, #table, ARRAY_SIZE(table))
@ -251,7 +251,7 @@ extern int no_unaligned_warning;
#else /* CONFIG_SYSCTL */ #else /* CONFIG_SYSCTL */
static inline void register_sysctl_init(const char *path, struct ctl_table *table) static inline void register_sysctl_init(const char *path, const struct ctl_table *table)
{ {
} }
@ -261,7 +261,7 @@ static inline struct ctl_table_header *register_sysctl_mount_point(const char *p
} }
static inline struct ctl_table_header *register_sysctl_sz(const char *path, static inline struct ctl_table_header *register_sysctl_sz(const char *path,
struct ctl_table *table, const struct ctl_table *table,
size_t table_size) size_t table_size)
{ {
return NULL; return NULL;