aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-12-16 19:03:31 -0800
committerZiyan <jaraidaniel@gmail.com>2016-03-11 01:03:51 +0100
commit39d219fc30611eb94365bc0a62a4d320b7167c0e (patch)
treef117f54438bf7a40b8b639c218358d36fcb0e98a /net/netfilter
parent2f04c967fac63591d82362ec605a6a06ba540c71 (diff)
downloadkernel_samsung_tuna-39d219fc30611eb94365bc0a62a4d320b7167c0e.zip
kernel_samsung_tuna-39d219fc30611eb94365bc0a62a4d320b7167c0e.tar.gz
kernel_samsung_tuna-39d219fc30611eb94365bc0a62a4d320b7167c0e.tar.bz2
netfilter: IDLETIMER: fix invalid deference of timer
"timer" was checked for null, but used later without being re-checked. Change-Id: Ib4d08cd49860c9f157d1cac556705ba85cd44f4e Reported-by: dan.carpenter@oracle.com Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/xt_IDLETIMER.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index c6a76a8..5ec9126 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -188,7 +188,7 @@ static ssize_t idletimer_tg_show(struct kobject *kobj, struct attribute *attr,
return sprintf(buf, "%u\n",
jiffies_to_msecs(expires - now) / 1000);
- if (timer->send_nl_msg)
+ if (timer && timer->send_nl_msg)
return sprintf(buf, "0 %d\n",
jiffies_to_msecs(now - expires) / 1000);
else