#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <unistd.h>
#include <pthread.h>
#include <stdlib.h>
#include <urcu/compiler.h>
-#include "common/align.h"
#include "common/logging.h"
#include "common/smp.h"
{
ssize_t bytes_read = 0;
size_t total_bytes_read = 0;
- int fd = 0;
+ int fd = -1, ret = -1;
if (buf == NULL)
- return -1;
+ goto end;
fd = open("/sys/devices/system/cpu/possible", O_RDONLY);
if (fd < 0)
- return -1;
+ goto end;
do {
bytes_read = read(fd, buf + total_bytes_read,
if (errno == EINTR) {
continue; /* retry operation */
} else {
- return -1;
+ goto end;
}
}
assert(total_bytes_read <= max_bytes);
} while (max_bytes > total_bytes_read && bytes_read > 0);
- if (close(fd))
- PERROR("close");
-
/*
* Make sure the mask read is a null terminated string.
*/
else
buf[max_bytes - 1] = '\0';
- return total_bytes_read;
+ if (total_bytes_read > INT_MAX)
+ goto end;
+ ret = (int) total_bytes_read;
+end:
+ if (fd >= 0 && close(fd) < 0)
+ PERROR("close");
+ return ret;
}
/*
static void _get_num_possible_cpus(void)
{
int ret;
- int buf_len = LTTNG_UST_PAGE_SIZE;
- char buf[buf_len];
+ char buf[LTTNG_UST_CPUMASK_SIZE];
/* Get the possible cpu mask from sysfs, fallback to sysconf. */
- ret = get_possible_cpu_mask_from_sysfs((char *) &buf, buf_len);
+ ret = get_possible_cpu_mask_from_sysfs((char *) &buf, LTTNG_UST_CPUMASK_SIZE);
if (ret <= 0)
goto fallback;