| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <8eb11b8826791f694797241bf9c8182dd83e7eae.1463648873.git.jslaby@suse.cz> Date: Thu, 19 May 2016 11:08:15 +0200 From: Jiri Slaby <jslaby@...e.cz> To: stable@...r.kernel.org Cc: linux-kernel@...r.kernel.org, Herbert Xu <herbert@...dor.apana.org.au>, Jiri Slaby <jslaby@...e.cz> Subject: [PATCH 3.12 53/76] crypto: hash - Fix page length clamping in hash walk From: Herbert Xu <herbert@...dor.apana.org.au> 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 13f4bb78cf6a312bbdec367ba3da044b09bf0e29 upstream. The crypto hash walk code is broken when supplied with an offset greater than or equal to PAGE_SIZE. This patch fixes it by adjusting walk->pg and walk->offset when this happens. Reported-by: Steffen Klassert <steffen.klassert@...unet.com> Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au> Signed-off-by: Jiri Slaby <jslaby@...e.cz> --- crypto/ahash.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/ahash.c b/crypto/ahash.c index b246858ca032..781a8a73a7ff 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -64,8 +64,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk) struct scatterlist *sg; sg = walk->sg; - walk->pg = sg_page(sg); walk->offset = sg->offset; + walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT); + walk->offset = offset_in_page(walk->offset); walk->entrylen = sg->length; if (walk->entrylen > walk->total) -- 2.8.2
Powered by blists - more mailing lists