diff options
| author | Fedor Pchelkin <pchelkin@ispras.ru> | 2023-03-06 22:26:50 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-07 22:37:05 +0100 |
| commit | 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81 (patch) | |
| tree | 876891ee5486c8fddfbc83306586293415b6cbfd /net/nfc | |
| parent | net: usb: qmi_wwan: add Telit 0x1080 composition (diff) | |
| download | linux-7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81.tar.xz linux-7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81.zip | |
nfc: change order inside nfc_se_io error path
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>
Diffstat (limited to 'net/nfc')
| -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 348bf561bc9f..b9264e730fd9 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; } |