SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block/rbd: Remove redundant stack variable passphrase_len

Browse Source 
Signed-off-by: Or Ozeri <oro@il.ibm.com>
Message-Id: <20230129113120.722708-2-oro@oro.sl.cloud9.ibm.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Or Ozeri 2023-01-29 05:31:18 -06:00 committed by Kevin Wolf
parent be2c42b97c
commit a4ac51ac4e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/rbd.c
View File

@ -386,7 +386,6 @@ static int qemu_rbd_encryption_format(rbd_image_t image,
{ {
int r = 0; int r = 0;
g_autofree char *passphrase = NULL; g_autofree char *passphrase = NULL;
size_t passphrase_len;
rbd_encryption_format_t format; rbd_encryption_format_t format;
rbd_encryption_options_t opts; rbd_encryption_options_t opts;
rbd_encryption_luks1_format_options_t luks_opts; rbd_encryption_luks1_format_options_t luks_opts;
@ -408,12 +407,12 @@ static int qemu_rbd_encryption_format(rbd_image_t image,
opts_size = sizeof(luks_opts); opts_size = sizeof(luks_opts);
r = qemu_rbd_convert_luks_create_options( r = qemu_rbd_convert_luks_create_options(
qapi_RbdEncryptionCreateOptionsLUKS_base(&encrypt->u.luks), qapi_RbdEncryptionCreateOptionsLUKS_base(&encrypt->u.luks),
&luks_opts.alg, &passphrase, &passphrase_len, errp); &luks_opts.alg, &passphrase, &luks_opts.passphrase_size,
errp);
if (r < 0) { if (r < 0) {
return r; return r;
} }
luks_opts.passphrase = passphrase; luks_opts.passphrase = passphrase;
luks_opts.passphrase_size = passphrase_len;
break; break;
} }
case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: { case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: {
@ -424,12 +423,12 @@ static int qemu_rbd_encryption_format(rbd_image_t image,
r = qemu_rbd_convert_luks_create_options( r = qemu_rbd_convert_luks_create_options(
qapi_RbdEncryptionCreateOptionsLUKS2_base( qapi_RbdEncryptionCreateOptionsLUKS2_base(
&encrypt->u.luks2), &encrypt->u.luks2),
&luks2_opts.alg, &passphrase, &passphrase_len, errp); &luks2_opts.alg, &passphrase, &luks2_opts.passphrase_size,
errp);
if (r < 0) { if (r < 0) {
return r; return r;
} }
luks2_opts.passphrase = passphrase; luks2_opts.passphrase = passphrase;
luks2_opts.passphrase_size = passphrase_len;
break; break;
} }
default: { default: {
@ -468,7 +467,6 @@ static int qemu_rbd_encryption_load(rbd_image_t image,
{ {
int r = 0; int r = 0;
g_autofree char *passphrase = NULL; g_autofree char *passphrase = NULL;
size_t passphrase_len;
rbd_encryption_luks1_format_options_t luks_opts; rbd_encryption_luks1_format_options_t luks_opts;
rbd_encryption_luks2_format_options_t luks2_opts; rbd_encryption_luks2_format_options_t luks2_opts;
rbd_encryption_format_t format; rbd_encryption_format_t format;
@ -483,12 +481,11 @@ static int qemu_rbd_encryption_load(rbd_image_t image,
opts_size = sizeof(luks_opts); opts_size = sizeof(luks_opts);
r = qemu_rbd_convert_luks_options( r = qemu_rbd_convert_luks_options(
qapi_RbdEncryptionOptionsLUKS_base(&encrypt->u.luks), qapi_RbdEncryptionOptionsLUKS_base(&encrypt->u.luks),
&passphrase, &passphrase_len, errp); &passphrase, &luks_opts.passphrase_size, errp);
if (r < 0) { if (r < 0) {
return r; return r;
} }
luks_opts.passphrase = passphrase; luks_opts.passphrase = passphrase;
luks_opts.passphrase_size = passphrase_len;
break; break;
} }
case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: { case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: {
@ -498,12 +495,11 @@ static int qemu_rbd_encryption_load(rbd_image_t image,
opts_size = sizeof(luks2_opts); opts_size = sizeof(luks2_opts);
r = qemu_rbd_convert_luks_options( r = qemu_rbd_convert_luks_options(
qapi_RbdEncryptionOptionsLUKS2_base(&encrypt->u.luks2), qapi_RbdEncryptionOptionsLUKS2_base(&encrypt->u.luks2),
&passphrase, &passphrase_len, errp); &passphrase, &luks2_opts.passphrase_size, errp);
if (r < 0) { if (r < 0) {
return r; return r;
} }
luks2_opts.passphrase = passphrase; luks2_opts.passphrase = passphrase;
luks2_opts.passphrase_size = passphrase_len;
break; break;
} }
default: { default: {