summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-09-03 12:59:15 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2010-09-03 12:59:15 +0200
commitaf3062777d3f99e9371aeeded872a2cbeb0b5a0c (patch)
treeb9f86d2883674e319fc83e9df9e00913781e014d
parent620734ead3c7eebb085b22c783e65aff59257b19 (diff)
ct: fix regression with helpers for Linux kernel >= 2.6.34
Since Linux kernel 2.6.34, the attribute validation for CTA_HELP_NAME requires that the string must be NULL terminated. I think that this should be fixed in the kernel instead since it breaks old binaries of the library. However, we're already in 2.6.36-rc, so let's fix it in user-space and hope that everyone upgrades. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/conntrack/build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conntrack/build.c b/src/conntrack/build.c
index 043c401..b878ddd 100644
--- a/src/conntrack/build.c
+++ b/src/conntrack/build.c
@@ -361,7 +361,7 @@ static void __build_helper_name(struct nfnlhdr *req,
size,
CTA_HELP_NAME,
ct->helper_name,
- strlen(ct->helper_name));
+ strlen(ct->helper_name)+1);
nfnl_nest_end(&req->nlh, nest);
}