[PATCH 5.4 57/67] appletalk: Fix atalk_proc_init() return path

From: Greg Kroah-Hartman
Date: Mon Aug 10 2020 - 11:34:20 EST


From: Vincent Duvert <vincent.ldev@xxxxxxxxxx>

[ Upstream commit d0f6ba2ef2c1c95069509e71402e7d6d43452512 ]

Add a missing return statement to atalk_proc_init so it doesn't return
-ENOMEM when successful. This allows the appletalk module to load
properly.

Fixes: e2bcd8b0ce6e ("appletalk: use remove_proc_subtree to simplify procfs code")
Link: https://www.downtowndougbrown.com/2020/08/hacking-up-a-fix-for-the-broken-appletalk-kernel-module-in-linux-5-1-and-newer/
Reported-by: Christopher KOBAYASHI <chris@xxxxxxxxxxxx>
Reported-by: Doug Brown <doug@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Vincent Duvert <vincent.ldev@xxxxxxxxxx>
[lukas: add missing tags]
Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v5.1+
Cc: Yue Haibing <yuehaibing@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/appletalk/atalk_proc.c | 2 ++
1 file changed, 2 insertions(+)

--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -229,6 +229,8 @@ int __init atalk_proc_init(void)
sizeof(struct aarp_iter_state), NULL))
goto out;

+ return 0;
+
out:
remove_proc_subtree("atalk", init_net.proc_net);
return -ENOMEM;