From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289AbbCaEWm (ORCPT ); Tue, 31 Mar 2015 00:22:42 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53734 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750907AbbCaEWg (ORCPT ); Tue, 31 Mar 2015 00:22:36 -0400 From: Lokesh Vutla To: , CC: , , , , Subject: [PATCH] crypto: omap-sham: Check for HIGHMEM before mapping SG pages Date: Tue, 31 Mar 2015 09:52:23 +0530 Message-ID: <1427775745-4674-1-git-send-email-lokeshvutla@ti.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 26a05489ee0e ("crypto: omap-sham - Map SG pages if they are HIGHMEM before accessing") says that HIGHMEM pages may not be mapped so we must kmap them before accessing, but it doesn't check whether the corresponding page is in highmem or not. Because of this all the crypto tests are failing. 00000000: d9 a1 1b 7c aa 90 3b aa 11 ab cb 25 00 b8 ac bf [ 2.338169] 00000010: c1 39 cd ff 48 d0 a8 e2 2b fa 33 a1 [ 2.344008] alg: hash: Chunking test 1 failed for omap-sha256 So Checking for HIGHMEM before mapping SG pages. Fixes: 26a05489ee0 ("crypto: omap-sham - Map SG pages if they are HIGHMEM before accessing") Signed-off-by: Lokesh Vutla --- drivers/crypto/omap-sham.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 3c76696..ace5852 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -639,13 +639,17 @@ static size_t omap_sham_append_sg(struct omap_sham_reqctx *ctx) const u8 *vaddr; while (ctx->sg) { - vaddr = kmap_atomic(sg_page(ctx->sg)); + if (PageHighMem(sg_page(ctx->sg))) + vaddr = kmap_atomic(sg_page(ctx->sg)); + else + vaddr = sg_virt(ctx->sg); count = omap_sham_append_buffer(ctx, vaddr + ctx->offset, ctx->sg->length - ctx->offset); - kunmap_atomic((void *)vaddr); + if (PageHighMem(sg_page(ctx->sg))) + kunmap_atomic((void *)vaddr); if (!count) break; -- 1.9.1