diff options
| author | Ulises Mendez Martinez <umendez@google.com> | 2026-09-04 15:07:09 +0000 |
|---|---|---|
| committer | Josh Poimboeuf <jpoimboe@kernel.org> | 2026-09-13 18:15:43 -0700 |
| commit | 7e61560628d17ea6b1d8ee370f6d42694cff8758 (patch) | |
| tree | e6080164b2f4c4c419894bdb3ce4d956ca9a98c5 /net/sysctl_net.c | |
| download | linux-stable-7e61560628d17ea6b1d8ee370f6d42694cff8758.tar.gz linux-stable-7e61560628d17ea6b1d8ee370f6d42694cff8758.zip | |
objtool: Validate disassembler headers in libopcodes probegrafted
commit 3f2de814c059 ("objtool: Fix libopcodes linking with static libraries")
tested for libopcodes availability by linking a test snippet with a forward
declaration of disassemble_init_for_target().
However, testing symbol linkage with an extern declaration only verifies
the presence of the library (.so/.a) and bypasses checking for development
headers (binutils-dev). On systems where libopcodes is present without
development headers installed, the probe succeeds, enabling BUILD_DISAS.
Subsequent compilation of objtool then fails:
fatal error: 'bfd.h' file not found
113 | #include <bfd.h>
Additionally, the probe invokes $(HOSTCC) without $(HOSTCFLAGS), ignoring
any sysroot or include flags specified for the host compiler.
Fix this by including <bfd.h> and <dis-asm.h> directly in the test snippet,
passing $(HOSTCFLAGS) so host compiler options are respected, and defining
PACKAGE="objtool" to satisfy the configuration check in <bfd.h>.
Fixes: 3f2de814c059 ("objtool: Fix libopcodes linking with static libraries")
Fixes: 436326bc525d ("objtool: fix build failure due to missing libopcodes check")
Reported-by: Alice Ryhl <aliceryhl@google.com>
Assisted-by: Antigravity:Gemini-Next
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Link: https://patch.msgid.link/20260904150710.2997558-1-umendez@google.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Diffstat (limited to 'net/sysctl_net.c')
| -rw-r--r-- | net/sysctl_net.c | 180 |
1 files changed, 180 insertions, 0 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c new file mode 100644 index 000000000..e190a639e --- /dev/null +++ b/net/sysctl_net.c @@ -0,0 +1,180 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* -*- linux-c -*- + * sysctl_net.c: sysctl interface to net subsystem. + * + * Begun April 1, 1996, Mike Shaver. + * Added /proc/sys/net directories for each protocol family. [MS] + * + * Revision 1.2 1996/05/08 20:24:40 shaver + * Added bits for NET_BRIDGE and the NET_IPV4_ARP stuff and + * NET_IPV4_IP_FORWARD. + * + * + */ + +#include <linux/mm.h> +#include <linux/export.h> +#include <linux/sysctl.h> +#include <linux/nsproxy.h> + +#include <net/sock.h> + +#ifdef CONFIG_INET +#include <net/ip.h> +#endif + +#ifdef CONFIG_NET +#include <linux/if_ether.h> +#endif + +static struct ctl_table_set * +net_ctl_header_lookup(struct ctl_table_root *root) +{ + return ¤t->nsproxy->net_ns->sysctls; +} + +static int is_seen(struct ctl_table_set *set) +{ + return ¤t->nsproxy->net_ns->sysctls == set; +} + +/* Return standard mode bits for table entry. */ +static int net_ctl_permissions(struct ctl_table_header *head, + const struct ctl_table *table) +{ + struct net *net = container_of(head->set, struct net, sysctls); + + /* Allow network administrator to have same access as root. */ + if (ns_capable_noaudit(net->user_ns, CAP_NET_ADMIN)) { + int mode = (table->mode >> 6) & 7; + return (mode << 6) | (mode << 3) | mode; + } + + return table->mode; +} + +static void net_ctl_set_ownership(struct ctl_table_header *head, + kuid_t *uid, kgid_t *gid) +{ + struct net *net = container_of(head->set, struct net, sysctls); + kuid_t ns_root_uid; + kgid_t ns_root_gid; + + ns_root_uid = make_kuid(net->user_ns, 0); + if (uid_valid(ns_root_uid)) + *uid = ns_root_uid; + + ns_root_gid = make_kgid(net->user_ns, 0); + if (gid_valid(ns_root_gid)) + *gid = ns_root_gid; +} + +static struct ctl_table_root net_sysctl_root = { + .lookup = net_ctl_header_lookup, + .permissions = net_ctl_permissions, + .set_ownership = net_ctl_set_ownership, +}; + +static int __net_init sysctl_net_init(struct net *net) +{ + setup_sysctl_set(&net->sysctls, &net_sysctl_root, is_seen); + return 0; +} + +static void __net_exit sysctl_net_exit(struct net *net) +{ + retire_sysctl_set(&net->sysctls); +} + +static struct pernet_operations sysctl_pernet_ops = { + .init = sysctl_net_init, + .exit = sysctl_net_exit, +}; + +static struct ctl_table_header *net_header; +__init int net_sysctl_init(void) +{ + static struct ctl_table empty[1]; + int ret = -ENOMEM; + /* Avoid limitations in the sysctl implementation by + * registering "/proc/sys/net" as an empty directory not in a + * network namespace. + */ + net_header = register_sysctl_sz("net", empty, 0); + if (!net_header) + goto out; + ret = register_pernet_subsys(&sysctl_pernet_ops); + if (ret) + goto out1; +out: + return ret; +out1: + unregister_sysctl_table(net_header); + net_header = NULL; + goto out; +} + +/* Return error when sysctls for non-init netns are unsafe by verifying: + * 1) being read-only, or + * 2) having a data pointer which points outside of the global kernel/module + * data segment, and rather into the heap where a per-net object was + * allocated. + */ +static int ensure_safe_net_sysctl(struct net *net, const char *path, + const struct ctl_table *table, + size_t table_size) +{ + const struct ctl_table *ent; + + pr_debug("Registering net sysctl (net %p): %s\n", net, path); + ent = table; + for (size_t i = 0; i < table_size; ent++, i++) { + unsigned long addr; + const char *where; + + pr_debug(" procname=%s mode=%o proc_handler=%ps data=%p\n", + ent->procname, ent->mode, ent->proc_handler, ent->data); + + /* If it's not writable inside the netns, then it can't hurt. */ + if ((ent->mode & 0222) == 0) { + pr_debug(" Not writable by anyone\n"); + continue; + } + + /* Where does data point? */ + addr = (unsigned long)ent->data; + if (is_module_address(addr)) + where = "module"; + else if (is_kernel_core_data(addr)) + where = "kernel"; + else + continue; + + /* Warn on netns leak. */ + WARN(1, "sysctl %s/%s: data points to %s global data: %ps\n", + path, ent->procname, where, ent->data); + + return -EACCES; + } + + return 0; +} + +struct ctl_table_header *register_net_sysctl_sz(struct net *net, + const char *path, + const struct ctl_table *table, + size_t table_size) +{ + if (!net_eq(net, &init_net)) + if (ensure_safe_net_sysctl(net, path, table, table_size)) + return NULL; + + return __register_sysctl_table(&net->sysctls, path, table, table_size); +} +EXPORT_SYMBOL_GPL(register_net_sysctl_sz); + +void unregister_net_sysctl_table(struct ctl_table_header *header) +{ + unregister_sysctl_table(header); +} +EXPORT_SYMBOL_GPL(unregister_net_sysctl_table); |
