From: Fedor Pchelkin <pchelkin@ispras.ru>

Date: Tue, 7 Mar 2023 00:26:50 +0300

Subject: [PATCH] nfc: change order inside nfc_se_io error path

References: bsc#1012628

Patch-mainline: 6.2.7

Git-commit: 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81

commit 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81 upstream.

cb_context should be freed on the error path in nfc_se_io as stated by

commit 25ff6f8a5a3b ("nfc: fix memory leak of se_io context in

nfc_genl_se_io").

Make the error path in nfc_se_io unwind everything in reverse order, i.e.

free the cb_context after unlocking the device.

Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Link: https://lore.kernel.org/r/20230306212650.230322-1-pchelkin@ispras.ru

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 net/nfc/netlink.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c

index 348bf561..b9264e73 100644

--- a/net/nfc/netlink.c

+++ b/net/nfc/netlink.c

@@ -1446,8 +1446,8 @@ static int nfc_se_io(struct nfc_dev *dev, u32 se_idx,

 	return rc;

 error:

-	kfree(cb_context);

 	device_unlock(&dev->dev);

+	kfree(cb_context);

 	return rc;

 }

-- 

2.35.3