From 4efff565e5537e56922f78f96441643460e6fdf9 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 21 Sep 2010 21:17:32 +0000 Subject: [PATCH] --- yaml --- r: 211097 b: refs/heads/master c: 15cdeadaa5d76009e20c7792aed69f5a73808f97 h: refs/heads/master i: 211095: a4dbd72a1191c6d975fb5735afcca49c19fa1fac v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_extend.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c3d4d8e100d6..4ebf1bac8a91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b46ffb854554ff939701bdd492b81558da5706fc +refs/heads/master: 15cdeadaa5d76009e20c7792aed69f5a73808f97 diff --git a/trunk/net/netfilter/nf_conntrack_extend.c b/trunk/net/netfilter/nf_conntrack_extend.c index 7dcf7a404190..8d9e4c949b96 100644 --- a/trunk/net/netfilter/nf_conntrack_extend.c +++ b/trunk/net/netfilter/nf_conntrack_extend.c @@ -48,15 +48,17 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp) { unsigned int off, len; struct nf_ct_ext_type *t; + size_t alloc_size; rcu_read_lock(); t = rcu_dereference(nf_ct_ext_types[id]); BUG_ON(t == NULL); off = ALIGN(sizeof(struct nf_ct_ext), t->align); len = off + t->len; + alloc_size = t->alloc_size; rcu_read_unlock(); - *ext = kzalloc(t->alloc_size, gfp); + *ext = kzalloc(alloc_size, gfp); if (!*ext) return NULL;