[glibc] Fix parsing of /sys/devices/system/cpu/online (bug 25859)

Andreas Schwab schwab@sourceware.org
Wed Dec 9 14:33:03 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b5eeca8cfd9d0fd92b5633a88901d9ff27f2b496

commit b5eeca8cfd9d0fd92b5633a88901d9ff27f2b496
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Tue Dec 8 19:17:41 2020 +0100

    Fix parsing of /sys/devices/system/cpu/online (bug 25859)
    
    The file contains comma-separated ranges, not spaces.

Diff:
---
 sysdeps/unix/sysv/linux/getsysstats.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 1ef077f9af..a9069b7056 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -143,6 +143,7 @@ __get_nprocs (void)
   char *re = buffer_end;
 
   const int flags = O_RDONLY | O_CLOEXEC;
+  /* This file contains comma-separated ranges.  */
   int fd = __open_nocancel ("/sys/devices/system/cpu/online", flags);
   char *l;
   int result = 0;
@@ -175,10 +176,10 @@ __get_nprocs (void)
 	    result += m - n + 1;
 
 	    l = endp;
-	    while (l < re && isspace (*l))
+	    if (l < re && *l == ',')
 	      ++l;
 	  }
-	while (l < re);
+	while (l < re && *l != '\n');
 
       __close_nocancel_nostatus (fd);


More information about the Glibc-cvs mailing list