kernel/utsname_sysctl.c: Fix hostname polling

Commit bfca3dd ("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 <[email protected]> Fixes: bfca3dd ("kernel/utsname_sysctl.c: print kernel arch") Link: https://lore.kernel.org/lkml/[email protected]/ Link: https://linux-regtracking.leemhuis.info/regzbot/regression/[email protected]/ Cc: Petr Vorel <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
majek · Oct 23, 2022 · 52826d3 · 52826d3
1 parent a703852
commit 52826d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/include/linux/utsname.h b/include/linux/utsname.h
@@ -10,6 +10,7 @@
 #include <uapi/linux/utsname.h>
 
 enum uts_proc {
+	UTS_PROC_ARCH,
 	UTS_PROC_OSTYPE,
 	UTS_PROC_OSRELEASE,
 	UTS_PROC_VERSION,

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
@@ -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(domainname_poll);
 
+// Note: update 'enum uts_proc' to match any changes to this table
 static struct ctl_table uts_kern_table[] = {
 	{
 		.procname	= "arch",