Commit 88f83491 authored by Joonwoo Park's avatar Joonwoo Park Committed by David S. Miller

[IPV4] fib_semantics: kmalloc + memset conversion to kzalloc

fib_semantics: kmalloc + memset conversion to kzalloc
fix to avoid memset entirely.
Signed-off-by: default avatarJoonwoo Park <joonwpark81@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dcaee95a
...@@ -605,10 +605,10 @@ static inline unsigned int fib_laddr_hashfn(__be32 val) ...@@ -605,10 +605,10 @@ static inline unsigned int fib_laddr_hashfn(__be32 val)
static struct hlist_head *fib_hash_alloc(int bytes) static struct hlist_head *fib_hash_alloc(int bytes)
{ {
if (bytes <= PAGE_SIZE) if (bytes <= PAGE_SIZE)
return kmalloc(bytes, GFP_KERNEL); return kzalloc(bytes, GFP_KERNEL);
else else
return (struct hlist_head *) return (struct hlist_head *)
__get_free_pages(GFP_KERNEL, get_order(bytes)); __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(bytes));
} }
static void fib_hash_free(struct hlist_head *hash, int bytes) static void fib_hash_free(struct hlist_head *hash, int bytes)
...@@ -712,12 +712,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg) ...@@ -712,12 +712,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
if (!new_info_hash || !new_laddrhash) { if (!new_info_hash || !new_laddrhash) {
fib_hash_free(new_info_hash, bytes); fib_hash_free(new_info_hash, bytes);
fib_hash_free(new_laddrhash, bytes); fib_hash_free(new_laddrhash, bytes);
} else { } else
memset(new_info_hash, 0, bytes);
memset(new_laddrhash, 0, bytes);
fib_hash_move(new_info_hash, new_laddrhash, new_size); fib_hash_move(new_info_hash, new_laddrhash, new_size);
}
if (!fib_hash_size) if (!fib_hash_size)
goto failure; goto failure;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment