From af84a64e1e4dabb5ff81ce3a5ef4d261e6ef7bd5 Mon Sep 17 00:00:00 2001
From: Holger Eitzenberger <holger@eitzenberger.org>
Date: Wed, 25 Mar 2009 18:44:01 +0100
Subject: [PATCH] --- yaml --- r: 136050 b: refs/heads/master c:
 af9d32ad6718b9a80fa89f557cc1fbb63a93ec15 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/include/net/netfilter/nf_conntrack_helper.h | 2 ++
 trunk/net/netfilter/nf_conntrack_helper.c         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26b866da128e..d2a8d12daa8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e487eb99cf9381a4f8254fa01747a85818da612b
+refs/heads/master: af9d32ad6718b9a80fa89f557cc1fbb63a93ec15
diff --git a/trunk/include/net/netfilter/nf_conntrack_helper.h b/trunk/include/net/netfilter/nf_conntrack_helper.h
index 66d65a7caa39..ee2a4b369a04 100644
--- a/trunk/include/net/netfilter/nf_conntrack_helper.h
+++ b/trunk/include/net/netfilter/nf_conntrack_helper.h
@@ -14,6 +14,8 @@
 
 struct module;
 
+#define NF_CT_HELPER_NAME_LEN	16
+
 struct nf_conntrack_helper
 {
 	struct hlist_node hnode;	/* Internal use. */
diff --git a/trunk/net/netfilter/nf_conntrack_helper.c b/trunk/net/netfilter/nf_conntrack_helper.c
index a51bdac9f3a0..805cfdd42303 100644
--- a/trunk/net/netfilter/nf_conntrack_helper.c
+++ b/trunk/net/netfilter/nf_conntrack_helper.c
@@ -142,6 +142,7 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
 
 	BUG_ON(me->expect_policy == NULL);
 	BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
+	BUG_ON(strlen(me->name) > NF_CT_HELPER_NAME_LEN - 1);
 
 	mutex_lock(&nf_ct_helper_mutex);
 	hlist_add_head_rcu(&me->hnode, &nf_ct_helper_hash[h]);