From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Mon, 23 Sep 2024 17:05:39 +0200

A nvdimm_put_key(key) call was immediately used after a return code
check for a change_key() call in this function implementation.
Thus call such a function only once instead directly before the check.

This issue was transformed by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/nvdimm/security.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c
index a03e3c45f297..83c30980307c 100644
--- a/drivers/nvdimm/security.c
+++ b/drivers/nvdimm/security.c
@@ -152,12 +152,10 @@ static int nvdimm_key_revalidate(struct nvdimm *nvdimm)
         * verify that the key is good.
         */
        rc = nvdimm->sec.ops->change_key(nvdimm, data, data, NVDIMM_USER);
-       if (rc < 0) {
-               nvdimm_put_key(key);
+       nvdimm_put_key(key);
+       if (rc < 0)
                return rc;
-       }

-       nvdimm_put_key(key);
        nvdimm->sec.flags = nvdimm_security_flags(nvdimm, NVDIMM_USER);
        return 0;
 }
--
2.46.1


Reply via email to