VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/idmapping.c: get_map_ranges(): Move range check to a2ul() call

Browse Source 
Link: <ff2baed5db (r136635300)>
Cc: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-01-11 12:17:36 +01:00
committed by Serge Hallyn
parent 57aa813c73
commit 7c43eb2c4e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/idmapping.c
View File

@@ -69,7 +69,8 @@ struct map_range *get_map_ranges(int ranges, int argc, char **argv)
return NULL;
}
if (a2ul(&m->count, argv[argidx + 2], NULL, 0, 0,
MIN(UINT_MAX - m->lower, UINT_MAX - m->upper))
MIN(MIN(UINT_MAX, ULONG_MAX - 1) - m->lower,
MIN(UINT_MAX, ULONG_MAX - 1) - m->upper))
== -1)
{
if (errno == ERANGE) {
@@ -79,10 +80,6 @@ struct map_range *get_map_ranges(int ranges, int argc, char **argv)
free(mappings);
return NULL;
}
if (ULONG_MAX - m->upper <= m->count || ULONG_MAX - m->lower <= m->count) {
fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
exit(EXIT_FAILURE);
}
if (m->lower + m->count < m->lower || m->upper + m->count < m->upper) {
/* this one really shouldn't be possible given previous checks */
fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());