Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: testmgr - add guard to dst buffer for ahash_export

Add a guard to 'state' buffer and warn if its consistency after
call to crypto_ahash_export() changes, so that any write that
goes beyond advertised statesize (and thus causing potential
memory corruption [1]) is more visible.

[1] https://marc.info/?l=linux-crypto-vger&m=147467656516085

Signed-off-by: Jan Stancek <jstancek@redhat.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Marcelo Cerri <marcelo.cerri@canonical.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jan Stancek and committed by
Herbert Xu
7bcb87bc 33878795

+4 -1
+4 -1
crypto/testmgr.c
··· 209 209 char *state; 210 210 struct ahash_request *req; 211 211 int statesize, ret = -EINVAL; 212 + const char guard[] = { 0x00, 0xba, 0xad, 0x00 }; 212 213 213 214 req = *preq; 214 215 statesize = crypto_ahash_statesize( 215 216 crypto_ahash_reqtfm(req)); 216 - state = kmalloc(statesize, GFP_KERNEL); 217 + state = kmalloc(statesize + sizeof(guard), GFP_KERNEL); 217 218 if (!state) { 218 219 pr_err("alt: hash: Failed to alloc state for %s\n", algo); 219 220 goto out_nostate; 220 221 } 222 + memcpy(state + statesize, guard, sizeof(guard)); 221 223 ret = crypto_ahash_export(req, state); 224 + WARN_ON(memcmp(state + statesize, guard, sizeof(guard))); 222 225 if (ret) { 223 226 pr_err("alt: hash: Failed to export() for %s\n", algo); 224 227 goto out;