Message ID | 1477578591-28924-16-git-send-email-aryabinin@virtuozzo.com (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Herbert Xu |
Headers | show
Return-Path: <linux-crypto-owner@kernel.org> 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 8602E600BA for <patchwork-linux-crypto@patchwork.kernel.org>; Thu, 27 Oct 2016 18:04:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B5852A227 for <patchwork-linux-crypto@patchwork.kernel.org>; Thu, 27 Oct 2016 18:04:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 705FD2A321; Thu, 27 Oct 2016 18:04:43 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 DC24F2A227 for <patchwork-linux-crypto@patchwork.kernel.org>; Thu, 27 Oct 2016 18:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936503AbcJ0SEl (ORCPT <rfc822;patchwork-linux-crypto@patchwork.kernel.org>); Thu, 27 Oct 2016 14:04:41 -0400 Received: from mail-ve1eur01on0095.outbound.protection.outlook.com ([104.47.1.95]:14380 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934646AbcJ0SEk (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Thu, 27 Oct 2016 14:04:40 -0400 X-Greylist: delayed 10973 seconds by postgrey-1.27 at vger.kernel.org; Thu, 27 Oct 2016 14:04:39 EDT 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=/UJmnXkwW2bJebvk7p5jVY2SgJ+A0eSKGfHhLHkEACc=; b=TOczJDMevjfkpeGhYLE3/41AzkfjWAda/YNRDxdwZSLepfAUwPw10iGzR/u8ejgy/743VW5DDEwmRNsEKJgx9w8JABObL+nLi9YneDriXLYF3H6bgSNdzPD+pHLu0qQtygkHTCvQ1+t19bMBynLSxzNKkARqxmzkG1/0IM5dvWI= 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:00 +0000 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: Willy Tarreau <w@1wt.eu>, <stable@vger.kernel.org> CC: Herbert Xu <herbert@gondor.apana.org.au>, <linux-crypto@vger.kernel.org>, Andrey Ryabinin <aryabinin@virtuozzo.com> Subject: [PATCH stable 3.10.y 15/18] crypto: algif_skcipher - Load TX SG list after waiting Date: Thu, 27 Oct 2016 17:29:48 +0300 Message-ID: <1477578591-28924-16-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 Content-Type: text/plain 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: abbcf5fb-efb8-41f3-d239-08d3fe75bc32 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 2:WSL1O+D2KGiEOToBNWp2p7Hadrblv8mByMstP5xyyIBTcIItbtPAYAD5MyQlByqgZbEvB6iMcXYsPAO9YS336Cri6MctLq8X2P61vbK+MM1dD+RQowQ7ya9QKgkBjNo7PVX4nq8SVwT7pAVcUM7xmRybT5iSUTGUqkP+kEPHVdOv6UtbZMSJXIS1f4JlEjpQu86zbt6J1o46meMjGRHdtg==; 3:NFf8OqUExtrv5m5s77Q5yB4m+rGintT8G9BBL4Evry1Ey+TQc3rjzInSlI3H7P0z09NtRkg4Wl2WXb+qkV8+/7DZuTUgHVLcWPfpGfc9PJ+ZKScZVixZ0yg/QE9EYZKVhaTz+91mrbmP5nkBgailFQ==; 25:Yxv5/ye2Z+qjTl1/DhYPABP7SxzK29h031MZyzr7E1uvr/yKOqFWwRhoL7GzZD9PF99KEk6uzuRaFiRvEA4GTAA0CaVV9yF1+3DCSKSur9QGeDHx1VJWRphfVNauUbLF8SzC3u/gJ9iT0/BIi/EeknhikZbMZ+r/uEiC4DzPyggU2x41nVUWUJPOWjI+EhOucFXKi71GMraBE+eI9/4LDirkSwPOStihQuQKB/XHVG44cH0zCzr8dvhFzFAAhcb5wEgHEUkzHDW/3xqJI15HoofjmYte+QM2HXVV7zAH9+fxN/VXTDinhgmKOVTMN8UKeAHL8YM/elRFgLQErg2fKlkwXQ33m2NDDN+4LrDTeQUhDdyyZoxW+M4TJ2xvvxQWVpaleW2E0vAD+oLL1pzmTbZNmC5Fn/oRoxP04j70IGoCXW+0e5k9QLAB2kIDe5cw X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 31:qFy+2bhuw1Jams6u//N5yn6AniXjwM2kF5DuwaWYUkS7smMoFZlHyKj9uO9xYdozdkfYjlE9SE+uq+WzLZCwi0CZPg8ndttJb2mxjEJo0i/eor2VyIC6mN0F0BQdN+9HZYCuel9UuhROSsDKa9+wZge1pxaKiNnvjgKpG9w95HZ8qhU5wX1sQS5J73YLeN+Dzd+R1OZhCDZ9FvWengVibtvxhMdzwrdPJN4B/o6+oXMUSzfmSbKlmultvmLEkPzXed9eNmir4Edc88yMhAFWHw==; 4:I59i20PoFC6X5lws3xrflFiqIHpvIzvx28OK1T2I7B7vjuJ9JUddJLi+FyLvzJL47ALwukvMjFqlRi5IdkpY9+DwrWsPgNMD6ZsHfd8fAzLCwHCpXD+Dt6k+Na/rnN6SDynBrseE39r4FCO3iyFGban13ZI1Jeo5tfm9XRrIyXLuMHD9hn+Y8uXPUYryHTn7uIPtpzVLAgrj2dJ+hq92ctzdtGjtbkDfaJbPg+aFoRaMQTv2Q6ylTMUTDZ38EBrZcCVvL4bpBhL2d/mwuS9YqF9mOrRbjynIe2E1j6jvGnQ1/odMY3VqkbxGL5IdAKY9F52KdcIMmJQdpf5eMglkY9amyLA5YClbY3/Kfjql4IEU4/WlHERlA20bxDSuE8rOoheY+xw91N/WT2lZFT2vrNoI2ixTBYv0CSb2IIoPRfqkxC7+sHP9ex8rfdoSAD4qShXIiDPv1iTT6kF7tomokVhTGhRv/Dyq8BuWNtY94rXZmx2eabOtqAkSDuZT1ftOmiuP5/ltznWshPTb8h94MA== X-Microsoft-Antispam-PRVS: <HE1PR0802MB25557017B0FBD2A76873B239B0AA0@HE1PR0802MB2555.eurprd08.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(211936372134217); 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:IGggkc7lyKuTefqiTQwNmyPXTUUIDIX3b6WKHFF?= =?us-ascii?Q?+utxR0QGn5QGN+CjJHkcDDphFLkblI21yjHQlEFLH3DW9eofIVHtyUG5XNwb?= =?us-ascii?Q?N2sli4Cwf8VrDGRcYkINCpYtK3Ud7UtTv2hXLs0xybUhUmDgRrLTQpXOl3DK?= =?us-ascii?Q?EQbNeg9HtHlZBdxoMZuONvaIAnWbc6Nq4nJ6j9JBK9DPwSd2QGEFznuKO6Ex?= =?us-ascii?Q?AMSdgEsXZI8vaaPafIPsQ1OAYNQ3/QIr7IEE5ry3GwsLt5Nis05bZcIcE6l8?= =?us-ascii?Q?4A1FSSQAq/Pdt7RQPnGqUrFW8+0fAxINzOfIIwZUKjNFivSGVqW7YJn8czvK?= =?us-ascii?Q?wdvBeVLrx/ge5KO5eofS4iiYMDzrbiigIdSZXBoz8q9zad12dt1BPDU4UrMq?= =?us-ascii?Q?Px9UKrXiTWz6q6BShuMuR9mYHV+4K9zbHHPeoh/aAfguSXB9dj1mW/MpVR6n?= =?us-ascii?Q?Rqo11jeGNfwUim3yN+ark1dHrI5DQlXJFdIAW0AOY8Os9BQhIqnMj/tzDRsJ?= =?us-ascii?Q?q5Ywkr5SAnFiM2585py48Sl+WRCuJJ5TgAfkHuGdqlalkluFz6imJI4gi8HP?= =?us-ascii?Q?WdSEVVebIGnTNqec/DV8cMZk4jpK9DJ+S9s+eiYdApuecFu0xl8ZuCcBvv0d?= =?us-ascii?Q?c/y3mCmR75NJ6Yn9LGAPClTtZpbiderkXPPSCo/aKfaFfZbF1hUHa7wmQOS1?= =?us-ascii?Q?7yPT2/nH8Nzgo1X4D+RChRQGJFGwGx3V/3tZtVLifxFxKZKLzBShJaN6eBvo?= =?us-ascii?Q?NLJYEauq9D3NooLOjVENI7ynIxuWiv4TIuO7v6djFlFmwUF23XxbrZ1iJEeV?= =?us-ascii?Q?iBKeCNsObJ1XK4F+azjhtJr1KtCVCC4+0gZHnzfabb4Z7XTUdgUo6uCYGVs3?= =?us-ascii?Q?B/c97KhF8TIWhxD25hIyKTvH00z07CSbAkrjZA4WNVrZ5VsZAVfCRvBmUk1V?= =?us-ascii?Q?3IuRNqZ/lAWmqENFSCiAiNRHIuzcV/OOB2H6MHcDThGF0PRrsTOCna0WPGHK?= =?us-ascii?Q?fHieQtvUnI19sVwVpL03Glo8lGyedT6Kx+KG8zxamNHJDPHV/k8ZJK87r3SF?= =?us-ascii?Q?PUayH8Gwb6XQK7QmP82q38B85im4X/QAw5sAJdmQGGWgweHbU1m6ZciOJdyt?= =?us-ascii?Q?BdEpBNFO0qaSOTjttucrrNuWIC86kj0DL5DSKdP29YSyKqCJS6KKj9Wo/8Dv?= =?us-ascii?Q?oJ6kZRrl2cznkL8ambTkGQyl+GprsoIx6aYcAXtmV4x4I66hmTRWCH3EGOIX?= =?us-ascii?Q?ZN/+NcEMUCLf9AimawlE=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 6:D0JEw3CY9GGo4zlYOnt8MwHA5SeBqvCq2qedEAYDLKrjcyJaG3MrtCHvJjHdLz6wPl6Mj6XsoxIaHRBSlC/Ega5YVBcZLhtPtb1ee086vrcD+MsGuQdZQKR2DEZgo5dBdRziH/TTvrZXALATIXQs5Kx4ZtJ3vLKQqLu55M26DShAivYzNwe0jOfPLdeEtjgyqCePw6X0MaLDDcEPE2MWQM0LAwu+fDw0S+1TRKIgttfniOIpdINwqoxDnCx4K2hNT26wOH3g49Ss3M39pH68BechlaHG9rFqqGCBg7YmWBvvZOe6Y9s2YurSN2br3MrOZProFeZ7Eaq6eEmuYYJejQ==; 5:D6tzoNAUzhUGZS7ExtWG6/qNmYvTF3IPl07SshKKHErDgKgmqBVq9pZ1vTl1Xy2WRUcX/p8Mwq/JI6z0vW59zTOsGW5PMUeNld9KF/vABPJ/GQcfgouu01x7HuWQKIUilzGHeZiuCUuI/FFRLd8ZdQ==; 24:+Y+dgbbyUAUiSC1aTfSjMh89g7fyKOQW4lW+UWB/+ilCEt1TtoL6/ti7sLga7Ku6iBnO2GuT2v1dd1NhM+POwzpy1Gkd7j8S02eiCajTy+E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 7:aOspFyDuLZDh/x8WzOUdAEtDzgsETGug7lqGU75xnTVpnaNpGsd15SnxFWhMihIUUOSZLu3+rs9MQ8VqOltFnfeKGO5uRbn/5/oPQde8fF+MQ2i1UoYjAvbKNzqTc1Y7HsAwnUFgbR2i5hcUMR5oIUpuiiDHj4wRMAa5oIqKiddkfI1kE2WNuyRqzo4HaJ1XaN31DjbV2h9HzPug7Khg5Ttl25EhQpE8+rKvcviemQczGk9R+U1Z4m8SUciqQh95K+yi6bn6mWnHx1KPlGDWvtOfP48Q6hqL4VuJL80pLm2QakXX/HZbNcS+P/1Tlvm21oWafh5eABzow8w57gzYt+sF9rGKMl2e1CGKserhLZk=; 20:qpKMgK5pW2zvOlVGiRJdxItUMDorw0B55+xFpWDcIFfd8Fv3krt9X/jsbFMncIts7Atpv4ejDp6PM8WWHuXFSMEwJGIQlUZ9OrWV00uUBJRT8J/9yQycjdbg9OkpabGajW5P+I4Z0p/XO/0wWiMUFiQ4CJ1KNWDK2mXXDjS/hMU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2016 14:30:00.5953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2555 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: <linux-crypto.vger.kernel.org> X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 13fd26e..ea05c53 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -446,13 +446,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, char __user *from = iov->iov_base; while (seglen) { - sgl = list_first_entry(&ctx->tsgl, - struct skcipher_sg_list, list); - sg = sgl->sg; - - while (!sg->length) - sg++; - used = ctx->used; if (!used) { err = skcipher_wait_for_data(sk, flags); @@ -474,6 +467,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, if (!used) goto free; + sgl = list_first_entry(&ctx->tsgl, + struct skcipher_sg_list, list); + sg = sgl->sg; + + while (!sg->length) + sg++; + ablkcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used, ctx->iv);