Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a70c522520d967844c01fa01459edc698fc54544

Authored by Herbert Xu
1 parent faae890883
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

crypto: ahash - Fix setkey crash 

When the alignment check was made unconditional for ahash we
may end up crashing on shash algorithms because we're always
calling alg->setkey instead of tfm->setkey.

This patch fixes it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

... ... @@ -145,7 +145,6 @@
145 145 static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key,
146 146 unsigned int keylen)
147 147 {
148   - struct ahash_alg *ahash = crypto_ahash_alg(tfm);
149 148 unsigned long alignmask = crypto_ahash_alignmask(tfm);
150 149 int ret;
151 150 u8 *buffer, *alignbuffer;
... ... @@ -158,7 +157,7 @@
158 157  
159 158 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
160 159 memcpy(alignbuffer, key, keylen);
161   - ret = ahash->setkey(tfm, alignbuffer, keylen);
  160 + ret = tfm->setkey(tfm, alignbuffer, keylen);
162 161 kzfree(buffer);
163 162 return ret;
164 163 }
165 164  
... ... @@ -166,13 +165,12 @@
166 165 int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,
167 166 unsigned int keylen)
168 167 {
169   - struct ahash_alg *ahash = crypto_ahash_alg(tfm);
170 168 unsigned long alignmask = crypto_ahash_alignmask(tfm);
171 169  
172 170 if ((unsigned long)key & alignmask)
173 171 return ahash_setkey_unaligned(tfm, key, keylen);
174 172  
175   - return ahash->setkey(tfm, key, keylen);
  173 + return tfm->setkey(tfm, key, keylen);
176 174 }
177 175 EXPORT_SYMBOL_GPL(crypto_ahash_setkey);
178 176