]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tools/mm/slabinfo: fix access to null terminator in string boundary
authorKaushlendra Kumar <kaushlendra.kumar@intel.com>
Sat, 30 Aug 2025 17:20:22 +0000 (22:50 +0530)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 12 Sep 2025 00:25:28 +0000 (17:25 -0700)
The current code incorrectly accesses buffer[strlen(buffer)], which points
to the null terminator ('\0') at the end of the string.  This is
technically out-of-bounds access since valid string content ends at index
strlen(buffer)-1.

Fix by:
1. Declaring strlen() result variable at function scope
2. Adding bounds check (len > 0) to handle empty strings
3. Using buffer[len-1] to correctly access the last character before
   the null terminator

Link: https://lkml.kernel.org/r/20250830172022.1927448-1-kaushlendra.kumar@intel.com
Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
Acked-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/mm/slabinfo.c

index 1433eff99feb0518a68109529ab0a43379e1fbfc..d2e5b4e232b1fae86702c6315032b29235d458c0 100644 (file)
@@ -155,6 +155,8 @@ static void usage(void)
 
 static unsigned long read_obj(const char *name)
 {
+       size_t len;
+
        FILE *f = fopen(name, "r");
 
        if (!f) {
@@ -165,8 +167,10 @@ static unsigned long read_obj(const char *name)
                if (!fgets(buffer, sizeof(buffer), f))
                        buffer[0] = 0;
                fclose(f);
-               if (buffer[strlen(buffer)] == '\n')
-                       buffer[strlen(buffer)] = 0;
+               len = strlen(buffer);
+
+               if (len > 0 && buffer[len - 1] == '\n')
+                       buffer[len - 1] = 0;
        }
        return strlen(buffer);
 }