[PATCH] locking/lockdep: Fix string truncation and length accounting in seq_stats()

Boudewijn van der Heide posted 1 patch 1 month, 2 weeks ago
kernel/locking/lockdep_proc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
[PATCH] locking/lockdep: Fix string truncation and length accounting in seq_stats()
Posted by Boudewijn van der Heide 1 month, 2 weeks ago
GCC 14 reports a -Wformat-truncation warning when appending "#%d" and
"/%d" to the lock class name in seq_stats(), as the buffer size was
insufficient and the resulting length was tracked incorrectly.

Use scnprintf() with remaining-buffer accounting to safely append the
suffixes and update namelen based on the actual number of characters
written.

Signed-off-by: Boudewijn van der Heide <boudewijn@delta-utec.com>
---
 kernel/locking/lockdep_proc.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index 1916db9aa46b..8fe977c32a3d 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -496,12 +496,14 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
 
 	namelen = strlen(name);
 	if (class->name_version > 1) {
-		snprintf(name+namelen, 3, "#%d", class->name_version);
-		namelen += 2;
+		namelen += scnprintf(name + namelen,
+				sizeof(name) - namelen, "#%d",
+				class->name_version);
 	}
 	if (class->subclass) {
-		snprintf(name+namelen, 3, "/%d", class->subclass);
-		namelen += 2;
+		namelen += scnprintf(name + namelen,
+				sizeof(name) - namelen, "/%d",
+				class->subclass);
 	}
 
 	if (stats->write_holdtime.nr) {
-- 
2.47.3