From: Sasha Levin <sashal@kernel.org>
Date: Fri, 19 Apr 2019 13:48:35 +0000 (-0400)
Subject: fixes for 4.14
X-Git-Tag: v4.9.170~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfa3a22f07259b83b0ae01ed2c199e8d5b0c0ae9;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/appletalk-fix-compile-regression.patch b/queue-4.14/appletalk-fix-compile-regression.patch
new file mode 100644
index 00000000000..2ff99fe0071
--- /dev/null
+++ b/queue-4.14/appletalk-fix-compile-regression.patch
@@ -0,0 +1,69 @@
+From 816f074158ac59abef9cd5437bc177c2e7588ec6 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 6 Mar 2019 11:52:36 +0100
+Subject: appletalk: Fix compile regression
+
+[ Upstream commit 27da0d2ef998e222a876c0cec72aa7829a626266 ]
+
+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>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/atalk.h | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/atalk.h b/include/linux/atalk.h
+index 212eb8c7fed6..03885e63f92b 100644
+--- a/include/linux/atalk.h
++++ b/include/linux/atalk.h
+@@ -154,16 +154,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__ */
+-- 
+2.19.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
index b8144e16162..9647ca45482 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -90,3 +90,4 @@ bpf-fix-selftests-are-changes-for-cve-2019-7308.patch
 tools-include-adopt-linux-bits.h.patch
 net-stmmac-set-dma-ring-length-before-enabling-the-dma.patch
 mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch
+appletalk-fix-compile-regression.patch