From patchwork Thu Oct 27 14:29:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Ryabinin X-Patchwork-Id: 79823 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp928624qge; Thu, 27 Oct 2016 18:08:34 -0700 (PDT) X-Received: by 10.99.108.130 with SMTP id h124mr16300342pgc.90.1477616914044; Thu, 27 Oct 2016 18:08:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f19si10565291pff.176.2016.10.27.18.08.33; Thu, 27 Oct 2016 18:08:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@virtuozzo.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935453AbcJ1BIc (ORCPT + 3 others); Thu, 27 Oct 2016 21:08:32 -0400 Received: from mail-db5eur01on0136.outbound.protection.outlook.com ([104.47.2.136]:21312 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S943175AbcJ1BIb (ORCPT ); Thu, 27 Oct 2016 21:08:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fSHlMmmuhhPpfIMm/CpuemnieyH3RzJ0bFahKqmc97M=; b=UiepDLsbRJfWgTkmzQ0SInLpE42vgFpaaGnMz/Fld/WqJyy8XTVTkT3hwehpQR3tSnMpRorcA1fPl+ZNb7DNNHasD8kM+iv0vxA4Ek+N5EFavoULY1Ao+zqr/R+RMEEIynqXJaFkyfdI0Ic4YreX7qRkSkyfS60WPWzlG9IzBbA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aryabinin@virtuozzo.com; Received: from localhost.sw.ru (195.214.232.10) by HE1PR0802MB2555.eurprd08.prod.outlook.com (10.175.35.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.12; Thu, 27 Oct 2016 14:30:02 +0000 From: Andrey Ryabinin To: Willy Tarreau , CC: Herbert Xu , , Ard Biesheuvel , Andrey Ryabinin Subject: [PATCH stable 3.10.y 17/18] crypto: cryptd - initialize child shash_desc on import Date: Thu, 27 Oct 2016 17:29:50 +0300 Message-ID: <1477578591-28924-18-git-send-email-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1477578591-28924-1-git-send-email-aryabinin@virtuozzo.com> References: <1477578591-28924-1-git-send-email-aryabinin@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM4PR0501CA0035.eurprd05.prod.outlook.com (10.167.83.173) To HE1PR0802MB2555.eurprd08.prod.outlook.com (10.175.35.148) X-MS-Office365-Filtering-Correlation-Id: efd5dd6d-babb-46e6-cdab-08d3fe75bd4d X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 2:8aU28/JHRnXr/37HlABJUoB7syZNFVWJ367X955dMPNxVZ2tF8bRmFOTFLGy9gmtL6GmITwFJy3YjqneyWExbIX1yR0O5kyAJxuLb2cMDAnn9MVx8MXpgK6MPjbSrfOZ7N4wPPVv1tdPCs4FzhUEv4BS/x29LG4+vBWqHO5Ve9GFLMctRsd6LO+VIdwliCkMcXI8vyHTklRmNT5Xp8G7/g==; 3:/k/HtWHwRG3NhnFd68LDj4GE3pYYpw8YtCg7q7rChcv9o4eGbjVfTtkoxAEtBnGMklBMoRnM0cq1nNrwKNU5p/ebiIzo/MnCaUF0KuM1PRoyDrwLAQNEXA3j8o89U66PV9K3F7MN90lvKE5iaHv3iA==; 25:XjddjoQe6PtLYAY8kBMy5QeU/K5SZ23SI6Gyvv9ZE5ve/ACIU4ONJj0Hm5WdUHeYNLgbD7pk18r/4W2eS8rc9UOZ6IkfTjW+cCWi+khHTKpUlSAfd0ZxU3LAw9NCnjt8WwqUGAAgSCPEinTIeZkDOgzlhqVDXHpEBlUqtkVc92feKDYfEAl8ljJXlE7aklassfKoOBzApJykBIv7ApN/0T70OdjqRmNxvlAlzbtIw/5PUztBzIyg6zI9g7KAoNWo8BJGFtZ1bNAHRIgVTdeotUtsMSN0t5WWLMvTqvBQpFgnaSa8c2VQ9q1zR43KtG+zYwhHUNcRQqmf2QLxJ2zv2CRkMUF5QxP0UvYiZmNqpu0SRt1rdZeAZvEx70UED1lrXuaA6sMDfOlV1fQROesMxCSNVteDr32csYR7OiOAI3NKB7+2fs1vivZ/Fq8Tp1xl X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 31:l9tRQMzLA7B0m9HBXZHPI29JBI1T8Hog3l9U58nFV6lxAOkhGWi8+fuyn77eWsJd8tDdfPWToRvaNt915gE1x0BycuRJbqKsBdDvdVjtT75cjBDL1pGMjayP3pN2v3O/I+wfSLcYBPIZSoABvOGlBR9Ol6ioUUvEhtwxVdSPzM7JcefLcf2JOk4oiRT5YvtPOGbkPhTwnR2zQMDAhgqjutyGT4SSr7Ys8b87XkK0DdNmm/dcaczyZaNxfpeNMgK2; 4:lWGjiNMnLLCmVELYaoK5eBQOx2+kUc3DA/1U2f/Xs//RMICc5Hgvrqpdm9e6h/XIKystwQvi1UTVnYq7Fy+GO4T7HK0Pcmy6PvFSb6a5BfKKdlRDeZqU2IP6fL8ulcpdfKm4DaLEqiwvTA2NgzRfb/5gy7z5YnxxffyFeKg2+1G5LH+FUANUoJCzBVyx+QOE+ifkD35a5iXIZhCtEFlIpcJOtIuUm5zySvMyzjJF4XUrWi7DGKz47UEv5bOWa43e01grh72nOvOFBxMi2ngSASQThq208Po9JT0UQkfXvcV8UO/QNGZbCcsm62q1LiNNYGJGUwvbNEPzaE3hYr79HtXWRGzvp4lcuaT0LwjHbpUApH9gV5ETZyX0G1Zoy95jMD30Ux+o1FQZHgskywC/7kOssvdtC+jmdWCMkHeIRCi19jnjnSGDmrGYmxmZ8d3K5fNT+ej9xS0ZtksH41BFLyMtARAgeuoNtzx/LgAJB9A= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6043046)(6042046); SRVR:HE1PR0802MB2555; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2555; X-Forefront-PRVS: 0108A997B2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(2906002)(81166006)(53416004)(76506005)(8676002)(81156014)(42186005)(305945005)(7846002)(76176999)(48376002)(19580395003)(50986999)(7736002)(19580405001)(2950100002)(105586002)(86362001)(229853001)(586003)(6666003)(6116002)(3846002)(4001430100002)(33646002)(50466002)(36756003)(4326007)(69596002)(189998001)(77096005)(47776003)(5001770100001)(66066001)(107886002)(92566002)(5660300001)(50226002)(5003940100001)(101416001)(68736007)(106356001)(97736004)(781001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0802MB2555; H:localhost.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0802MB2555; 23:OgJOSJdb4Cc8fwd4o8DQO0+5gBggARvXJ9w7Rcu?= =?us-ascii?Q?x60cJb2TabVAKmDFsfKL1bxTqo0OqEM8vh8gRq7teBm8yLOsMktfYwlQqs0F?= =?us-ascii?Q?hTWueKmbNP0TVxGLoL8ibTcSLRsZLphxxWYZFxNP9ZsxTRLV/fAEhdaQEKt6?= =?us-ascii?Q?3Zwmj6Z5aFUOtFySw1B8vF/TgOfcIyL2N7LMPKm0OagZP3rdRvp2BL+CQ189?= =?us-ascii?Q?doiv7BsrlDej/84LwP2rnE+C79J3K3FvihQ+11Ukug07N9wm3TmgAKHVMoLu?= =?us-ascii?Q?zbYOTFhJuqysR7BaKhWh+QVeL6xc8a1DMhD1mKLhHWzdxyvYQAUdXZM8RDY0?= =?us-ascii?Q?z3B5J89pumxvBzZa+D9kfGYAPlIOdKUArDUsMbZ27IfmWA3OZ7IJXmSzu6Yj?= =?us-ascii?Q?vPC+8mpDp/TWJNA1sITiGkITgydPn7Jmj+0ipjafsPpcpgW/jTnVbJ9w/d0D?= =?us-ascii?Q?cQH+8mqlDI8kzoYCc0L2VKCEL2vHspKRLQkcclZaSxYr9vstdOQZ5dvjEP3D?= =?us-ascii?Q?5yo/GboZupeHUJn2AL5Tfo6burMmTKpQ9Xaj25mGIfoPRT/Cm9rjv/UrPCdv?= =?us-ascii?Q?1llvGPRNtg5KhHIXADBX8Pk7YdOx64HxeQbQii0+0bIcSQYqpt+2i2CLxLnL?= =?us-ascii?Q?GlT+496gjtKLkVytQI5nQraEs/mTKLua+IVdgKvvJ7IjvXYXWBMTxgPoTNve?= =?us-ascii?Q?R/5vVxeTL9Z87PZPAVnnsNbhwkLZ4Ldif8gDzQIJi2KsH2Mf7QusUCIXgJwZ?= =?us-ascii?Q?rEwE/nkp3FXvkxJ1W0imuhEBQGJ8AeaZeSRYk9+Ye2k/lS1+yp9uwwA0JwVM?= =?us-ascii?Q?bhwfNGImW895w271+/qhOVZ8psc9onk5Ro/umUsn/zbQ/s7nwUYluFhW7B8Z?= =?us-ascii?Q?QmvSPdjlCImOQ8KEeVNk/UnafiV2u6YHcRcnWW+D7ZRP+jlTYzQ6K3IcgYuN?= =?us-ascii?Q?hHcPeRQADl997H1OhA6jwDCIOcKNuPss7ddRJbWIDdtk9ENG10y6HQpP0WZ+?= =?us-ascii?Q?5ksf+v62DjAxqREmBJaYcrwv0qa8E9jsbTSPEBO8U1zXx3+263WOx1uKHiGy?= =?us-ascii?Q?3Ia8Jm0e0MF53X/UNblc4CkTHtnt/VTjXOrv3JmvDNAg3YCtLzAsRswKV4rm?= =?us-ascii?Q?qCKTFlxnVzxjYD0Gy/0nBd6SYETUvcrV50NYJd2pUH41mSJRg+xW5aGYj2EE?= =?us-ascii?Q?7nv7m01+V0uIzmfyZ3OM2iD8fv6YJlc8NEDzvfXJN0WrdqgGWtubMVWiEu/2?= =?us-ascii?Q?bJdvC1FMi2wM3rXa1TWQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 6:NZifChMUmUQDE86Epkx88ymErZM8k1ZMJz0MwsweL69TFkgnY3osq30QF5O0UsYtT/BcmcJFoQSFs75VUMaCpsnZtbsZ9hvgXCQBLV1YZDikbdtrubbsxhr7Dmp9q55+TU6weD9Qa3zhQ8n9oJbI30F+R8xDlxRPbfEW/HXsTZg9HK4p8w3CrE20Pu5HQwe9nN7bP54xqvGDtxKuG7vgX8rirUoLSQmzqRUe9VqaC66D3WEO8RCoDabt7mALHztlRqtBSyZ8lXinGNQD1XNet2l//wBPzzqFHbn7/IxCIPCV4oBNKyATC2hh4eLxf7EZuQwmKeiWtW00B6+b0WsrJQ==; 5:OC8DAzkcSBysI41pi+LtoY3uG+01lvPduY5ljUvBeynd6URNO4jYdaeSsr/N4wP+Q5yEH850KzIXzUzTsjfOnJuGW3S+2SwIxoDZnfiDsjLmjBijCfmz5U6UNSCKZL6jWyEpSCtVq8k2Rk4/liUxSg==; 24:lIA4kSNlHovGeAEsx8TMmzvNxUp/2s8I8gqdewR4D34CzakKOP2Db1dqXVYjfmMVdFnqVWdG2/kNB7S1phi+d+gJobLY6WoGvSIGsHc6Z68= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 7:aH3IGRaBw5EXJa/nFiu9coaDBZ0jTzIgRygTDwvLG5SRrR4W5PoGvk9mvhrPG8O1LbseYDXTtRu0npEzjYsPmiCqebQsc4ucHZFfqrYOx5c2/zkDMOdGqtIiEGNVpaSZOzynE9d9bFwE+DpnDjZj9lwyH6wMbuEykAlue+8NFSSipOm7RFMYeLJemidIPRp4QDo37ODCJXKBXXP6NmbocdV856BRUJJy/3M4NNlgq+nyX6E7ja8kFfOlJ0t3t9eanqP6qe+Kqtiy0Mj6OwtVxARcmQpQaDrS8n8Xo4jyhlRORWmnhnVjpfOQ/wBF7s0n1GfftVWu+aj39IDc+auTavczHjrKwBcDFdNtWDJ4Im0=; 20:6z/XhCukkL7ZvE2X7n6py6jqvOvfe4U4RzkoOO8Gx9m2/lpO9vfKOCGbCkuhSQfGBY5PMvtNVegIqBkWQWzd2OfWbklR0lmHx5p0A1jczXjIc9tMuFUJRdsOIQOp+djA1/hctTcT2d96SsUTyEGr/OUIY16Ou1LB17mPkAmYrbg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2016 14:30:02.3688 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2555 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel commit 0bd2223594a4dcddc1e34b15774a3a4776f7749e upstream. When calling .import() on a cryptd ahash_request, the structure members that describe the child transform in the shash_desc need to be initialized like they are when calling .init() Cc: stable@vger.kernel.org Signed-off-by: Ard Biesheuvel Signed-off-by: Herbert Xu Signed-off-by: Andrey Ryabinin --- crypto/cryptd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 75c415d..d85fab9 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -565,9 +565,14 @@ static int cryptd_hash_export(struct ahash_request *req, void *out) static int cryptd_hash_import(struct ahash_request *req, const void *in) { - struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req); + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); + struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm); + struct shash_desc *desc = cryptd_shash_desc(req); + + desc->tfm = ctx->child; + desc->flags = req->base.flags; - return crypto_shash_import(&rctx->desc, in); + return crypto_shash_import(desc, in); } static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,