diff options
| author | Rich Felker <dalias@aerifal.cx> | 2014-12-02 21:54:36 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-03-30 01:41:33 -0400 |
| commit | 65a0ee3a52246878c15f62770dd9fe51b60aa08e (patch) | |
| tree | bf3f18d4f1e30adeb8283aa7b7ccf716eb07301b /src/sched | |
| parent | 5c34041293ae1c8aa2ddbd27eca662652f56b790 (diff) | |
| download | musl-65a0ee3a52246878c15f62770dd9fe51b60aa08e.tar.gz musl-65a0ee3a52246878c15f62770dd9fe51b60aa08e.tar.bz2 musl-65a0ee3a52246878c15f62770dd9fe51b60aa08e.tar.xz musl-65a0ee3a52246878c15f62770dd9fe51b60aa08e.zip | |
fix uninitialized output from sched_getaffinity
the sched_getaffinity syscall only fills a cpu set up to the set size
used/supported by the kernel. the rest is left untouched and userspace
is responsible for zero-filling it based on the return value of the
syscall.
(cherry picked from commit a56e339419c1a90f8a85f86621f3c73945e07b23)
Diffstat (limited to 'src/sched')
| -rw-r--r-- | src/sched/affinity.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sched/affinity.c b/src/sched/affinity.c index 3b402111..737e41b5 100644 --- a/src/sched/affinity.c +++ b/src/sched/affinity.c @@ -1,5 +1,6 @@ #define _GNU_SOURCE #include <sched.h> +#include <string.h> #include "pthread_impl.h" #include "syscall.h" @@ -16,7 +17,10 @@ int pthread_setaffinity_np(pthread_t td, size_t size, const cpu_set_t *set) int sched_getaffinity(pid_t tid, size_t size, cpu_set_t *set) { long ret = __syscall(SYS_sched_getaffinity, tid, size, set); - if (ret > 0) ret = 0; + if (ret > 0) { + if (ret < size) memset((char *)set+ret, 0, size-ret); + ret = 0; + } return __syscall_ret(ret); } |