diff options
author | Fedor Pchelkin <pchelkin@ispras.ru> | 2023-03-07 00:26:50 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-17 08:31:42 +0100 |
commit | 6fc2e5b445a7e5610d089639e4e9992fbfcb5d27 (patch) | |
tree | 9e7fc3df92a24380217061e1e85e48fd009ec13f /net | |
parent | 59eee0cdf8c036f554add97a4da7c06d7a9ff34a (diff) | |
download | linux-stable-6fc2e5b445a7e5610d089639e4e9992fbfcb5d27.tar.gz linux-stable-6fc2e5b445a7e5610d089639e4e9992fbfcb5d27.tar.bz2 linux-stable-6fc2e5b445a7e5610d089639e4e9992fbfcb5d27.zip |
nfc: change order inside nfc_se_io error path
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/nfc/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 2c5443ce449c..f705800b2248 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -1464,8 +1464,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; } |