mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
52826d3b2d
Commitbfca3dd3d0("kernel/utsname_sysctl.c: print kernel arch") added a new entry to the uts_kern_table[] array, but didn't update the UTS_PROC_xyz enumerators of older entries, breaking anything that used them. Which is admittedly not many cases: it's really just the two uses of uts_proc_notify() in kernel/sys.c. But apparently journald-systemd actually uses this to detect hostname changes. Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com> Fixes:bfca3dd3d0("kernel/utsname_sysctl.c: print kernel arch") Link: https://lore.kernel.org/lkml/0c2b92a6-0f25-9538-178f-eee3b06da23f@secunet.com/ Link: https://linux-regtracking.leemhuis.info/regzbot/regression/0c2b92a6-0f25-9538-178f-eee3b06da23f@secunet.com/ Cc: Petr Vorel <pvorel@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
93 lines
1.8 KiB
C
93 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LINUX_UTSNAME_H
|
|
#define _LINUX_UTSNAME_H
|
|
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/ns_common.h>
|
|
#include <linux/err.h>
|
|
#include <uapi/linux/utsname.h>
|
|
|
|
enum uts_proc {
|
|
UTS_PROC_ARCH,
|
|
UTS_PROC_OSTYPE,
|
|
UTS_PROC_OSRELEASE,
|
|
UTS_PROC_VERSION,
|
|
UTS_PROC_HOSTNAME,
|
|
UTS_PROC_DOMAINNAME,
|
|
};
|
|
|
|
struct user_namespace;
|
|
extern struct user_namespace init_user_ns;
|
|
|
|
struct uts_namespace {
|
|
struct new_utsname name;
|
|
struct user_namespace *user_ns;
|
|
struct ucounts *ucounts;
|
|
struct ns_common ns;
|
|
} __randomize_layout;
|
|
extern struct uts_namespace init_uts_ns;
|
|
|
|
#ifdef CONFIG_UTS_NS
|
|
static inline void get_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
refcount_inc(&ns->ns.count);
|
|
}
|
|
|
|
extern struct uts_namespace *copy_utsname(unsigned long flags,
|
|
struct user_namespace *user_ns, struct uts_namespace *old_ns);
|
|
extern void free_uts_ns(struct uts_namespace *ns);
|
|
|
|
static inline void put_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
if (refcount_dec_and_test(&ns->ns.count))
|
|
free_uts_ns(ns);
|
|
}
|
|
|
|
void uts_ns_init(void);
|
|
#else
|
|
static inline void get_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
}
|
|
|
|
static inline void put_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
}
|
|
|
|
static inline struct uts_namespace *copy_utsname(unsigned long flags,
|
|
struct user_namespace *user_ns, struct uts_namespace *old_ns)
|
|
{
|
|
if (flags & CLONE_NEWUTS)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
return old_ns;
|
|
}
|
|
|
|
static inline void uts_ns_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_PROC_SYSCTL
|
|
extern void uts_proc_notify(enum uts_proc proc);
|
|
#else
|
|
static inline void uts_proc_notify(enum uts_proc proc)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static inline struct new_utsname *utsname(void)
|
|
{
|
|
return ¤t->nsproxy->uts_ns->name;
|
|
}
|
|
|
|
static inline struct new_utsname *init_utsname(void)
|
|
{
|
|
return &init_uts_ns.name;
|
|
}
|
|
|
|
extern struct rw_semaphore uts_sem;
|
|
|
|
#endif /* _LINUX_UTSNAME_H */
|