Merge tag 'kcsan.2024.09.14a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

torvalds · torvalds · commit e651e0a47348 · 2024-09-18T08:28:59.000+02:00
Pull kcsan update from Paul McKenney:
 "Use min() to fix Coccinelle warning.

  Courtesy of Thorsten Blum"

* tag 'kcsan.2024.09.14a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
  kcsan: Use min() to fix Coccinelle warning
diff --git a/kernel/kcsan/debugfs.c b/kernel/kcsan/debugfs.c
@@ -225,7 +225,7 @@ debugfs_write(struct file *file, const char __user *buf, size_t count, loff_t *o
 {
 	char kbuf[KSYM_NAME_LEN];
 	char *arg;
-	int read_len = count < (sizeof(kbuf) - 1) ? count : (sizeof(kbuf) - 1);
+	const size_t read_len = min(count, sizeof(kbuf) - 1);
 
 	if (copy_from_user(kbuf, buf, read_len))
 		return -EFAULT;

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ debugfs_write(struct file file, const char __user buf, size_t count, loff_t *o`
`225`	`225`	`{`
`226`	`226`	`char kbuf[KSYM_NAME_LEN];`
`227`	`227`	`char *arg;`
`228`		`- int read_len = count < (sizeof(kbuf) - 1) ? count : (sizeof(kbuf) - 1);`
	`228`	`+ const size_t read_len = min(count, sizeof(kbuf) - 1);`
`229`	`229`
`230`	`230`	`if (copy_from_user(kbuf, buf, read_len))`
`231`	`231`	`return -EFAULT;`