| From 53b107987a351a0600505909c01916dfe52b2921 Mon Sep 17 00:00:00 2001 |
| From: Vincent Duvert <vincent.ldev@duvert.net> |
| Date: Sun, 2 Aug 2020 07:06:51 +0200 |
| Subject: [PATCH] appletalk: Fix atalk_proc_init() return path |
| |
| commit d0f6ba2ef2c1c95069509e71402e7d6d43452512 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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; |
| -- |
| 2.27.0 |
| |