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

Add explicit ARG_SET_TRUE macro.

Browse Source 
and dissalow ARG_SET() query macro to be abused to change
the value.
This commit is contained in:
Ondrej Kozina
2020-09-03 16:15:09 +02:00
committed by Milan Broz
parent be9c3cd979
commit 0b5426da12
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cryptsetup.c
View File

@@ -1243,7 +1243,7 @@ static int _luksFormat(struct crypt_device **r_cd, char **r_password, size_t *r_
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(cipher))
ARG_SET(OPT_FORCE_PASSWORD_ID) = true;
ARG_SET_TRUE(OPT_FORCE_PASSWORD_ID);
if ((r = crypt_init(&cd, header_device))) {
if (ARG_SET(OPT_HEADER_ID))
@@ -1653,7 +1653,7 @@ static int luksAddUnboundKey(void)
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(crypt_get_cipher(cd)))
ARG_SET(OPT_FORCE_PASSWORD_ID) = true;
ARG_SET_TRUE(OPT_FORCE_PASSWORD_ID);
keysize = ARG_UINT32(OPT_KEY_SIZE_ID) / 8;
r = set_pbkdf_params(cd, crypt_get_type(cd));
@@ -1720,7 +1720,7 @@ static int action_luksAddKey(void)
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(crypt_get_cipher(cd)))
ARG_SET(OPT_FORCE_PASSWORD_ID) = true;
ARG_SET_TRUE(OPT_FORCE_PASSWORD_ID);
keysize = crypt_get_volume_key_size(cd);
r = set_pbkdf_params(cd, crypt_get_type(cd));
@@ -1823,7 +1823,7 @@ static int action_luksChangeKey(void)
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(crypt_get_cipher(cd)))
ARG_SET(OPT_FORCE_PASSWORD_ID) = true;
ARG_SET_TRUE(OPT_FORCE_PASSWORD_ID);
r = set_pbkdf_params(cd, crypt_get_type(cd));
if (r) {
@@ -3651,7 +3651,7 @@ int main(int argc, const char **argv)
device_type = "luks2";
} else if (!strcmp(aname, "refresh")) {
aname = OPEN_ACTION;
ARG_SET(OPT_REFRESH_ID) = true;
ARG_SET_TRUE(OPT_REFRESH_ID);
} else if (ARG_SET(OPT_TYPE_ID))
device_type = ARG_STR(OPT_TYPE_ID);
@@ -3815,8 +3815,8 @@ int main(int argc, const char **argv)
poptGetInvocationName(popt_context));
if (ARG_SET(OPT_DEBUG_ID) || ARG_SET(OPT_DEBUG_JSON_ID)) {
ARG_SET(OPT_DEBUG_ID) = true;
ARG_SET(OPT_VERBOSE_ID) = true;
ARG_SET_TRUE(OPT_DEBUG_ID);
ARG_SET_TRUE(OPT_VERBOSE_ID);
crypt_set_debug_level(ARG_SET(OPT_DEBUG_JSON_ID)? CRYPT_DEBUG_JSON : CRYPT_DEBUG_ALL);
dbg_version_and_cmd(argc, argv);
}

2
src/cryptsetup_reencrypt.c
View File

@@ -1720,7 +1720,7 @@ int main(int argc, const char **argv)
poptGetInvocationName(popt_context));
if (ARG_SET(OPT_DEBUG_ID)) {
ARG_SET(OPT_VERBOSE_ID) = true;
ARG_SET_TRUE(OPT_VERBOSE_ID);
crypt_set_debug_level(CRYPT_DEBUG_ALL);
dbg_version_and_cmd(argc, argv);
}

2
src/integritysetup.c
View File

@@ -622,7 +622,7 @@ int main(int argc, const char **argv)
poptGetInvocationName(popt_context));
if (ARG_SET(OPT_DEBUG_ID)) {
ARG_SET(OPT_VERBOSE_ID) = true;
ARG_SET_TRUE(OPT_VERBOSE_ID);
crypt_set_debug_level(CRYPT_DEBUG_ALL);
dbg_version_and_cmd(argc, argv);
}

6
src/utils_arg_macros.h
View File

@@ -24,7 +24,7 @@
#include <assert.h>
#define ARG_SET(X) tool_core_args[(X)].set
#define ARG_SET(X) !!tool_core_args[(X)].set
#define ARG_STR(X) ({ \
assert(tool_core_args[(X)].type == CRYPT_ARG_STRING); \
@@ -51,6 +51,10 @@
tool_core_args[(X)].u.u64_value; \
})
#define ARG_SET_TRUE(X) do { \
tool_core_args[(X)].set = true; \
} while (0)
#define ARG_SET_STR(X, Y) \
do { \
char *str; \

2
src/veritysetup.c
View File

@@ -549,7 +549,7 @@ int main(int argc, const char **argv)
poptGetInvocationName(popt_context));
if (ARG_SET(OPT_DEBUG_ID)) {
ARG_SET(OPT_VERBOSE_ID) = true;
ARG_SET_TRUE(OPT_VERBOSE_ID);
crypt_set_debug_level(CRYPT_DEBUG_ALL);
dbg_version_and_cmd(argc, argv);
}