| Message ID | 20230306212650.230322-1-pchelkin@ispras.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] nfc: change order inside nfc_se_io error path | expand |
On 06/03/2023 22:26, Fedor Pchelkin wrote: > 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> Best regards, Krzysztof
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 7 Mar 2023 00:26:50 +0300 you wrote: > 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. > > [...] Here is the summary with links: - [v2] nfc: change order inside nfc_se_io error path https://git.kernel.org/netdev/net/c/7d834b4d1ab6 You are awesome, thank you!
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; }
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> --- v1->v2: remove 'no functional changes' statement from commit info net/nfc/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)