diff options
| author | David S. Miller <[email protected]> | 2019-03-03 13:01:49 -0800 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-03-03 13:01:49 -0800 |
| commit | 9b1b4c00371bbbdac796d6915e0372d725c4e338 (patch) | |
| tree | 935843fcf2a3449d2915c4620da0140446cc7b3d /include/linux | |
| parent | 084e5bb16bd7dc2b551bbd9fb358bf73e03ee8d8 (diff) | |
| parent | 6377f787aeb945cae7abbb6474798de129e1f3ac (diff) | |
Merge branch 'appletalk-small-cleanup-and-bugfix'
Yue Haibing says:
====================
appletalk: small cleanup and bugfix
v2:
- Add cover letter log
This patch series mainly fix a use-after-free bug in atalk_proc_exit.
patch 1 use remove_proc_subtree helper to simplify atalk_proc fs code,
also some other cleanup.
patch 2 add proper error cleanup path in atalk_init to fix the issue, which
based on the patch 1 because of the change of atalk_proc_exit context.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atalk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h index 23f805562f4e..5a90f28d5ff2 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h @@ -158,7 +158,7 @@ extern int sysctl_aarp_retransmit_limit; extern int sysctl_aarp_resolve_time; #ifdef CONFIG_SYSCTL -extern void atalk_register_sysctl(void); +extern int atalk_register_sysctl(void); extern void atalk_unregister_sysctl(void); #else #define atalk_register_sysctl() do { } while(0) |