* [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211.
@ 2021-09-25 6:10 MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 1/3] net/mlx5e: check return value of rhashtable_init MichelleJin
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: MichelleJin @ 2021-09-25 6:10 UTC (permalink / raw)
To: davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.
The three patches are essentially the same logic.
v1->v2:
- change commit message
- fix possible memory leaks
v2->v3:
- split patch into mlx5e, ipv6, mac80211.
MichelleJin (3):
net/mlx5e: check return value of rhashtable_init
net: ipv6: check return value of rhashtable_init
net: mac80211: check return value of rhashtable_init
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +++++++++++---
net/ipv6/ila/ila_xlat.c | 6 +++++-
net/ipv6/seg6.c | 6 +++++-
net/ipv6/seg6_hmac.c | 6 +++++-
net/mac80211/mesh_pathtbl.c | 5 ++++-
5 files changed, 30 insertions(+), 7 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next v3 1/3] net/mlx5e: check return value of rhashtable_init
2021-09-25 6:10 [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 MichelleJin
@ 2021-09-25 6:10 ` MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 2/3] net: ipv6: " MichelleJin
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: MichelleJin @ 2021-09-25 6:10 UTC (permalink / raw)
To: davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.
Signed-off-by: MichelleJin <shjy180909@gmail.com>
---
v1->v2:
- change commit message
- fix unneeded destroying of ht
v2->v3:
- nothing changed
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index 6c949abcd2e1..225748a9e52a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -2127,12 +2127,20 @@ mlx5_tc_ct_init(struct mlx5e_priv *priv, struct mlx5_fs_chains *chains,
ct_priv->post_act = post_act;
mutex_init(&ct_priv->control_lock);
- rhashtable_init(&ct_priv->zone_ht, &zone_params);
- rhashtable_init(&ct_priv->ct_tuples_ht, &tuples_ht_params);
- rhashtable_init(&ct_priv->ct_tuples_nat_ht, &tuples_nat_ht_params);
+ if (rhashtable_init(&ct_priv->zone_ht, &zone_params))
+ goto err_ct_zone_ht;
+ if (rhashtable_init(&ct_priv->ct_tuples_ht, &tuples_ht_params))
+ goto err_ct_tuples_ht;
+ if (rhashtable_init(&ct_priv->ct_tuples_nat_ht, &tuples_nat_ht_params))
+ goto err_ct_tuples_nat_ht;
return ct_priv;
+err_ct_tuples_nat_ht:
+ rhashtable_destroy(&ct_priv->ct_tuples_ht);
+err_ct_tuples_ht:
+ rhashtable_destroy(&ct_priv->zone_ht);
+err_ct_zone_ht:
err_ct_nat_tbl:
mlx5_chains_destroy_global_table(chains, ct_priv->ct);
err_ct_tbl:
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v3 2/3] net: ipv6: check return value of rhashtable_init
2021-09-25 6:10 [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 1/3] net/mlx5e: check return value of rhashtable_init MichelleJin
@ 2021-09-25 6:10 ` MichelleJin
2021-09-25 16:38 ` David Ahern
2021-09-25 6:10 ` [PATCH net-next v3 3/3] net: mac80211: " MichelleJin
2021-09-25 7:26 ` [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 진성희
3 siblings, 1 reply; 7+ messages in thread
From: MichelleJin @ 2021-09-25 6:10 UTC (permalink / raw)
To: davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.
Signed-off-by: MichelleJin <shjy180909@gmail.com>
---
v1->v2:
- change commit message
- fix possible memory leaks
v2->v3:
- nothing changed
net/ipv6/ila/ila_xlat.c | 6 +++++-
net/ipv6/seg6.c | 6 +++++-
net/ipv6/seg6_hmac.c | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c
index a1ac0e3d8c60..47447f0241df 100644
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -610,7 +610,11 @@ int ila_xlat_init_net(struct net *net)
if (err)
return err;
- rhashtable_init(&ilan->xlat.rhash_table, &rht_params);
+ err = rhashtable_init(&ilan->xlat.rhash_table, &rht_params);
+ if (err) {
+ free_bucket_spinlocks(ilan->xlat.locks);
+ return err;
+ }
return 0;
}
diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c
index e412817fba2f..89a87da141b6 100644
--- a/net/ipv6/seg6.c
+++ b/net/ipv6/seg6.c
@@ -374,7 +374,11 @@ static int __net_init seg6_net_init(struct net *net)
net->ipv6.seg6_data = sdata;
#ifdef CONFIG_IPV6_SEG6_HMAC
- seg6_hmac_net_init(net);
+ if (seg6_hmac_net_init(net)) {
+ kfree(sdata);
+ kfree(sdata->tun_src);
+ return -ENOMEM;
+ };
#endif
return 0;
diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c
index 687d95dce085..a78554993163 100644
--- a/net/ipv6/seg6_hmac.c
+++ b/net/ipv6/seg6_hmac.c
@@ -403,9 +403,13 @@ EXPORT_SYMBOL(seg6_hmac_init);
int __net_init seg6_hmac_net_init(struct net *net)
{
+ int err;
+
struct seg6_pernet_data *sdata = seg6_pernet(net);
- rhashtable_init(&sdata->hmac_infos, &rht_params);
+ err = rhashtable_init(&sdata->hmac_infos, &rht_params);
+ if (err)
+ return err;
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v3 2/3] net: ipv6: check return value of rhashtable_init
2021-09-25 6:10 ` [PATCH net-next v3 2/3] net: ipv6: " MichelleJin
@ 2021-09-25 16:38 ` David Ahern
0 siblings, 0 replies; 7+ messages in thread
From: David Ahern @ 2021-09-25 16:38 UTC (permalink / raw)
To: MichelleJin, davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
On 9/25/21 12:10 AM, MichelleJin wrote:
> diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c
> index 687d95dce085..a78554993163 100644
> --- a/net/ipv6/seg6_hmac.c
> +++ b/net/ipv6/seg6_hmac.c
> @@ -403,9 +403,13 @@ EXPORT_SYMBOL(seg6_hmac_init);
>
> int __net_init seg6_hmac_net_init(struct net *net)
> {
> + int err;
> +
> struct seg6_pernet_data *sdata = seg6_pernet(net);
>
> - rhashtable_init(&sdata->hmac_infos, &rht_params);
> + err = rhashtable_init(&sdata->hmac_infos, &rht_params);
> + if (err)
> + return err;
>
> return 0;
Just:
return rhashtable_init(&sdata->hmac_infos, &rht_params);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next v3 3/3] net: mac80211: check return value of rhashtable_init
2021-09-25 6:10 [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 1/3] net/mlx5e: check return value of rhashtable_init MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 2/3] net: ipv6: " MichelleJin
@ 2021-09-25 6:10 ` MichelleJin
2021-09-25 7:26 ` [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 진성희
3 siblings, 0 replies; 7+ messages in thread
From: MichelleJin @ 2021-09-25 6:10 UTC (permalink / raw)
To: davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.
Signed-off-by: MichelleJin <shjy180909@gmail.com>
---
v1->v2:
- change commit message
- fix possible memory leaks
v2->v3:
- nothing changed
net/mac80211/mesh_pathtbl.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index efbefcbac3ac..7cab1cf09bf1 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -60,7 +60,10 @@ static struct mesh_table *mesh_table_alloc(void)
atomic_set(&newtbl->entries, 0);
spin_lock_init(&newtbl->gates_lock);
spin_lock_init(&newtbl->walk_lock);
- rhashtable_init(&newtbl->rhead, &mesh_rht_params);
+ if (rhashtable_init(&newtbl->rhead, &mesh_rht_params)) {
+ kfree(newtbl);
+ return NULL;
+ }
return newtbl;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211.
2021-09-25 6:10 [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 MichelleJin
` (2 preceding siblings ...)
2021-09-25 6:10 ` [PATCH net-next v3 3/3] net: mac80211: " MichelleJin
@ 2021-09-25 7:26 ` 진성희
3 siblings, 0 replies; 7+ messages in thread
From: 진성희 @ 2021-09-25 7:26 UTC (permalink / raw)
To: davem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
2021년 9월 25일 (토) 오후 3:10, MichelleJin <shjy180909@gmail.com>님이 작성:
>
> When rhashtable_init() fails, it returns -EINVAL.
> However, since error return value of rhashtable_init is not checked,
> it can cause use of uninitialized pointers.
> So, fix unhandled errors of rhashtable_init.
> The three patches are essentially the same logic.
>
> v1->v2:
> - change commit message
> - fix possible memory leaks
> v2->v3:
> - split patch into mlx5e, ipv6, mac80211.
>
> MichelleJin (3):
> net/mlx5e: check return value of rhashtable_init
> net: ipv6: check return value of rhashtable_init
> net: mac80211: check return value of rhashtable_init
>
> drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +++++++++++---
> net/ipv6/ila/ila_xlat.c | 6 +++++-
> net/ipv6/seg6.c | 6 +++++-
> net/ipv6/seg6_hmac.c | 6 +++++-
> net/mac80211/mesh_pathtbl.c | 5 ++++-
> 5 files changed, 30 insertions(+), 7 deletions(-)
>
> --
> 2.25.1
>
There are new build warnings in net/ipv6/seg6.c.
I'll fix it and send v4 soon.
Thank you.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211.
@ 2021-09-25 6:05 MichelleJin
0 siblings, 0 replies; 7+ messages in thread
From: MichelleJin @ 2021-09-25 6:05 UTC (permalink / raw)
To: avem, kuba, yoshfuji, dsahern, johannes
Cc: saeedm, leon, roid, paulb, ozsh, vladbu, lariel, cmi, netdev
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.
The three patches are essentially the same logic.
v1->v2:
- change commit message
- fix possible memory leaks
v2->v3:
- split patch into mlx5e, ipv6, mac80211.
MichelleJin (3):
net/mlx5e: check return value of rhashtable_init
net: ipv6: check return value of rhashtable_init
net: mac80211: check return value of rhashtable_init
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +++++++++++---
net/ipv6/ila/ila_xlat.c | 6 +++++-
net/ipv6/seg6.c | 6 +++++-
net/ipv6/seg6_hmac.c | 6 +++++-
net/mac80211/mesh_pathtbl.c | 5 ++++-
5 files changed, 30 insertions(+), 7 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-09-25 16:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-25 6:10 [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 1/3] net/mlx5e: check return value of rhashtable_init MichelleJin
2021-09-25 6:10 ` [PATCH net-next v3 2/3] net: ipv6: " MichelleJin
2021-09-25 16:38 ` David Ahern
2021-09-25 6:10 ` [PATCH net-next v3 3/3] net: mac80211: " MichelleJin
2021-09-25 7:26 ` [PATCH net-next v3 0/3] check return value of rhashtable_init in mlx5e, ipv6, mac80211 진성희
-- strict thread matches above, loose matches on Subject: below --
2021-09-25 6:05 MichelleJin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.