[PATCH] timer: Add parenthesis around timer_setup() macro arguments

From: Kees Cook
Date: Wed Nov 01 2017 - 10:32:58 EST


In the case where expressions are passed as macro arguments, the LOCKDEP
version of the timer macros need enclosing parenthesis.

Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
---
include/linux/timer.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 09950482309b..a1af92bac0d5 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -173,11 +173,12 @@ static inline void timer_setup_on_stack(struct timer_list *timer,
* do want to keep the inline for argument type checking, though.
*/
# define timer_setup(timer, callback, flags) \
- __setup_timer(timer, (TIMER_FUNC_TYPE)callback, \
- (TIMER_DATA_TYPE)timer, flags)
+ __setup_timer((timer), (TIMER_FUNC_TYPE)(callback), \
+ (TIMER_DATA_TYPE)(timer), (flags))
# define timer_setup_on_stack(timer, callback, flags) \
- __setup_timer_on_stack(timer, (TIMER_FUNC_TYPE)callback,\
- (TIMER_DATA_TYPE)timer, flags)
+ __setup_timer_on_stack((timer), \
+ (TIMER_FUNC_TYPE)(callback), \
+ (TIMER_DATA_TYPE)(timer), (flags))
#endif

#define from_timer(var, callback_timer, timer_fieldname) \
--
2.7.4


--
Kees Cook
Pixel Security