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

opal: simplify User setup routine.

Browse Source 
Reduce memory copying by reusing nested structure in opal_lock.
This commit is contained in:
Ondrej Kozina
2025-07-31 15:27:42 +02:00
parent cc66b1fa52
commit 441802773f
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/luks2/hw_opal/hw_opal.c
View File

@@ -533,20 +533,11 @@ static int opal_setup_user(struct crypt_device *cd, int fd, uint32_t segment_num
const void *admin_key, size_t admin_key_len) const void *admin_key, size_t admin_key_len)
{ {
int r; int r;
struct opal_session_info *user_session = crypt_safe_alloc(sizeof(*user_session));
struct opal_lock_unlock *user_add_to_lr = crypt_safe_alloc(sizeof(*user_add_to_lr)); struct opal_lock_unlock *user_add_to_lr = crypt_safe_alloc(sizeof(*user_add_to_lr));
if (!user_session || !user_add_to_lr) { if (!user_add_to_lr)
r = -ENOMEM; return -ENOMEM;
goto out;
}
*user_session = (struct opal_session_info) {
.who = segment_number + 1,
.opal_key = {
.key_len = admin_key_len,
},
};
*user_add_to_lr = (struct opal_lock_unlock) { *user_add_to_lr = (struct opal_lock_unlock) {
.session = { .session = {
.who = segment_number + 1, .who = segment_number + 1,
@@ -558,10 +549,9 @@ static int opal_setup_user(struct crypt_device *cd, int fd, uint32_t segment_num
.l_state = OPAL_RO, .l_state = OPAL_RO,
}; };
crypt_safe_memcpy(user_session->opal_key.key, admin_key, admin_key_len);
crypt_safe_memcpy(user_add_to_lr->session.opal_key.key, admin_key, admin_key_len); crypt_safe_memcpy(user_add_to_lr->session.opal_key.key, admin_key, admin_key_len);
r = opal_ioctl(cd, fd, IOC_OPAL_ACTIVATE_USR, user_session); r = opal_ioctl(cd, fd, IOC_OPAL_ACTIVATE_USR, &user_add_to_lr->session);
if (r != OPAL_STATUS_SUCCESS) { if (r != OPAL_STATUS_SUCCESS) {
log_dbg(cd, "Failed to activate OPAL user on device '%s': %s", log_dbg(cd, "Failed to activate OPAL user on device '%s': %s",
crypt_get_device_name(cd), opal_status_to_string(r)); crypt_get_device_name(cd), opal_status_to_string(r));
@@ -586,7 +576,6 @@ static int opal_setup_user(struct crypt_device *cd, int fd, uint32_t segment_num
r = -EINVAL; r = -EINVAL;
} }
out: out:
crypt_safe_free(user_session);
crypt_safe_free(user_add_to_lr); crypt_safe_free(user_add_to_lr);
return r; return r;