|
@@ -26,6 +26,9 @@
|
|
# endif
|
|
# endif
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+/* max length of lines in /proc/self/maps - anything longer is skipped here */
|
|
|
|
+#define MAPS_LINE_LEN 128
|
|
|
|
+
|
|
int nerrs = 0;
|
|
int nerrs = 0;
|
|
|
|
|
|
typedef long (*getcpu_t)(unsigned *, unsigned *, void *);
|
|
typedef long (*getcpu_t)(unsigned *, unsigned *, void *);
|
|
@@ -37,17 +40,19 @@ static void *vsyscall_getcpu(void)
|
|
{
|
|
{
|
|
#ifdef __x86_64__
|
|
#ifdef __x86_64__
|
|
FILE *maps;
|
|
FILE *maps;
|
|
- char line[128];
|
|
|
|
|
|
+ char line[MAPS_LINE_LEN];
|
|
bool found = false;
|
|
bool found = false;
|
|
|
|
|
|
maps = fopen("/proc/self/maps", "r");
|
|
maps = fopen("/proc/self/maps", "r");
|
|
if (!maps) /* might still be present, but ignore it here, as we test vDSO not vsyscall */
|
|
if (!maps) /* might still be present, but ignore it here, as we test vDSO not vsyscall */
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
- while (fgets(line, sizeof(line), maps)) {
|
|
|
|
|
|
+ while (fgets(line, MAPS_LINE_LEN, maps)) {
|
|
char r, x;
|
|
char r, x;
|
|
void *start, *end;
|
|
void *start, *end;
|
|
- char name[128];
|
|
|
|
|
|
+ char name[MAPS_LINE_LEN];
|
|
|
|
+
|
|
|
|
+ /* sscanf() is safe here as strlen(name) >= strlen(line) */
|
|
if (sscanf(line, "%p-%p %c-%cp %*x %*x:%*x %*u %s",
|
|
if (sscanf(line, "%p-%p %c-%cp %*x %*x:%*x %*u %s",
|
|
&start, &end, &r, &x, name) != 5)
|
|
&start, &end, &r, &x, name) != 5)
|
|
continue;
|
|
continue;
|