OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8537de8
)
netfilter: xt_CT: fix wrong checking in the timeout assignment path
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Fri, 27 Apr 2012 00:00:50 +0000
(
02:00
+0200)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Mon, 30 Apr 2012 08:40:36 +0000
(10:40 +0200)
The current checking always succeeded. We have to check the first
character of the string to check that it's empty, thus, skipping
the timeout path.
This fixes the use of the CT target without the timeout option.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/xt_CT.c
patch
|
blob
|
history
diff --git
a/net/netfilter/xt_CT.c
b/net/netfilter/xt_CT.c
index
59530e9
..
3746d8b
100644
(file)
--- a/
net/netfilter/xt_CT.c
+++ b/
net/netfilter/xt_CT.c
@@
-227,7
+227,7
@@
static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
}
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
- if (info->timeout) {
+ if (info->timeout
[0]
) {
typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
struct nf_conn_timeout *timeout_ext;