eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-19 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 32bit invalid CLI arguments check on 32bit systems.

Browse Source 
Comparison to > UINT32_MAX cannot be true if argument
is 32bit unsigned long.
This commit is contained in:
Milan Broz
2020-08-15 22:23:18 +02:00
parent 737ecd9d42
commit 6a6c4d0887
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils_args.c
View File

@@ -24,9 +24,7 @@
void tools_parse_arg_value(poptContext popt_context, crypt_arg_type_info type, struct tools_arg *arg, const char *popt_arg, int popt_val, bool(*needs_size_conv_fn)(unsigned arg_id)) void tools_parse_arg_value(poptContext popt_context, crypt_arg_type_info type, struct tools_arg *arg, const char *popt_arg, int popt_val, bool(*needs_size_conv_fn)(unsigned arg_id))
{ {
char *end, msg[128]; char *end, msg[128];
long int l;
long long int ll; long long int ll;
long unsigned int ul;
long long unsigned int ull; long long unsigned int ull;
errno = 0; errno = 0;
@@ -40,18 +38,18 @@ void tools_parse_arg_value(poptContext popt_context, crypt_arg_type_info type, s
arg->u.str_value = poptGetOptArg(popt_context); arg->u.str_value = poptGetOptArg(popt_context);
break; break;
case CRYPT_ARG_INT32: case CRYPT_ARG_INT32:
l = strtol(popt_arg, &end, 10); ll = strtoll(popt_arg, &end, 10);
if (*end || !*popt_arg || l > INT32_MAX || l < INT32_MIN || errno == ERANGE) if (*end || !*popt_arg || ll > INT32_MAX || ll < INT32_MIN || errno == ERANGE)
usage(popt_context, EXIT_FAILURE, poptStrerror(POPT_ERROR_BADNUMBER), usage(popt_context, EXIT_FAILURE, poptStrerror(POPT_ERROR_BADNUMBER),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
arg->u.i32_value = l; arg->u.i32_value = (int32_t)ll;
break; break;
case CRYPT_ARG_UINT32: case CRYPT_ARG_UINT32:
ul = strtoul(popt_arg, &end, 0); ull = strtoull(popt_arg, &end, 0);
if (*end || !*popt_arg || ul > UINT32_MAX || errno == ERANGE) if (*end || !*popt_arg || ull > UINT32_MAX || errno == ERANGE)
usage(popt_context, EXIT_FAILURE, poptStrerror(POPT_ERROR_BADNUMBER), usage(popt_context, EXIT_FAILURE, poptStrerror(POPT_ERROR_BADNUMBER),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
arg->u.u32_value = ul; arg->u.u32_value = (uint32_t)ull;
break; break;
case CRYPT_ARG_INT64: case CRYPT_ARG_INT64:
ll = strtoll(popt_arg, &end, 10); ll = strtoll(popt_arg, &end, 10);