af_key: relax availability checks for skb size calculation
Subsystems (3)
PATCH 1/1 af_key: relax availability checks for skb size calculation
From: Cong Wang <[email protected]>
xfrm_probe_algs() probes kernel crypto modules and changes the availability of struct xfrm_algo_desc. But there is a small window where ealg->available and aalg->available get changed between count_ah_combs()/count_esp_combs() and dump_ah_combs()/dump_esp_combs(), in this case we may allocate a smaller skb but later put a larger amount of data and trigger the panic in skb_put().
Fix this by relaxing the checks when counting the size, that is, skipping the test of ->available. We may waste some memory for a few of sizeof(struct sadb_comb), but it is still much better than a panic.
--- net/key/af_key.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/key/af_key.c +3 -3
@@ -2902,7 +2902,7 @@ static int count_ah_combs(const struct xfrm_tmpl *t)break ;if (!aalg->pfkey_supported)continue ; -if (aalg_tmpl_set (t, aalg) && aalg->available) +if (aalg_tmpl_set (t, aalg)) sz +=sizeof (struct sadb_comb ); }return sz +sizeof (struct sadb_prop );
@@ -2920,7 +2920,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t)if (!ealg->pfkey_supported)continue ; -if (!(ealg_tmpl_set (t, ealg) && ealg->available)) +if (!(ealg_tmpl_set (t, ealg)))continue ;for (k =1 ; ; k++) {
@@ -2931,7 +2931,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t)if (!aalg->pfkey_supported)continue ; -if (aalg_tmpl_set (t, aalg) && aalg->available) +if (aalg_tmpl_set (t, aalg)) sz +=sizeof (struct sadb_comb ); } }
Signature · 1 line
2.25.1
Steffen Klassert
maintainerQuoted 9 lines · Cong Wang
From: Cong Wang <[email protected]>
xfrm_probe_algs()probes kernel crypto modules and changes the availability of structxfrm_algo_desc. But there is a small window whereealg->availableandaalg->availableget changed between count_ah_combs()/count_esp_combs() and dump_ah_combs()/dump_esp_combs(), in this case we may allocate a smaller skb but later put a larger amount of data and trigger the panic inskb_put().
Quoted 8 lines
Fix this by relaxing the checks when counting the size, that is, skipping the test of ->available. We may waste some memory for a few of
sizeof(struct sadb_comb), but it is still much better than a panic.Reported-by [email protected]Cc Steffen Klassert <[email protected]>Cc Herbert Xu <[email protected]>Signed-off-by Cong Wang <[email protected]>
Patch applied, thanks!