Received: by 10.223.185.116 with SMTP id b49csp1059936wrg; Fri, 23 Feb 2018 11:10:43 -0800 (PST) X-Google-Smtp-Source: AH8x224+KG7BUg28UnoOP0NSUAoDCsrO8zc7u4tZqRLx6WL98vHWUFpZmZFR0edCBHQMHc34diqy X-Received: by 10.98.34.75 with SMTP id i72mr2691456pfi.165.1519413043016; Fri, 23 Feb 2018 11:10:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413042; cv=none; d=google.com; s=arc-20160816; b=J68XXTZ8Au0fgKuIjP++CdO9vGsrrO/PJPok73FGSs9UpyQfasMBT1qFisPJZN9ScV ZjzR7LO/yhEWvdh229szRcNLsqbJhVrsXZlG9Ry9dh9cqdK2P8SWJQ2/i+vDE3bZgUvr C97ZVZmtslHLgawJLsuxlyKasD606dAES/hOPwJZwp/8STFOynDEzQpXKbIgdKqSXDiw Xq5TQzDcNC0Zt+HAV0qLlMgtXpxFg4pAwcjvh2Ztd0tptO8R4e4hvDh50rvaoq5D2wS5 7m6QbdpPkpBECP0rtLO7/FnKc0D+deQ9yg9pPudMT9utj6d2VKOVDTp9UyE7lPWrVmOw Lfhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=dbkAoTmHRzNS6k0vGfUU+R+KdnKcwEiQU3xZ29b7O8k=; b=VZ5XfoZ7U+3JhxCeejt7vyvhotA2lJxLtAVJqTEkyI/uDaQTBOO/oz0nAwevf1i0HK xKGWJqASYbYOjAT1bG/WYvMwouC2S31eFWdU9+lL+BfeObhzkK6WmL1m44u0KzGMuJR4 rF6KeKtvD0TtQJazezWENC6xcDAEXC7h2BH7Xr0RF2gxD7xAIhAEo7w7QK94r5E5ymYQ jEchjYGMiBpF9HSxue7QGQSRIRYXfVmkfht1v+cfXPjBwPsfZyyyTIgPVeAV6TPaucVL 8x8YdA1lfwn0ic0tx8bPAggnMrcFCdcPatrucPoqAVuATp2KEY7dpqX7BvwDATNOihCr viig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w9-v6si2158470plz.12.2018.02.23.11.10.28; Fri, 23 Feb 2018 11:10:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935152AbeBWTJy (ORCPT + 99 others); Fri, 23 Feb 2018 14:09:54 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:49554 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965273AbeBWS47 (ORCPT ); Fri, 23 Feb 2018 13:56:59 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 9915C89C; Fri, 23 Feb 2018 18:56:50 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kamil Konieczny , Anand Moon , Krzysztof Kozlowski , Herbert Xu Subject: [PATCH 4.14 156/159] crypto: s5p-sss - Fix kernel Oops in AES-ECB mode Date: Fri, 23 Feb 2018 19:27:44 +0100 Message-Id: <20180223170801.818855262@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kamil Konieczny commit c927b080c67e3e97193c81fc1d27f4251bf4e036 upstream. 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 # can be applied after commit 8f9702aad138 Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/s5p-sss.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -601,15 +601,21 @@ static void s5p_aes_crypt_start(struct s 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; @@ -640,7 +646,7 @@ static void s5p_aes_crypt_start(struct s 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);