Skip to content

Commit

Permalink
netfilter: nf_conntrack_extend: use krealloc() in nf_conntrack_extend…
Browse files Browse the repository at this point in the history
….c V2

The ksize() API is going away because it is being abused and it doesn't even
work consistenly across different allocators. Therefore, convert
net/netfilter/nf_conntrack_extend.c to use krealloc().

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pekka Enberg authored and David S. Miller committed Jun 9, 2008
1 parent 17e6e59 commit 31d8519
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions net/netfilter/nf_conntrack_extend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 31d8519

Please sign in to comment.