From patchwork Mon Feb 12 13:52:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10213055 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 84CF760236 for ; Mon, 12 Feb 2018 13:53:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FBB628C87 for ; Mon, 12 Feb 2018 13:53:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63FEE28C8E; Mon, 12 Feb 2018 13:53:47 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9DEDC28C87 for ; Mon, 12 Feb 2018 13:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=cMe+zp6mny3Z0EFFmpZIc3ei1SH9DW7o+wvLHOd2b4s=; b=Luiz6veOLBdL5N8vvoNqqQE12T xoOTZYqhcs7PlOqjzUoBu5qeRu8omPYi7fkSJLuhOE6yIDsieJPaP+T9vOGGMi9MpbPKfJdvh+Bvz 9ozE15m+2gfFQplKs+/er2VV1IX+AkyYSvcwuaobLJ58LKMgk+3elPpMRyE1Ip0BJCApahdXkfed0 hFXSZv0pZp+c80cmRPgR9JgBlCD+ET5gEkyiwGxX04WLYdAykiUdhZ9nz5yfLupzlHCn/CMTFSKip dzg+pj25BzBDcrqg4KB4ViD4mrAjeVK1OdiG4teKxrTWYZYcuVnt52gcJB6xUaN1HevEH0hFJxZhv 7zW6ptZQ==; Received: from [198.137.202.133] (helo=bombadil.infradead.org) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elEY3-0006Ap-Fq for patchwork-linux-arm@patchwork.kernel.org; Mon, 12 Feb 2018 13:53:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=cMe+zp6mny3Z0EFFmpZIc3ei1SH9DW7o+wvLHOd2b4s=; b=lK1vwIGWTL71MO g1annfZdLWYd779P3q+yZxIuUeAALQozdH8qYqf/YbDN0/Gp+SRT1KZshHVrfzEwQ9U1E85x3T+rJ QJ7GbK03lmj6YwZOaASyyklIl88xuvkglNStM0iol2wyErSTfFZkDD9Oo8jRb0mJw2lvvaZILE2z8 ZU17YYKiHZDMTJ+xMlTDHN768Y3ZJqvdU7o3oOSgkIS9t1AKb58hEbZtsHjl3Yk3n2oJ6lXsKH+eG gIaPrOBKKeHFpnBk6c+tg9cEPRbe6gGCrSrWspahZ2UHthMYhyxbCNEdA4IpoO48PONajBND3DmEn 2BQZpiV1m37wopYXalSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1elEXc-0000Bo-HN; Mon, 12 Feb 2018 13:53:08 +0000 Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elEXY-00005e-Ca for linux-arm-kernel@lists.infradead.org; Mon, 12 Feb 2018 13:53:06 +0000 Received: by mail-io0-x244.google.com with SMTP id 72so17305119iom.10 for ; Mon, 12 Feb 2018 05:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=3MoWDaRA/2ap97inEyUbhnFwe49UOy1xUsnJFNgh+T4=; b=AVq90A+NLGBaS75ySgkh3a0JWoH4EPMH3MSLi1vEs+ZvaiLjkHzOpQIzzCkizAgK4k NCcUHOmCAAbP6Y0VfQuoZNZZbl/VwYwpX0gihibYpxlsjFKBvZlCcRU7RpQqlNCcqPWH dr/NmFtC7zMVwT++W8Fy1VQYRSDnjVAloN0ot2b40bqaeQpLeqxP8s7IjA8Bktbxn6GI b0MwQX9mVA0G7W2uVGNURD0i/vr2rfEoKPm4Yvm1U1Rqs+GwqBVntD8yNXxDJWoxhhKl lCFI9LyvkNz5gJflgtWfBM/aH73Yn9qSloHKT7aXVbP7kPt9pNZ/Ngd6aaTuHfl6C2MY OSNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=3MoWDaRA/2ap97inEyUbhnFwe49UOy1xUsnJFNgh+T4=; b=ntdgtd3oXIrNl9Zr2YdavtgDSd0MHv7qWMvlDAdZ3nXjFV5YoP+3fLFEXLUvkD1LsG wtpMUAlq9ZXVWWuGBDqz8ABQmRThqy8LLFTN7i76EUgQzEeL+Hgv6DNXU+gbxSw8acJJ rWG+GwlycaGJFEjI59ecXy0S0Di2mtNNnyRz5D5QVZ7JzXocaLDvgE0DNne3+L6g5Z51 JlmmLsZzrbMCBIwdU8jQ72MtUZTnYaSCMgfJ31MYFwY3CB2XwVgA0u3rvK3u4G1ah4Xp iurM45cYcuygSstlw5CX1c9e3/YZMh/IKE4Gn7GeN83Nh8oAqYzOFcR2GpGmOvFMSOeO 7Zwg== X-Gm-Message-State: APf1xPDQEas9D7Z+XpZfFRnWN+loCgqV81h9ffEoW6rgaQkTQ4u2LdoA /B6V6BAuwtjCZtlfTe1iLSc= X-Google-Smtp-Source: AH8x2261clWSvnfkqv51BKLFC6x0DyvTDxOJaCHJp/cOPP/KnFjj7IinzSGECoTKSgDtCsa/ZmaBHw== X-Received: by 10.107.78.10 with SMTP id c10mr13367203iob.238.1518443565304; Mon, 12 Feb 2018 05:52:45 -0800 (PST) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id f63sm2257538ioj.74.2018.02.12.05.52.42 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 12 Feb 2018 05:52:44 -0800 (PST) Date: Mon, 12 Feb 2018 22:52:37 +0900 From: Jinbum Park To: linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: arm/aes-cipher - move S-box to .rodata section Message-ID: <20180212135237.GA3011@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ard.biesheuvel@linaro.org, herbert@gondor.apana.org.au, davem@davemloft.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move the AES inverse S-box to the .rodata section where it is safe from abuse by speculation. Signed-off-by: Jinbum Park Acked-by: Ard Biesheuvel --- arch/arm/crypto/aes-cipher-core.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/crypto/aes-cipher-core.S b/arch/arm/crypto/aes-cipher-core.S index 54b3840..184d6c2 100644 --- a/arch/arm/crypto/aes-cipher-core.S +++ b/arch/arm/crypto/aes-cipher-core.S @@ -174,6 +174,16 @@ .ltorg .endm +ENTRY(__aes_arm_encrypt) + do_crypt fround, crypto_ft_tab, crypto_ft_tab + 1, 2 +ENDPROC(__aes_arm_encrypt) + + .align 5 +ENTRY(__aes_arm_decrypt) + do_crypt iround, crypto_it_tab, __aes_arm_inverse_sbox, 0 +ENDPROC(__aes_arm_decrypt) + + .section ".rodata", "a" .align L1_CACHE_SHIFT .type __aes_arm_inverse_sbox, %object __aes_arm_inverse_sbox: @@ -210,12 +220,3 @@ __aes_arm_inverse_sbox: .byte 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26 .byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d .size __aes_arm_inverse_sbox, . - __aes_arm_inverse_sbox - -ENTRY(__aes_arm_encrypt) - do_crypt fround, crypto_ft_tab, crypto_ft_tab + 1, 2 -ENDPROC(__aes_arm_encrypt) - - .align 5 -ENTRY(__aes_arm_decrypt) - do_crypt iround, crypto_it_tab, __aes_arm_inverse_sbox, 0 -ENDPROC(__aes_arm_decrypt)