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

Fix warning for hidden global variable

Browse Source 
The requirements_flags is a global array, do not
name a local variable the same (CodeQL fix).
This commit is contained in:
Milan Broz
2025-05-27 15:33:02 +02:00
parent ca7c4c8b15
commit 55c44cd3fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/luks2/luks2_json_metadata.c
View File

@@ -2661,7 +2661,7 @@ int LUKS2_activate(struct crypt_device *cd,
{ {
int r; int r;
bool dynamic, read_lock, write_lock, opal_lock_on_error = false; bool dynamic, read_lock, write_lock, opal_lock_on_error = false;
uint32_t opal_segment_number, requirements_flags; uint32_t opal_segment_number, req_flags;
uint64_t range_offset_sectors, range_length_sectors, device_length_bytes; uint64_t range_offset_sectors, range_length_sectors, device_length_bytes;
struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2); struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2);
struct crypt_dm_active_device dmdi = {}, dmd = { struct crypt_dm_active_device dmdi = {}, dmd = {
@@ -2760,13 +2760,13 @@ int LUKS2_activate(struct crypt_device *cd,
dmd.flags |= flags; dmd.flags |= flags;
if (crypt_persistent_flags_get(cd, CRYPT_FLAGS_REQUIREMENTS, &requirements_flags)) { if (crypt_persistent_flags_get(cd, CRYPT_FLAGS_REQUIREMENTS, &req_flags)) {
r = -EINVAL; r = -EINVAL;
goto out; goto out;
} }
if (crypt_get_integrity_tag_size(cd) && if (crypt_get_integrity_tag_size(cd) &&
!(requirements_flags & CRYPT_REQUIREMENT_INLINE_HW_TAGS)) { !(req_flags & CRYPT_REQUIREMENT_INLINE_HW_TAGS)) {
if (!LUKS2_integrity_compatible(hdr)) { if (!LUKS2_integrity_compatible(hdr)) {
log_err(cd, _("Unsupported device integrity configuration.")); log_err(cd, _("Unsupported device integrity configuration."));
r = -EINVAL; r = -EINVAL;