Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel/utsname_sysctl.c: Fix hostname polling

Browse Source 
Commit bfca3dd3d0 ("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>
This commit is contained in:
Linus Torvalds 2022-10-23 12:01:01 -07:00
parent a703852408
commit 52826d3b2d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/utsname.h
View File

@ -10,6 +10,7 @@
#include <uapi/linux/utsname.h> #include <uapi/linux/utsname.h>
enum uts_proc { enum uts_proc {
UTS_PROC_ARCH,
UTS_PROC_OSTYPE, UTS_PROC_OSTYPE,
UTS_PROC_OSRELEASE, UTS_PROC_OSRELEASE,
UTS_PROC_VERSION, UTS_PROC_VERSION,

1
kernel/utsname_sysctl.c
View File

@ -74,6 +74,7 @@ static int proc_do_uts_string(struct ctl_table *table, int write,
static DEFINE_CTL_TABLE_POLL(hostname_poll); static DEFINE_CTL_TABLE_POLL(hostname_poll);
static DEFINE_CTL_TABLE_POLL(domainname_poll); static DEFINE_CTL_TABLE_POLL(domainname_poll);
// Note: update 'enum uts_proc' to match any changes to this table
static struct ctl_table uts_kern_table[] = { static struct ctl_table uts_kern_table[] = {
{ {
.procname = "arch", .procname = "arch",