---

yaml --- r: 102703 b: refs/heads/master c: 31d8519 h: refs/heads/master i: 102701: b284cc7 102699: 49622af 102695: 8294569 102687: cb01e13 v: v3
git-mirror · Jun 9, 2008 · f794ab0 · f794ab0
1 parent fa190eb
commit f794ab0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17e6e59f0a1d7188d783c15dc3ccebd95a0840cd
+refs/heads/master: 31d8519c9cf87e9d8a0cc5b9734fda02af66d7e2
diff --git a/trunk/net/netfilter/nf_conntrack_extend.c b/trunk/net/netfilter/nf_conntrack_extend.c
@@ -88,13 +88,11 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
 	newlen = newoff + t->len;
 	rcu_read_unlock();
 
-	if (newlen >= ksize(ct->ext)) {
-		new = kmalloc(newlen, gfp);
-		if (!new)
-			return NULL;
-
-		memcpy(new, ct->ext, ct->ext->len);
+	new = krealloc(ct->ext, newlen, gfp);
+	if (!new)
+		return NULL;
 
+	if (new != ct->ext) {
 		for (i = 0; i < NF_CT_EXT_NUM; i++) {
 			if (!nf_ct_ext_exist(ct, i))
 				continue;