From 672548ce30f61e94c8465a560a54a4a8fe568c06 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Tue, 19 Jun 2018 13:59:11 +0200 Subject: [PATCH] zkey: Fix generate and import leaving key in an inconsistent state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a volume or APQN association is made while generating or importing a key, and a duplicate association is detected, then this may leave the key in an inconsistent state. Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/keystore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zkey/keystore.c b/zkey/keystore.c index 5e27ec5c..68b3749f 100644 --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -1534,7 +1534,7 @@ int keystore_generate_key(struct keystore *keystore, const char *name, out_free_props: if (key_props != NULL) properties_free(key_props); - if (rc != 0 && rc != -EEXIST) + if (rc != 0) remove(file_names.skey_filename); out_free_key_filenames: _keystore_free_key_filenames(&file_names); @@ -1617,7 +1617,7 @@ int keystore_import_key(struct keystore *keystore, const char *name, out_free_props: if (key_props != NULL) properties_free(key_props); - if (rc != 0 && rc != -EEXIST) + if (rc != 0) remove(file_names.skey_filename); out_free_key_filenames: _keystore_free_key_filenames(&file_names);