public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: __get_nprocs_sched: do not feed CPU_COUNT_S with garbage [BZ #28850]
@ 2022-02-03 12:14 Dmitry Levin
  0 siblings, 0 replies; only message in thread
From: Dmitry Levin @ 2022-02-03 12:14 UTC (permalink / raw)
  To: glibc-cvs

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

commit 97ba273b505763325efd802dc3a9562dbba79579
Author: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date:   Tue Feb 1 22:39:02 2022 +0000

    linux: __get_nprocs_sched: do not feed CPU_COUNT_S with garbage [BZ #28850]
    
    Pass the actual number of bytes returned by the kernel.
    
    Fixes: 33099d72e41c ("linux: Simplify get_nprocs")
    Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>

Diff:
---
 sysdeps/unix/sysv/linux/getsysstats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 4798cc337e..c98c8ce3d4 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -44,7 +44,7 @@ __get_nprocs_sched (void)
   int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, cpu_bits_size,
 				 cpu_bits);
   if (r > 0)
-    return CPU_COUNT_S (cpu_bits_size, (cpu_set_t*) cpu_bits);
+    return CPU_COUNT_S (r, (cpu_set_t*) cpu_bits);
   else if (r == -EINVAL)
     /* The input buffer is still not enough to store the number of cpus.  This
        is an arbitrary values assuming such systems should be rare and there


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-02-03 12:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-03 12:14 [glibc] linux: __get_nprocs_sched: do not feed CPU_COUNT_S with garbage [BZ #28850] Dmitry Levin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).