Merge tag 'timers_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 7ea5092f5208 · 2025-10-26T09:40:16.000-07:00
Pull timer fix from Borislav Petkov:

 - Do not create more than eight (max supported) AUX clocks sysfs
   hierarchies

* tag 'timers_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix aux clocks sysfs initialization loop bound
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
@@ -3070,7 +3070,7 @@ static int __init tk_aux_sysfs_init(void)
 		return -ENOMEM;
 	}
 
-	for (int i = 0; i <= MAX_AUX_CLOCKS; i++) {
+	for (int i = 0; i < MAX_AUX_CLOCKS; i++) {
 		char id[2] = { [0] = '0' + i, };
 		struct kobject *clk = kobject_create_and_add(id, auxo);
 

Original file line number	Diff line number	Diff line change
`@@ -3070,7 +3070,7 @@ static int __init tk_aux_sysfs_init(void)`
`3070`	`3070`	`return -ENOMEM;`
`3071`	`3071`	`}`
`3072`	`3072`
`3073`		`- for (int i = 0; i <= MAX_AUX_CLOCKS; i++) {`
	`3073`	`+ for (int i = 0; i < MAX_AUX_CLOCKS; i++) {`
`3074`	`3074`	`char id[2] = { [0] = '0' + i, };`
`3075`	`3075`	`struct kobject *clk = kobject_create_and_add(id, auxo);`
`3076`	`3076`