[PATCH] Pass cpusetsize rather than sizeof (cpu_set_t) in sched_getaffinity
Jakub Jelinek
jakub@redhat.com
Fri May 12 15:42:00 GMT 2006
Hi!
If sched_getaffinity is called with cpusetsize smaller than sizeof
(cpu_set_t) (people shouldn't do that but they reportably do that),
sched_getaffinity may segfault (calling memset with > 2GB size).
Also, if ever is kernel configured for 1025+ CPUs, sched_getaffinity
would always fail even if the user passed buffer big enough
(as it would still call the syscall with 128 and just bzero the rest).
The following matches what pthread_getaffinity_np is doing.
2006-05-12 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/sched_getaffinity.c: Include sys/param.h.
(__sched_getaffinity_new): Don't crash if cpusetsize is smaller than
sizeof (cpu_set_t).
--- libc/sysdeps/unix/sysv/linux/sched_getaffinity.c.jj 2005-12-19 08:43:50.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sched_getaffinity.c 2006-05-12 17:34:33.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
#include <sched.h>
#include <string.h>
#include <sysdep.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <shlib-compat.h>
@@ -28,8 +29,8 @@
int
__sched_getaffinity_new (pid_t pid, size_t cpusetsize, cpu_set_t *cpuset)
{
- int res = INLINE_SYSCALL (sched_getaffinity, 3, pid, sizeof (cpu_set_t),
- cpuset);
+ int res = INLINE_SYSCALL (sched_getaffinity, 3, pid,
+ MIN (INT_MAX, cpusetsize), cpuset);
if (res != -1)
{
/* Clean the rest of the memory the kernel didn't do. */
Jakub
More information about the Libc-hacker
mailing list