summaryrefslogtreecommitdiff
path: root/net/appletalk
diff options
context:
space:
mode:
authorVincent Duvert <vincent.ldev@duvert.net>2020-08-02 07:06:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-11 15:33:40 +0200
commit5a963aa72107e8c779ce2adde41d475c709c3c52 (patch)
treeabb3e9801f7963b55fa795145542858f7a20cab6 /net/appletalk
parent3787b5a3ac67a1eb79629ba4fd19cc840b2a0f03 (diff)
appletalk: Fix atalk_proc_init() return path
[ 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@disavowed.jp> Reported-by: Doug Brown <doug@downtowndougbrown.com> Signed-off-by: Vincent Duvert <vincent.ldev@duvert.net> [lukas: add missing tags] Signed-off-by: Lukas Wunner <lukas@wunner.de> Cc: stable@vger.kernel.org # v5.1+ Cc: Yue Haibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/appletalk')
-rw-r--r--net/appletalk/atalk_proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index 550c6ca007cc..9c1241292d1d 100644
--- 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;