dm-crypt: Use common error handling code in crypt_set_keyring_key()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function implementation.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index dae2fe3cb182d855fce981223ed4b4bfb950031e..5228b03b6fe07006d07de7526d4190c3501a5be9 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -2614,32 +2614,31 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_string
 
        key = request_key(type, key_desc + 1, NULL);
        if (IS_ERR(key)) {
-               kfree_sensitive(new_key_string);
-               return PTR_ERR(key);
+               ret = PTR_ERR(key);
+               goto free_new_key_string;
        }
 
        down_read(&key->sem);
-
        ret = set_key(cc, key);
        up_read(&key->sem);
        key_put(key);
-       if (ret < 0) {
-               kfree_sensitive(new_key_string);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_new_key_string;
 
        /* clear the flag since following operations may invalidate previously valid key */
        clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);
 
        ret = crypt_setkey(cc);
+       if (ret)
+               goto free_new_key_string;
 
-       if (!ret) {
-               set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
-               kfree_sensitive(cc->key_string);
-               cc->key_string = new_key_string;
-       } else
-               kfree_sensitive(new_key_string);
+       set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
+       kfree_sensitive(cc->key_string);
+       cc->key_string = new_key_string;
+       return 0;
 
+free_new_key_string:
+       kfree_sensitive(new_key_string);
        return ret;
 }