From patchwork Wed Feb 7 10:38:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Konieczny X-Patchwork-Id: 10204953 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 8AC0E602D8 for ; Wed, 7 Feb 2018 10:43:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DF9B28E90 for ; Wed, 7 Feb 2018 10:43:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60B9D28ED4; Wed, 7 Feb 2018 10:43:20 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 EC7A728E90 for ; Wed, 7 Feb 2018 10:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754099AbeBGKjJ (ORCPT ); Wed, 7 Feb 2018 05:39:09 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:36379 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753744AbeBGKjD (ORCPT ); Wed, 7 Feb 2018 05:39:03 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180207103900euoutp0265072c89cd387b3ef640a564c5b6b280~RBOdBK1Wc3044530445euoutp02X; Wed, 7 Feb 2018 10:39:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180207103900euoutp0265072c89cd387b3ef640a564c5b6b280~RBOdBK1Wc3044530445euoutp02X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517999940; bh=SezFE7K3AW32cBS1nNNP1vKND6f53eo/jA6YE1yQyCY=; h=To:Cc:From:Subject:Date:References:From; b=hN4m/wTZ6WZ9hADJ5X4W9wBjjey87Nrzgtnsy100gkwlIShHBmw505CTAj9s1PoX9 unrHVvCkifc1YgwAH8YLQxWtYrmqcKhNsPieaA+elCdtjvoVDQ+afaSSMgp2UeAqej giWXCHI3S5xYwVlJBPOZ2gnHJ/k6ljxa4nXddTB0= Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180207103859eucas1p2e8a9be6ea35e2220fa67fae6de20bf4b~RBOcWXYw30675506755eucas1p2K; Wed, 7 Feb 2018 10:38:59 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id E2.64.30163.347DA7A5; Wed, 7 Feb 2018 10:38:59 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180207103859eucas1p13385c140fe1874645ee3ae5127d0e232~RBObmGGM-1272812728eucas1p1U; Wed, 7 Feb 2018 10:38:59 +0000 (GMT) X-AuditID: cbfec7f4-f790c6d0000075d3-5a-5a7ad743d4b5 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 96.6A.18832.347DA7A5; Wed, 7 Feb 2018 10:38:59 +0000 (GMT) Received: from [106.120.51.18] by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P3S00FVR08YQP40@eusync1.samsung.com>; Wed, 07 Feb 2018 10:38:59 +0000 (GMT) To: Herbert Xu Cc: Krzysztof Kozlowski , Vladimir Zapolskiy , "David S. Miller" , Anand Moon , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-crypto@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel From: Kamil Konieczny Subject: [PATCH v2] crypto: s5p-sss.c: Fix kernel Oops in AES-ECB mode Message-id: <64a5e903-c6c1-28f4-8af4-dbbd7bef17ef@partner.samsung.com> Date: Wed, 07 Feb 2018 11:38:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-version: 1.0 Content-type: text/plain; charset="utf-8" Content-language: en-US Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBKsWRmVeSWpSXmKPExsWy7djPc7rO16uiDBZt1LLYOGM9q8Wc8y0s Ft2vZCzOn9/AbnH/3k8mi8u75rBZzDi/j8li3cZb7BZrj9xlt/j/q5nZgctjy8qbTB47Z91l 99h2QNVj06pONo9/C6ewePRtWcXo8XmTXAB7FJdNSmpOZllqkb5dAlfG4sntLAUXxSte3nrA 1sB4UbiLkZNDQsBE4vX1ZewQtpjEhXvr2boYuTiEBJYySjS0zGCGcD4zSvx/8ZoJpuP5tU2s EIlljBKH/t0CSwgJPGOUOLjFFcQWEdCRWPlyMSuIzSzwhUmi+UoYiM0mYC7xaPsZoHoODmEB N4ndX1RAwrxA5o5/78GuYBFQldhy5QYbiC0qECGxcOpTRogaQYkfk++xQIzUlHjxZRKULS7R 3HoTypaX2LzmLdjREgKP2SS2fYRISAi4SMz6+YQRwhaWeHV8C9TLMhKdHQeZIBr6GSWW3zjF DuFMYZQ4Pu0q1MvWEoePX4T6hk9i0rbpzCAfSAjwSnS0CUGUeEg8WboMapmjxIeO7+yQQImV uLy8i30Co9wsJE/MQvLELCRPzELyxAJGllWMIqmlxbnpqcUmesWJucWleel6yfm5mxiB6ef0 v+NfdjAuPmZ1iFGAg1GJh9dgQ2WUEGtiWXFl7iFGCQ5mJRHenyurooR4UxIrq1KL8uOLSnNS iw8xSnOwKInz2ka1RQoJpCeWpGanphakFsFkmTg4pRoYlx5dLThHZNeBapUY4aPKT5nUJBV+ a1pZGP1Sdz8TV6NrJ9Zz8I6HjbzzuxcFnBsVwncta9SxfCl13HVWJc/JEMZrCc8Dl2/jeKDm 29yYfSiQfY9vh+Kv6Va3BXXTFm+P8JnjHlN5/8y3O599Ji0OvNIxe3bzhI/RIdvdnk8+71sm 83ubT8AlJZbijERDLeai4kQAl1zQvTsDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRmVeSWpSXmKPExsVy+t/xy7rO16uiDL6eYLfYOGM9q8Wc8y0s Ft2vZCzOn9/AbnH/3k8mi8u75rBZzDi/j8li3cZb7BZrj9xlt/j/q5nZgctjy8qbTB47Z91l 99h2QNVj06pONo9/C6ewePRtWcXo8XmTXAB7FJdNSmpOZllqkb5dAlfG4sntLAUXxSte3nrA 1sB4UbiLkZNDQsBE4vm1TawQtpjEhXvr2boYuTiEBJYwSmzd2sYO4TxjlLg69QZYlYiAjsTK l4tZQRLMAp+YJA7NXMAIkmATMJd4tP0MUxcjB4ewgJvE7i8qIGFeIHPHv/fsIDaLgKrElis3 2EBsUYEIic6V81kgagQlfky+xwLSyiygLjFlSi5ImFlAXKK59SYLhC0vsXnNW+YJjPyzkHTM QuiYhaRjFpKOBYwsqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQLjYduxn5t3MF7aGHyIUYCD UYmH12BDZZQQa2JZcWXuIUYJDmYlEd6fK6uihHhTEiurUovy44tKc1KLDzFKc7AoifOeNwCq FkhPLEnNTk0tSC2CyTJxcEo1MEZdL3x1e8u2J9on2TVPTuyzPHfgefcn4zc8TwrWCvF/272m Uk+jKuSZjSeP2kKVaV0W6yLymmbfeNDKvDstnalksbOIiAZH7O4PjqoPerjjzpQdE3g9+fby Odpvo/54qJ9qVL2jxNG18vnmPmH5eMOOpncT/2223XyZ7dtGldn7GzX7/C6q/1FiKc5INNRi LipOBAAeODDUgwIAAA== X-CMS-MailID: 20180207103859eucas1p13385c140fe1874645ee3ae5127d0e232 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180207103859eucas1p13385c140fe1874645ee3ae5127d0e232 X-RootMTR: 20180207103859eucas1p13385c140fe1874645ee3ae5127d0e232 References: 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 In AES-ECB mode crypt is done with key only, so any use of IV can cause kernel Oops. Use IV only in AES-CBC and AES-CTR. Signed-off-by: Kamil Konieczny Reported-by: Anand Moon Reviewed-by: Krzysztof Kozlowski Tested-by: Anand Moon Cc: stable@vger.kernel.org Fixes: 8f9702aad138 ("crypto: s5p-sss - validate iv before memcpy") --- version 2: Change commit message. Tested on Odroid XU4/HC1, kernel 4.15 with following command: fallocate -l 128MiB /tmp/test.bin dd if=/dev/urandom of=/tmp/testkey.key bs=128 count=1 sync cryptsetup luksFormat --debug -q -d /tmp/testkey.key \ --cipher aes-cbc-essiv:sha256 -h sha256 -s 128 /tmp/test.bin The original report by Anand Moon: https://www.spinics.net/lists/linux-crypto/msg31180.html Oops reproduced with cryptsetup 2.0.0, kernel 4.15, in .config in crypto API ECB support was turned off, and s5p-sss AES driver on. cryptsetup is using aes-ecb and has req->info in aes_ctx set to 0x10, which caused Oops: [ 2078.683779] Internal error: Oops: 17 [#1] PREEMPT SMP ARM [ 2078.689148] Modules linked in: algif_skcipher af_alg sd_mod sg evdev uas usb_storage scsi_mod gpio_keys fbtft(C) spidev spi_s3c64xx ipv6 [ 2078.701377] CPU: 1 PID: 15 Comm: ksoftirqd/1 Tainted: G C 4.15.0-rc9-xu4krck #1 [ 2078.709861] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 2078.715932] PC is at memcpy+0x80/0x330 [ 2078.719652] LR is at s5p_tasklet_cb+0x19c/0x328 drivers/crypto/s5p-sss.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index 142c6020cec7..5c0496d1ed41 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -1926,15 +1926,21 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode) uint32_t aes_control; unsigned long flags; int err; + u8 *iv; aes_control = SSS_AES_KEY_CHANGE_MODE; if (mode & FLAGS_AES_DECRYPT) aes_control |= SSS_AES_MODE_DECRYPT; - if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC) + if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC) { aes_control |= SSS_AES_CHAIN_MODE_CBC; - else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR) + iv = req->info; + } else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR) { aes_control |= SSS_AES_CHAIN_MODE_CTR; + iv = req->info; + } else { + iv = NULL; /* AES_ECB */ + } if (dev->ctx->keylen == AES_KEYSIZE_192) aes_control |= SSS_AES_KEY_SIZE_192; @@ -1965,7 +1971,7 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode) goto outdata_error; SSS_AES_WRITE(dev, AES_CONTROL, aes_control); - s5p_set_aes(dev, dev->ctx->aes_key, req->info, dev->ctx->keylen); + s5p_set_aes(dev, dev->ctx->aes_key, iv, dev->ctx->keylen); s5p_set_dma_indata(dev, dev->sg_src); s5p_set_dma_outdata(dev, dev->sg_dst);