2021-10-13 03:53:22

by Ziyang Xuan (William)

Subject: [PATCH net] nfc: fix error handling of nfc_proto_register()

When nfc proto id is using, nfc_proto_register() return -EBUSY error
code, but forgot to unregister proto. Fix it by adding proto_unregister()
in the error handling case.

Fixes: c7fe3b52c128 ("NFC: add NFC socket family")
Signed-off-by: Ziyang Xuan <[email protected]>
---
net/nfc/af_nfc.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/net/nfc/af_nfc.c b/net/nfc/af_nfc.c
index 6024fad905ff..dda323e0a473 100644
--- a/net/nfc/af_nfc.c
+++ b/net/nfc/af_nfc.c
@@ -60,6 +60,9 @@ int nfc_proto_register(const struct nfc_protocol *nfc_proto)
proto_tab[nfc_proto->id] = nfc_proto;
write_unlock(&proto_tab_lock);

+ if (rc)
+ proto_unregister(nfc_proto->proto);
+
return rc;
}
EXPORT_SYMBOL(nfc_proto_register);
--
2.25.1

2021-10-13 09:56:18

by Krzysztof Kozlowski

Subject: Re: [PATCH net] nfc: fix error handling of nfc_proto_register()

On 13/10/2021 05:49, Ziyang Xuan wrote:
> When nfc proto id is using, nfc_proto_register() return -EBUSY error
> code, but forgot to unregister proto. Fix it by adding proto_unregister()
> in the error handling case.
>
> Fixes: c7fe3b52c128 ("NFC: add NFC socket family")
> Signed-off-by: Ziyang Xuan <[email protected]>
> ---
> net/nfc/af_nfc.c | 3 +++
> 1 file changed, 3 insertions(+)
>


Reviewed-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof

2021-10-14 00:43:22

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] nfc: fix error handling of nfc_proto_register()

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Wed, 13 Oct 2021 11:49:32 +0800 you wrote:
> When nfc proto id is using, nfc_proto_register() return -EBUSY error
> code, but forgot to unregister proto. Fix it by adding proto_unregister()
> in the error handling case.
>
> Fixes: c7fe3b52c128 ("NFC: add NFC socket family")
> Signed-off-by: Ziyang Xuan <[email protected]>
>
> [...]

Here is the summary with links:
- [net] nfc: fix error handling of nfc_proto_register()
https://git.kernel.org/netdev/net/c/0911ab31896f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html