* [PATCH] ipv4: only allow increasing fib_info_hash_size
@ 2021-10-12 11:06 zhang kai
2021-10-12 13:55 ` David Ahern
0 siblings, 1 reply; 4+ messages in thread
From: zhang kai @ 2021-10-12 11:06 UTC (permalink / raw)
To: davem; +Cc: yoshfuji, dsahern, kuba, netdev, linux-kernel, zhang kai
and when failed to allocate memory, check fib_info_hash_size.
Signed-off-by: zhang kai <zhangkaiheb@126.com>
---
net/ipv4/fib_semantics.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index a632b66bc..7547708a9 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1403,17 +1403,20 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
if (!new_size)
new_size = 16;
- bytes = new_size * sizeof(struct hlist_head *);
- new_info_hash = fib_info_hash_alloc(bytes);
- new_laddrhash = fib_info_hash_alloc(bytes);
- if (!new_info_hash || !new_laddrhash) {
- fib_info_hash_free(new_info_hash, bytes);
- fib_info_hash_free(new_laddrhash, bytes);
- } else
- fib_info_hash_move(new_info_hash, new_laddrhash, new_size);
-
- if (!fib_info_hash_size)
- goto failure;
+
+ if (new_size > fib_info_hash_size) {
+ bytes = new_size * sizeof(struct hlist_head *);
+ new_info_hash = fib_info_hash_alloc(bytes);
+ new_laddrhash = fib_info_hash_alloc(bytes);
+ if (!new_info_hash || !new_laddrhash) {
+ fib_info_hash_free(new_info_hash, bytes);
+ fib_info_hash_free(new_laddrhash, bytes);
+
+ if (!fib_info_hash_size)
+ goto failure;
+ } else
+ fib_info_hash_move(new_info_hash, new_laddrhash, new_size);
+ }
}
fi = kzalloc(struct_size(fi, fib_nh, nhs), GFP_KERNEL);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: only allow increasing fib_info_hash_size
2021-10-12 11:06 [PATCH] ipv4: only allow increasing fib_info_hash_size zhang kai
@ 2021-10-12 13:55 ` David Ahern
[not found] ` <3bd88b51.6c7.17c77339c10.Coremail.zhangkaiheb@126.com>
0 siblings, 1 reply; 4+ messages in thread
From: David Ahern @ 2021-10-12 13:55 UTC (permalink / raw)
To: zhang kai, davem; +Cc: yoshfuji, dsahern, kuba, netdev, linux-kernel
On 10/12/21 5:06 AM, zhang kai wrote:
> and when failed to allocate memory, check fib_info_hash_size.
what problem are you trying to solve?
>
> Signed-off-by: zhang kai <zhangkaiheb@126.com>
> ---
> net/ipv4/fib_semantics.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
> index a632b66bc..7547708a9 100644
> --- a/net/ipv4/fib_semantics.c
> +++ b/net/ipv4/fib_semantics.c
> @@ -1403,17 +1403,20 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
>
> if (!new_size)
> new_size = 16;
> - bytes = new_size * sizeof(struct hlist_head *);
> - new_info_hash = fib_info_hash_alloc(bytes);
> - new_laddrhash = fib_info_hash_alloc(bytes);
> - if (!new_info_hash || !new_laddrhash) {
> - fib_info_hash_free(new_info_hash, bytes);
> - fib_info_hash_free(new_laddrhash, bytes);
> - } else
> - fib_info_hash_move(new_info_hash, new_laddrhash, new_size);
> -
> - if (!fib_info_hash_size)
> - goto failure;
> +
> + if (new_size > fib_info_hash_size) {
> + bytes = new_size * sizeof(struct hlist_head *);
> + new_info_hash = fib_info_hash_alloc(bytes);
> + new_laddrhash = fib_info_hash_alloc(bytes);
> + if (!new_info_hash || !new_laddrhash) {
> + fib_info_hash_free(new_info_hash, bytes);
> + fib_info_hash_free(new_laddrhash, bytes);
> +
> + if (!fib_info_hash_size)
> + goto failure;
> + } else
> + fib_info_hash_move(new_info_hash, new_laddrhash, new_size);
> + }
> }
>
> fi = kzalloc(struct_size(fi, fib_nh, nhs), GFP_KERNEL);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-14 2:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 11:06 [PATCH] ipv4: only allow increasing fib_info_hash_size zhang kai
2021-10-12 13:55 ` David Ahern
[not found] ` <3bd88b51.6c7.17c77339c10.Coremail.zhangkaiheb@126.com>
2021-10-13 2:33 ` David Ahern
[not found] ` <5219d023.14d1.17c778a9a18.Coremail.zhangkaiheb@126.com>
[not found] ` <1e3f52c3.350f.17c78afcc56.Coremail.zhangkaiheb@126.com>
2021-10-14 2:51 ` David Ahern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).