ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lsmem: check errno after strto..() 

Addresses: https://github.com/karelzak/util-linux/issues/1356
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-06-21 15:29:33 +02:00
parent 35d458708e
commit fe4e122ab3
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys-utils/chmem.c
View File

@ -262,9 +262,16 @@ static void read_info(struct chmem_desc *desc)
desc->ndirs = scandir(_PATH_SYS_MEMORY, &desc->dirs, filter, versionsort);
if (desc->ndirs <= 0)
err(EXIT_FAILURE, _("Failed to read %s"), _PATH_SYS_MEMORY);
goto fail;
ul_path_read_buffer(desc->sysmem, line, sizeof(line), "block_size_bytes");
errno = 0;
desc->block_size = strtoumax(line, NULL, 16);
if (errno)
goto fail;
return;
fail:
err(EXIT_FAILURE, _("Failed to read %s"), _PATH_SYS_MEMORY);
}
static void parse_single_param(struct chmem_desc *desc, char *str)

17
sys-utils/lsmem.c
View File

@ -348,25 +348,32 @@ static int memory_block_get_node(struct lsmem *lsmem, char *name)
continue;
if (!isdigit_string(de->d_name + 4))
continue;
errno = 0;
node = strtol(de->d_name + 4, NULL, 10);
if (errno)
continue;
break;
}
closedir(dir);
return node;
}
static void memory_block_read_attrs(struct lsmem *lsmem, char *name,
static int memory_block_read_attrs(struct lsmem *lsmem, char *name,
struct memory_block *blk)
{
char *line = NULL;
int i, x = 0;
int i, x = 0, rc = 0;
memset(blk, 0, sizeof(*blk));
errno = 0;
blk->count = 1;
blk->state = MEMORY_STATE_UNKNOWN;
blk->index = strtoumax(name + 6, NULL, 10); /* get <num> of "memory<num>" */
if (errno)
rc = -errno;
if (ul_path_readf_s32(lsmem->sysmem, &x, "%s/removable", name) == 0)
blk->removable = x == 1;
@ -397,6 +404,8 @@ static void memory_block_read_attrs(struct lsmem *lsmem, char *name,
}
free(line);
}
return rc;
}
static int is_mergeable(struct lsmem *lsmem, struct memory_block *blk)
@ -451,7 +460,11 @@ static void read_info(struct lsmem *lsmem)
if (ul_path_read_buffer(lsmem->sysmem, buf, sizeof(buf), "block_size_bytes") <= 0)
err(EXIT_FAILURE, _("failed to read memory block size"));
errno = 0;
lsmem->block_size = strtoumax(buf, NULL, 16);
if (errno)
err(EXIT_FAILURE, _("failed to read memory block size"));
for (i = 0; i < lsmem->ndirs; i++) {
memory_block_read_attrs(lsmem, lsmem->dirs[i]->d_name, &blk);