Skip to content

Commit 7d834b4

Browse files
pchelkin91kuba-moo
authored andcommitted
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 25ff6f8 ("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>
1 parent 382e363 commit 7d834b4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/nfc/netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,8 +1446,8 @@ static int nfc_se_io(struct nfc_dev *dev, u32 se_idx,
14461446
return rc;
14471447

14481448
error:
1449-
kfree(cb_context);
14501449
device_unlock(&dev->dev);
1450+
kfree(cb_context);
14511451
return rc;
14521452
}
14531453

0 commit comments

Comments
 (0)