From patchwork Mon Dec 19 23:37:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9480885 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E2E68606DB for ; Mon, 19 Dec 2016 23:38:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1AB428407 for ; Mon, 19 Dec 2016 23:38:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C49E02840E; Mon, 19 Dec 2016 23:38:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46F3428407 for ; Mon, 19 Dec 2016 23:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754097AbcLSXhc (ORCPT ); Mon, 19 Dec 2016 18:37:32 -0500 Received: from mail-io0-f179.google.com ([209.85.223.179]:35911 "EHLO mail-io0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754072AbcLSXhb (ORCPT ); Mon, 19 Dec 2016 18:37:31 -0500 Received: by mail-io0-f179.google.com with SMTP id 136so166415659iou.3 for ; Mon, 19 Dec 2016 15:37:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DJTjeiwrT4EVLRi5HCyADSHdeky+ZUE66Aq/4M0pRq8=; b=DlpTMX7/EJSzF6+sa07vLUgIMkGS2X8BFVrdW/U9FB6XPy/bie/6ZiKdUPxR+IE1Uj uN/h9MfGy/iUGksCVRlrnJ2WMAQ0gJimSB86A2199efJ+7RpQRha+NL/Kk/Nu7cNT4ag Shywz5kSdiJtF2/SYS5IYnP4Kj0dx2cxWwcqNfQqqmaDD80C66DQ+W6vCwxX1+gtK8dW wbWPLqHo+QKlMM2TRzjA6nT/VyWtuV2VXSXvUE/NNz9A612n4HzZVlmEpcWk5f2AZPXJ wtqdAM5cWnnnpdjKE9r2AeCNKVgsTF7KljCIA42mZg/bKx6qzIH+zHzbOybSBH/eCzJZ /gag== X-Gm-Message-State: AIkVDXLpZWrVT3nOXHphesVLTZ+WrQIPl9uax/AAXkZvDj/RCtRJnxSzddcWTNgpVGdDNowA X-Received: by 10.107.159.68 with SMTP id i65mr18914229ioe.153.1482190649965; Mon, 19 Dec 2016 15:37:29 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id v74sm9283215ioi.2.2016.12.19.15.37.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 15:37:28 -0800 (PST) From: Laura Abbott To: Herbert Xu , "David S. Miller" , Ard Biesheuvel , Giovanni Cabiddu Cc: Laura Abbott , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland , Christopher Covington Subject: [PATCH] crypto: testmgr: Use linear alias for test input Date: Mon, 19 Dec 2016 15:37:26 -0800 Message-Id: <1482190646-7720-1-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Christopher Covington reported a crash on aarch64 on recent Fedora kernels: kernel BUG at ./include/linux/scatterlist.h:140! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Modules linked in: CPU: 2 PID: 752 Comm: cryptomgr_test Not tainted 4.9.0-11815-ge93b1cc #162 Hardware name: linux,dummy-virt (DT) task: ffff80007c650080 task.stack: ffff800008910000 PC is at sg_init_one+0xa0/0xb8 LR is at sg_init_one+0x24/0xb8 ... [] sg_init_one+0xa0/0xb8 [] test_acomp+0x10c/0x438 [] alg_test_comp+0xb0/0x118 [] alg_test+0x17c/0x2f0 [] cryptomgr_test+0x44/0x50 [] kthread+0xf8/0x128 [] ret_from_fork+0x10/0x50 The test vectors used for input are part of the kernel image. These inputs are passed as a buffer to sg_init_one which eventually blows up with BUG_ON(!virt_addr_valid(buf)). On arm64, virt_addr_valid returns false for the kernel image since virt_to_page will not return the correct page. The kernel image is also aliased to the linear map so get the linear alias and pass that to the scatterlist instead. Reported-by: Christopher Covington Fixes: d7db7a882deb ("crypto: acomp - update testmgr with support for acomp") Signed-off-by: Laura Abbott Acked-by: Ard Biesheuvel --- x86 supports virt_addr_valid working on kernel image addresses but arm64 is more strict. This is the direction things have been moving with my CONFIG_DEBUG_VIRTUAL series for arm64 which is tightening the definition of __pa/__pa_symbol. --- crypto/testmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index f616ad7..f5bac10 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1464,7 +1464,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, memset(output, 0, dlen); init_completion(&result.completion); - sg_init_one(&src, ctemplate[i].input, ilen); + sg_init_one(&src, __va(__pa_symbol(ctemplate[i].input)), ilen); sg_init_one(&dst, output, dlen); req = acomp_request_alloc(tfm); @@ -1513,7 +1513,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, memset(output, 0, dlen); init_completion(&result.completion); - sg_init_one(&src, dtemplate[i].input, ilen); + sg_init_one(&src, __va(__pa_symbol(dtemplate[i].input)), ilen); sg_init_one(&dst, output, dlen); req = acomp_request_alloc(tfm);