Commit c5391c0e authored by Markus Elfring's avatar Markus Elfring Committed by Mikulas Patocka
Browse files

dm-crypt: Use up_read() together with key_put() only once in crypt_set_keyring_key() 



The combination of the calls “up_read(&key->sem)” and “key_put(key)”
was immediately used after a return code check for a set_key() call
in this function implementation.
Thus use such a function call pair only once instead directly
before the check.

This issue was transformed by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent c8691cd0

drivers/md/dm-crypt.c

+2 −5
Original line number Diff line number Diff line
@@ -2621,16 +2621,13 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_string 
	down_read(&key->sem);



	ret = set_key(cc, key);

	if (ret < 0) {

	up_read(&key->sem);

	key_put(key);

	if (ret < 0) {

		kfree_sensitive(new_key_string);

		return ret;

	}



	up_read(&key->sem);

	key_put(key);



	/* clear the flag since following operations may invalidate previously valid key */

	clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);