From patchwork Mon Jan 29 08:38:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 10189423 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 57C0960212 for ; Mon, 29 Jan 2018 08:39:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45A4A284C9 for ; Mon, 29 Jan 2018 08:39:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A44428865; Mon, 29 Jan 2018 08:39:02 +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,RCVD_IN_DNSWL_HI autolearn=ham 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 7B1EA284C9 for ; Mon, 29 Jan 2018 08:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbeA2IjA (ORCPT ); Mon, 29 Jan 2018 03:39:00 -0500 Received: from mail-bl2nam02on0066.outbound.protection.outlook.com ([104.47.38.66]:29632 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751298AbeA2Ii7 (ORCPT ); Mon, 29 Jan 2018 03:38:59 -0500 Received: from DM5PR03CA0037.namprd03.prod.outlook.com (10.174.189.154) by BY2PR03MB473.namprd03.prod.outlook.com (10.141.141.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 08:38:57 +0000 Received: from BN1BFFO11FD040.protection.gbl (2a01:111:f400:7c10::1:171) by DM5PR03CA0037.outlook.office365.com (2603:10b6:4:3b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.444.14 via Frontend Transport; Mon, 29 Jan 2018 08:38:57 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD040.mail.protection.outlook.com (10.58.144.103) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.444.13 via Frontend Transport; Mon, 29 Jan 2018 08:38:56 +0000 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.81.110]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0T8crIP017567; Mon, 29 Jan 2018 01:38:54 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: "David S. Miller" , Aymen Sghaier , Subject: [PATCH 1/3] crypto: caam/qi - return -EBADMSG for ICV check failure Date: Mon, 29 Jan 2018 10:38:35 +0200 Message-ID: <20180129083837.21174-1-horia.geanta@nxp.com> X-Mailer: git-send-email 2.12.0.264.gd6db3f216544 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131616887367639281; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(396003)(346002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(59450400001)(97736004)(47776003)(498600001)(50466002)(68736007)(26005)(6666003)(53936002)(8936002)(77096007)(85426001)(104016004)(50226002)(86362001)(8676002)(1076002)(81166006)(23676004)(36756003)(356003)(305945005)(5820100001)(6862004)(2906002)(106466001)(316002)(4326008)(336011)(105606002)(5660300001)(81156014)(54906003)(2870700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB473; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD040; 1:mLKz6YDOak9z2tXYB0TehpfNfj0afb0GghydamFDJz7bHmZ4/oUJPNGx+++122TgbDe27ZIMaiQp7nG73RV5KV57q7KPxqx5Yaz3lE6Yqw+gcCHmrQsbpGSwXGqncEb3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 556958b8-12d4-4c96-3f93-08d566f3bc72 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:BY2PR03MB473; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB473; 3:cqKA02e88uYPX5Dom62qvrN0FnIKNyqpCaVgtLNShU0eI31blYaJ2GyyIuV/zDKetHaEtNFwONsNPB1JN/mIXUb+hRLRTGVbP9P+sFTm3KndXUcL2FdBj0XfJjyKSYSNclJOssE7n5KjwqoMzzWAmb4tJ/IcslEhc3imoI/urWjwgpvogLNylCjLJ3xDD4BuThoUT/WUlHGYyDCE6ve0KP2rPCazsutw5Z4CAiYfB6iEcUpNaWmV8X5bhtCzqR49zwKaOVip3w9e5B3GJQbyYWD36pnyHK9QLLjbQ1/11zIxMaBhU0Yf4cwUS47WApGviSEXFh8jO3uQQqH8vHZGkkBFXs0vLhsQ2eyI5JUvoUU=; 25:cLBkXJj5mcxpictv6uHF78RhlSH1NdRm5QWUiXyl9xm3EIb8MIAC6uWdF/FNNHHjzuoWAHtxsZRNPqKWLXBJNHwUOIjx+rxKEInouLhR2/5toask4ujirzjuWCnSgGIaXPgo3909Lc4lnA04gQo2DP/I/TbvI9CWfRRV2/wOuPtAeFLwXBYuQTqHge3NB01IVchyyswmaf+CNMGKKScO0/pWzHfHbAZQ1bIEmjoy0B4r/RVuUFQoqqTsCNzfzVe3DlAQbJKSLKt/nymlzDLNstVmK2ZU8r2q1kh24DUcZjHxnpXoA/zXRk82SrHHzsJ4CQ538NeDSKYkgkuKUHy8UQ== X-MS-TrafficTypeDiagnostic: BY2PR03MB473: X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB473; 31:5TI0qLsmD4psLWURttVpO7TNZQhya1IZ4jMJW3NyU37CjIs3EMbvoA0rTKEHXgMXwM3LsUK6HBIkqR5zk4QIpeafmMOpUErW97M+YSqzOZzYHlPZu3ty8wx1BP4yfhpQCeB+R1YMCzmGuamWjzX2t6dSIKKdUG7T/gss7XX8+/u0HU7dN3pMaU41szg7dt2apfIVks8csmb0u2JsLD1seoZ82Ah7z7wA0cPibWptLWA=; 4:vRxYDcTuHFZNTd29WwzzeCn/HztTlCPZflZ+KUWYSsBwl7OGNxBKBqjqAbfk+bMfLdq8u2lkkJ52dx2nE29ZWIriswtu7Vtg/DJenxxeL8KwC57Gca5TPEAz3Y9XVV+Vr/8RoH2yivLPOo25LzQoE4r4UMnFeC5AQRG1mme0D7blpLrw0iI9uyXD2T607WwUVbmqZQjJnECXDrQE2A/MoexBYpO1y8NHWauSRfRexcQ03OT99RKrs5kEvdCRqwTHncl1dxBrYhQwulrmKqjWrweIsvkMDY5Q4UeSXqqXpn7QNDXU8RdYXVH58YzoLTFx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231101)(944501161)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123559100)(20161123561025)(20161123563025)(20161123565025)(20161123556025)(201708071742011); SRVR:BY2PR03MB473; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB473; X-Forefront-PRVS: 0567A15835 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTJQUjAzTUI0NzM7MjM6L0ZoN0NpU1lGNVIwN2lMYjJuUDF4cjVLeUVR?= =?utf-8?B?QVJiWUgydDdQTkp5T0dmT1F3N2FmM0t5UDZHbEhwWTNGTWU0T2RsSHkrYU5l?= =?utf-8?B?Sk1mYVVmdmJKVEpWR0h2RStERGMrU0JmL050QVorVmFTc285WTY0aVRCRnpZ?= =?utf-8?B?bHBXUlVUd21tRk8zbGxPbnBhbmh4M0Q0aUY4YlM4d2dtL2FqUlhzL3RwQnVz?= =?utf-8?B?dUZzZzlzS1FUYXpDK3FGTzV5aXVRT3NCenBQTVFObkJjMzZiaXA3Y0ptNE9R?= =?utf-8?B?VGN5ZFNkRXBnR3VhSHVCZWYxa1duRnU3WVcwajg5NUdtTThXc0hia0VjTE1C?= =?utf-8?B?VXdidlNabnQ4OTQ5c0lmNG5tMjROTFNXRHA0dzE1RkM4MEIycDl4ZmdOUHVr?= =?utf-8?B?NXFlc3M3bHN6MG5HUWVHWEtIT251emxTN1l0Qm9UNVBwRjdMUkJPSTlDbFFo?= =?utf-8?B?VGpBKzZSSW8xS3p3bWp3Wld6TjhXYTZKWEdiN0ZwTStibWxGTWszalNlV2w5?= =?utf-8?B?VmNzVldscldCQ1V0M0EvdkFVS0t4TFV5Ky9VTS81SmQ2Q05xSEdZUGprV2V3?= =?utf-8?B?dnJhN3pZYmFEN2k3Rno4THo5VjgydUlPenBra2ZZajJCcSs4allWcE14TnRt?= =?utf-8?B?b0NSK2w3VExndUdRY3lyclFSQmRGWkF4dFp6S3Z2aUFZbVkxbmQ2bGpYVFlJ?= =?utf-8?B?NTFVTUtKK0ZuZXR1WWY5NDdWb2I0UDdjMG9Kd0RvMHZGQXdzdFk3YmxqUjRQ?= =?utf-8?B?NDcrTzlJMGtTOGNGeWdqeDNUKzg1SHhyODYwMHNtNmhiMyttMEZLWSt4TGJP?= =?utf-8?B?QkJFVytQTUlTQ2xMMU54R0ZNN1BaazlvY0NkL296LzB2ejBWVFRoWW9TNjZj?= =?utf-8?B?TllGbWY3V2I1SUhiSzIrZkVPUm83UTJWVzRpYjc2SExEa0k1cWhJY1NtaXQr?= =?utf-8?B?UFc3bVhyY1kySERwalJsSEJDL2RYTkRRVmNoSjJBd3Y4anBKVDk5cmlvQUc4?= =?utf-8?B?dzRnNzJ1RTJsSEtkZEFZcDRpM2JuY0p5cW5MUU8rT1Q2SmlaWlBPbENTUHlm?= =?utf-8?B?cG82QkZubzJJeVhIOFJMak1uaWkxWXV5dHliSEdmVElQL0hLQU5PdW1xQjE4?= =?utf-8?B?MjlTSFVIbTVLK3dYWG5lb2oweHM2emRFYWFTMnM5QjVKMEt0VVFtalBlZFFq?= =?utf-8?B?Wlprb2t6ZnZyYUVvWm5XVEkrN2pBVWErdmlHdTdGWE9iOGRBVVVya3ByUnlU?= =?utf-8?B?eG85LzJLRkJlU3ZXNSs0MkRtajVpRzAvWjlLQmY4eEhHVEF3ODVZWERobmxX?= =?utf-8?B?cWN1WWRoWTh0eHJYTlNvRzdEaFJtNy9tL01IQlA1b1V0cCtjQ3cwSVlod3Zx?= =?utf-8?B?RkJtTnpBeGxmOFR2VEdpamxGOElJRG9ENHg4YWE1ZmkwSlRoaDNSTU9mYkR0?= =?utf-8?Q?8aLqd7DZINW63OpXVlamQYb2Zg?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB473; 6:1iuEHAIubPAqTlPatRp+/cqCmFeUpOhW872+L6fPp19uxe7OC6658xn1YUadAa81v/BEHZwYwocfbGKUtKYrw4AKQM9X72kazC48mtZwIJFx1m8W3TEhBVzoXSp8qYj7J1y8MnkZNyJJtn1FYVOtQFEFCh+gAPAYcf+4JGUn0qPtFwuQQNNT6WiQ4sPEaL2YT628QMBE7TDz/+UnX2+47q1eZP3jn9jQR18j6KBQ2Ow6xX1a28MkXANJUPD9C3TPGqD7Y0WX/rhjPZG5XLeoUAKxO+ZjpqL7HgMPEUGEwf/+qVDV936+o9J4QptdezdsVSZOTK2EgScPb0TAQATFtsyuKvfHKU+ZZBTWhJ4NQEc=; 5:mIKCOYQb/Tgd9l0oiw10+Dqf2QUXDLnSSbIn0VskihQ/JE70HGjXXRqZb+/yBDJ/WdpEpQ9MNpNZ9XFUww0B9yEvMwe3m/yuw6GaegqxZ1LPgNudm4oswey1Pj4/1G4gb51g8+SjLOGxrfdwdUhGEANUXdY0/gcm4Jq8ROCINlg=; 24:duM04w6QJbM62BuIAU4C/Ug1clMSrSctKxUsuUZMN5SKEC5+zgHinlhqqiHaOoy2M9ABKJzLijlYpnn2JnMH2r/Afl2UmfiGZMi6SCvpfbI=; 7:3I/bQbmuZF6m1vulLxIeGXcG0O+urHRkk8f9m/jLOEtgTn3uVjJl1e0NbMCy71Kd/jV5egw5ro7gMADvRLycA/AYIS93phqVjcUlG49u9wOwjZ+5j73P0W5rWuyUN2KvTYcjkmjMrRmyZLXzsqxdgqZN4zI4Id/bBn57dtGIBMrcW910nPn24ZcHNAXgEj09lHv5M5XTxdSNgDfgUTj7DSqOeAOSpnN+r2oQ+NtQXLqymK1/oX80iXvdl0Zaj43N SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 08:38:56.5767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 556958b8-12d4-4c96-3f93-08d566f3bc72 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB473 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 Crypto drivers are expected to return -EBADMSG in case of ICV check (authentication) failure. In this case it also makes sense to suppress the error message in the QI dequeue callback. Signed-off-by: Horia Geantă --- drivers/crypto/caam/caamalg_qi.c | 12 +++++++++++- drivers/crypto/caam/qi.c | 11 +++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c index 4aecc9435f69..f4db39495d22 100644 --- a/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c @@ -562,8 +562,18 @@ static void aead_done(struct caam_drv_req *drv_req, u32 status) qidev = caam_ctx->qidev; if (unlikely(status)) { + u32 ssrc = status & JRSTA_SSRC_MASK; + u8 err_id = status & JRSTA_CCBERR_ERRID_MASK; + caam_jr_strstatus(qidev, status); - ecode = -EIO; + /* + * verify hw auth check passed else return -EBADMSG + */ + if (ssrc == JRSTA_SSRC_CCB_ERROR && + err_id == JRSTA_CCBERR_ERRID_ICVCHK) + ecode = -EBADMSG; + else + ecode = -EIO; } edesc = container_of(drv_req, typeof(*edesc), drv_req); diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c index f9a44f485aac..b9480828da38 100644 --- a/drivers/crypto/caam/qi.c +++ b/drivers/crypto/caam/qi.c @@ -579,8 +579,15 @@ static enum qman_cb_dqrr_result caam_rsp_fq_dqrr_cb(struct qman_portal *p, fd = &dqrr->fd; status = be32_to_cpu(fd->status); - if (unlikely(status)) - dev_err(qidev, "Error: %#x in CAAM response FD\n", status); + if (unlikely(status)) { + u32 ssrc = status & JRSTA_SSRC_MASK; + u8 err_id = status & JRSTA_CCBERR_ERRID_MASK; + + if (ssrc != JRSTA_SSRC_CCB_ERROR || + err_id != JRSTA_CCBERR_ERRID_ICVCHK) + dev_err(qidev, "Error: %#x in CAAM response FD\n", + status); + } if (unlikely(qm_fd_get_format(fd) != qm_fd_compound)) { dev_err(qidev, "Non-compound FD from CAAM\n");