block: Fix regression in sed-opal for a saved key.
authorMilan Broz <gmazyland@gmail.com>
Tue, 3 Oct 2023 10:02:09 +0000 (12:02 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 13 Oct 2023 14:16:08 +0000 (08:16 -0600)
commit4eaf0932c69bdc56d2c2af30404f9c918b1f6295
treeb7ba155f110f0ad46ac4802e116589c338d5202b
parent1364a3c391aedfeb32aa025303ead3d7c91cdf9d
block: Fix regression in sed-opal for a saved key.

The commit 3bfeb61256643281ac4be5b8a57e9d9da3db4335
introduced the use of keyring for sed-opal.

Unfortunately, there is also a possibility to save
the Opal key used in opal_lock_unlock().

This patch switches the order of operation, so the cached
key is used instead of failure for opal_get_key.

The problem was found by the cryptsetup Opal test recently
added to the cryptsetup tree.

Fixes: 3bfeb6125664 ("block: sed-opal: keyring support for SED keys")
Tested-by: Ondrej Kozina <okozina@redhat.com>
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Link: https://lore.kernel.org/r/20231003100209.380037-1-gmazyland@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/sed-opal.c