diff mbox series

[1/2] appletalk: Fix compile regression

Message ID 20190306105249.2165038-1-arnd@arndb.de
State Accepted
Commit 27da0d2ef998e222a876c0cec72aa7829a626266
Headers show
Series [1/2] appletalk: Fix compile regression | expand

Commit Message

Arnd Bergmann March 6, 2019, 10:52 a.m. UTC
A bugfix just broke compilation of appletalk when CONFIG_SYSCTL
is disabled:

In file included from net/appletalk/ddp.c:65:
net/appletalk/ddp.c: In function 'atalk_init':
include/linux/atalk.h:164:34: error: expected expression before 'do'
 #define atalk_register_sysctl()  do { } while(0)
                                  ^~
net/appletalk/ddp.c:1934:7: note: in expansion of macro 'atalk_register_sysctl'
  rc = atalk_register_sysctl();

This is easier to avoid by using conventional inline functions
as stubs rather than macros. The header already has inline
functions for other purposes, so I'm changing over all the
macros for consistency.

Fixes: 6377f787aeb9 ("appletalk: Fix use-after-free in atalk_proc_exit")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
resent with mailing list on Cc
---
 include/linux/atalk.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

-- 
2.20.0

Comments

David Miller March 6, 2019, 6:47 p.m. UTC | #1
From: Arnd Bergmann <arnd@arndb.de>

Date: Wed,  6 Mar 2019 11:52:36 +0100

> A bugfix just broke compilation of appletalk when CONFIG_SYSCTL

> is disabled:

> 

> In file included from net/appletalk/ddp.c:65:

> net/appletalk/ddp.c: In function 'atalk_init':

> include/linux/atalk.h:164:34: error: expected expression before 'do'

>  #define atalk_register_sysctl()  do { } while(0)

>                                   ^~

> net/appletalk/ddp.c:1934:7: note: in expansion of macro 'atalk_register_sysctl'

>   rc = atalk_register_sysctl();

> 

> This is easier to avoid by using conventional inline functions

> as stubs rather than macros. The header already has inline

> functions for other purposes, so I'm changing over all the

> macros for consistency.

> 

> Fixes: 6377f787aeb9 ("appletalk: Fix use-after-free in atalk_proc_exit")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Applied.
diff mbox series

Patch

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 5a90f28d5ff2..d5cfc0b15b76 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -161,16 +161,26 @@  extern int sysctl_aarp_resolve_time;
 extern int atalk_register_sysctl(void);
 extern void atalk_unregister_sysctl(void);
 #else
-#define atalk_register_sysctl()		do { } while(0)
-#define atalk_unregister_sysctl()	do { } while(0)
+static inline int atalk_register_sysctl(void)
+{
+	return 0;
+}
+static inline void atalk_unregister_sysctl(void)
+{
+}
 #endif
 
 #ifdef CONFIG_PROC_FS
 extern int atalk_proc_init(void);
 extern void atalk_proc_exit(void);
 #else
-#define atalk_proc_init()	({ 0; })
-#define atalk_proc_exit()	do { } while(0)
+static inline int atalk_proc_init(void)
+{
+	return 0;
+}
+static inline void atalk_proc_exit(void)
+{
+}
 #endif /* CONFIG_PROC_FS */
 
 #endif /* __LINUX_ATALK_H__ */