crypto: talitos - fix bug in sg_copy_end_to_buffer
In function sg_copy_end_to_buffer, too much data is copied when a segment in the scatterlist has .length greater than the requested copy length. This patch adds the limit checks to fix this bug of over copying, which affected only the ahash algorithms. Signed-off-by: Lee Nipper <lee.nipper@gmail.com> Acked-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Родитель
2716fbf63e
Коммит
7260042b2d
|
@ -1183,10 +1183,14 @@ static size_t sg_copy_end_to_buffer(struct scatterlist *sgl, unsigned int nents,
|
||||||
/* Copy part of this segment */
|
/* Copy part of this segment */
|
||||||
ignore = skip - offset;
|
ignore = skip - offset;
|
||||||
len = miter.length - ignore;
|
len = miter.length - ignore;
|
||||||
|
if (boffset + len > buflen)
|
||||||
|
len = buflen - boffset;
|
||||||
memcpy(buf + boffset, miter.addr + ignore, len);
|
memcpy(buf + boffset, miter.addr + ignore, len);
|
||||||
} else {
|
} else {
|
||||||
/* Copy all of this segment */
|
/* Copy all of this segment (up to buflen) */
|
||||||
len = miter.length;
|
len = miter.length;
|
||||||
|
if (boffset + len > buflen)
|
||||||
|
len = buflen - boffset;
|
||||||
memcpy(buf + boffset, miter.addr, len);
|
memcpy(buf + boffset, miter.addr, len);
|
||||||
}
|
}
|
||||||
boffset += len;
|
boffset += len;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче