From patchwork Thu Oct 27 14:29:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Ryabinin X-Patchwork-Id: 9400111 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 0584D600BA for ; Thu, 27 Oct 2016 18:03:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB2882A1F1 for ; Thu, 27 Oct 2016 18:03:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E02BF2A1FE; Thu, 27 Oct 2016 18:03:37 +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 466052A1F1 for ; Thu, 27 Oct 2016 18:03:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936547AbcJ0SDf (ORCPT ); Thu, 27 Oct 2016 14:03:35 -0400 Received: from mail-ve1eur01on0131.outbound.protection.outlook.com ([104.47.1.131]:40799 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933758AbcJ0SDa (ORCPT ); Thu, 27 Oct 2016 14:03:30 -0400 X-Greylist: delayed 7205 seconds by postgrey-1.27 at vger.kernel.org; Thu, 27 Oct 2016 14:03:29 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=ZjQPMyd/VuxJteqyxVYgaqWaMJDu3u+qaejK3VJG6JE=; b=AQspwqvMH5LaimkskzKRGy5o6oEF6e5r2jMNqIpn94stDN8s08c6pLg5w9sxhAM44DSxVL2C6Zgf5PFn6jTkBablJX16eNt8TnmmdW71sEMpVPE+E0DBy/0/sOcIKYmc2iEdeI1uJgFPRF1MSDQv52cdrx7oLzyyy1n26gZNm2s= 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:29:56 +0000 From: Andrey Ryabinin To: Willy Tarreau , CC: Herbert Xu , , Andrey Ryabinin Subject: [PATCH stable 3.10.y 10/18] crypto: algif_hash - Remove custom release parent function Date: Thu, 27 Oct 2016 17:29:43 +0300 Message-ID: <1477578591-28924-11-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: 2d4fe1f4-84de-46e3-dca1-08d3fe75b989 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 2:BmKsMDhbxRYi4VZ8K0uV3tdzRN2723H5rpPOGAlDr2TTpuW4n88+6DMti8ohnxKge4RcN6bZpo4Ace5QxI3v4Yry4Yb4yihB+krnefx9NkBvjR4fTMPQhCDK6VTJzISra700zkiyFDnEM1YqzaJOClj3Ph7mwfBn9D9yqatSpJwVWUal3c1W11uUKGGirsFGaJxTPC1ssruq5Z5G4DUhxw==; 3:YhwKSJ5DWSYLyX8qCJuniZlx8cr3KgHwmE5LqKV/y73yu8OZ82UIv4ZizKn2RW3Lxkdt0paazcEHrO6b5wXGrZknkzq6DoygBDUf1K4/O+nDcrGxSWvRajlQANnOswRMXkRwXhUJd23ZGVzjSa0+kA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 25:EQ01TwFSG/fOow6Xpt5QCBFXHhSYyr9vM8z8zoDEg/MajLCvCrWrDyU/SDRzOZSd+DdcN5BpjXGOLz/V0BCVBBUDvqtrAO6MWzxM5CE0Z5nmv8UVrRAgXZElQhYhv4xRoE/O8ruZRX3HyEY793DjLsSlk8H3vq00e7p1yDf4glIClxudnW8fyzuvIE3AMBWGWF7pPHuM9i4Yae43WtAA2hUVWfvow31TMQfm11vdr6on/WneHkVv7/7BhMnt3bG9x55zul0dunTGHlADRtXALffXUYrkWwJkG6IL6myktSOtmXmEEsZZsOjDYOi09iVH1QS6OV6FaS5mcvRhWMb+RrjHyx2MGKOwQyzT00y3ozl2DmbEp/W3XgcJdULQaPb9NgghnhXNuJufjMfFyQTgCd5JBhN1CPHpnf+KDtZjVRVVDRFi+KfmC6T0N2OAymTpe9M4F32QjYEYuol+PO6tLDj78av7SfbLq4oLgP6hcjdplo8mD6vyrdHXf4T5e5VC58PO/EoyLyaHWv2M2TudgP5zkqxNv6EsBHuWrQgbvhd7+dZ09AlNo6i15p0eZB8Gy7KE8b60QmbtMx1rbH6p5pNWviT+pxKLVKgdxy2d8PFzvT2/P4RaHi07KKmZDZAJllzQlEtd4AtW1FI7Jt+0poIXPVHOnTzihOCwi7/dVTMunoVIjoOSXRZoVL1TCSp4EswslLbzEJHY0JnImGugyY9Fx5l3ezT6TWv6v9wXfOVoeZdHSpcfbhVUValQtVpY X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 31:smg73nlyJTe2xBwUnmbAxQ0ZRgY6+TW4izzAG04WkNypJrPGQRRBgds2DVjvqyGfX1E9fqKw6fEuPOLCMMGlIMnQc6m3t+ZxdzJByPvlGb0RGLqdOxtPhsDS/1mABRSZ7EQgCXYNDUfzpjnZJBnxbx8pBpEtUklLGdt1vQL8oTOfTXzkKkMhpPbuvOTVscfsTR8ZqQLKvT7VKbjlaMQNYg4rojYf6MNrDebDjLx6j2gTQ2Xfwz57WFbT5iApLrWBVk9/ckfAEolpQkoqD6nYBQ==; 4:S7Dr+2wfO7GLSLa80OBeQ5niEWnsKrItr3sZEPraqfcuMWUQ8/6q3nvMQsKmFYl0/YqOQxCrEEm3jCEgv6mp7py/niAE8Alhv9dbEMT2wVIFsG4o6HgexqT1RafUfV/N0Ly4PuE9du0dYEQhIhOrCXc6GFHku3sznxSaBKUD4P0QtUZFG/qtP5INR11gdtlDeUS6WGQK72BX+GkiB7IThct3hb2tudARHWwZFQqpqxZ8ckcC8JHaottauFJJlsxOSfsjYYDaGf+6PQWOSiKV5+kEbQ1uN/5tqcGkZV/EExskvdAIuWt/lJSzX1sXjKdhyEn1JZWWsHdXmUZtnwHUAZhFvTCFCTmmTR8SO0AZATCbscGLUFqYNXdyFIgMlLePRQbbnrFL/ME+DFLZlpkwwtIp0zlWzOau+nQB7L/I88XSjRHiZjHu//jYSwWNbKAnpQsLMx+l4rzp74nIO2MDTsbmKhrdJFlN9Gz7n/MtDWs= 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)(575784001)(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:h48qIMlG4PW/dY4CzyxwCJOEHkA9b/FMqEBh2ew?= =?us-ascii?Q?H2zUr/58VmohSkPLyjM95AFkIh3x5Ifc7wt/KE0bbQRRKGSl+loQV4/Ep6yL?= =?us-ascii?Q?iL9Yfa2SqY+QvZEOmbwXeqElC3VBwiP7ZQTclrHJFSvKEwmsr+BBiQADgI4E?= =?us-ascii?Q?axFdHtKxAVzlFMnwh8hwmJzrGwqkIn6esXQUHh/EFvp7YzqFsM2xowfkxJDS?= =?us-ascii?Q?I/zc34Sjy0XdHrj1RzP+4jLrNi1+1Ed6h+YOkDvtmIaBehNIQbjiG0ZReuzC?= =?us-ascii?Q?rcr6vupSH6V3GgGYknfdl6aVwoBRbLfVyROZ4MfRvAvHgGaNZLugJvqEhI8p?= =?us-ascii?Q?iOp5motW+jvxI3uJ+meGdjGWkP3XprCnZ65smoZ79sIM6hXWB1sW7tZ+xPhZ?= =?us-ascii?Q?oo059EQMFargXLJF7tfF2m2m57YGcwfMC6NMZ51WacwUDYARF13vJItvIOfF?= =?us-ascii?Q?/TQCxt7IQyjFLmQx1FgpifQnWlbFiVqXwdNQFnFtceQrjrLZXXzgqPC/In0F?= =?us-ascii?Q?f3AJsIjJJiGH5IbC/IuJWeiDz0k9BgR6PEsni+YuuwrfMKSyqeGb2mvg8OC8?= =?us-ascii?Q?pv71kCxknuW/xZtoiFL3yHOvav2mNGskcPky5xLfV5j6bbkItxYsguR2Nynr?= =?us-ascii?Q?HeaedM190t6x9zB1342XzqbSqcNDcgxzxvNbT/ITiSjbeDZQJuRG31LZk74L?= =?us-ascii?Q?cT3x/DSoNmFZEYG99bMSrK8+00GxT/J5b/sJkXwCv8/MasZQejl/il0xhxO9?= =?us-ascii?Q?lFVa+2VLLAo0RBioJU1EEIjFQh2Wqio3OjUX/sFHTABull1sukpM3gVtUCdZ?= =?us-ascii?Q?YXl9MbXl2g0tBkS34QLoABaKky/e8jzt0jG5t+cKlGCgKVkXfO1YE1qA+VLw?= =?us-ascii?Q?BGoJOLD4wmHoVOqgsC++mBPCgUmwAQL3BRaClBnsSLU2qxnGVqW5P/LnaJIg?= =?us-ascii?Q?068yuUNzm/59Unkz68yN5GhzMMiKV8Wi97C0Qjco/s/zHA6yF0aZwbN539rI?= =?us-ascii?Q?1KLQ9r9daWHlFIFWcleCcrTNmxGiAe361pKVhhDlwQV2XdKxqc45biJCOGue?= =?us-ascii?Q?9S62C26lEgOuj3KtSq/tCQhZNEd3rILyonKNzR72oJqkgn8znazfjLA/Xvh1?= =?us-ascii?Q?djtAqJwMGmCKdvqLU0eZZrnPYgufcC2f6J/Hz87bqr4U+IPsfGvy8OTI11ei?= =?us-ascii?Q?h7H4DItXFlMxSIvq77pvuFExUcKTi4G2JtSo1i2skGIn5dLr08Shj6Hr70B9?= =?us-ascii?Q?KHdLZZYfvXw/guTlwYnuarMY3Im4qggOtKWMWNkQzPRIGzkAw67KJ+hbkfZT?= =?us-ascii?Q?rxw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 6:mSow+c5GVbpWx1p+fcD/HnOLAftgVmX+guKmmNjirmUoHtaeAaVJaOhDZ9pF07ll7IqFgH2XV1EeRtiNQOOmhRY+JSrjhOLMQI/Q0wSbQhhtkwwZLQpVTSVNKdOLHlrMR0aWnKVQOnjYrcWRrYkESdYMmPeFtt0FZb9f8bALbIGlSrJxzbP2IsmR5xTU5QruWITZ+KXHmTYEDFE66SnPwPVjEnQaMMeMT3kbf9znJqJt5skqeCV+RYkwn9WEIOfOOVS+8nsvhkyflTK3VdpuL0jFLmH7fH5/+7JfsxeWlJVGEYr1Tu0EpYV6IcjKK03vQdfHpO95xwNm4YCS0DRpnA==; 5:Jaxo3zbpaC/3ziCmIunChWpIL7vhT2Y5/LLTGeZnwK4IaoAgyVQZrbSAq16AZUvMkE5/VhbZhiZSjHLToPeUg4usN0L66qzlIxgJdjdzclIZeuBiCt6Z7Q0yL/J/5/c4HFKYGbDeDJ2bI263GnuE1A==; 24:b0sUOtwJ96VKP7tSp0WZ5V83IlwoCa57Ey2NFvLO7XZSsgPC5bT6HLBSbMUIsYFu0WPdo+i2+NNPDphZ0uFacn6J4TRLkSWeIyOI22MWXJ4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 7:8abGvfz5METi4GN7G9v5NnIoDqkMc/Z1yTb77y44gxQz9U0CODay1KOLgyzeYbtBgzEIdTzjoJtRjFTx8HJQKVGbqvMD3/wBtljodsthI5DILud0ebGeIb/YAJFYrbcswCPpnWr83Ua2WQM7KgmPedTsLGv+CpFr5JrxMlKEWCSnmP+WB0NNBJqYO/u3FuCFXyGcGFHLlA4RWLTmSy+gBzRyVnylOCW5qrkbz7iJ88x5mdbUvNTw0nHkNabRVN9Ww8DnqfwuCtKu1sODhNVfVVMvc+579bBwowcTaF11lrwP0cwfkwOFtLDy55XdcRinEghjDKPG6b+YKzJowr1e8SUC8AZezVDECPdeONT901Y=; 20:WIZn2+FRgCtVFzGGeZYYFID1XlyBAVTdk7IhV2hYlvNmwCHwCJPmOAz8NG+dwuX6mQ9VxZyMTPGSR0T0NAmz0Rku6MGckv/IOpSybyFg1eauGxQJ3vdC7f1WWURya7rXAdDT3wki/WVuDkegMS/hXmPeUoRE9Vdf8rm/Gnla5B0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2016 14:29:56.0745 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2555 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 From: Herbert Xu commit f1d84af1835846a5a2b827382c5848faf2bb0e75 upstream. This patch removes the custom release parent function as the generic af_alg_release_parent now works for nokey sockets too. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu Signed-off-by: Andrey Ryabinin --- crypto/algif_hash.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 7bc3f89..512aa36 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -397,7 +397,7 @@ static int hash_setkey(void *private, const u8 *key, unsigned int keylen) return err; } -static void hash_sock_destruct_common(struct sock *sk) +static void hash_sock_destruct(struct sock *sk) { struct alg_sock *ask = alg_sk(sk); struct hash_ctx *ctx = ask->private; @@ -405,33 +405,10 @@ static void hash_sock_destruct_common(struct sock *sk) sock_kfree_s(sk, ctx->result, crypto_ahash_digestsize(crypto_ahash_reqtfm(&ctx->req))); sock_kfree_s(sk, ctx, ctx->len); -} - -static void hash_sock_destruct(struct sock *sk) -{ - hash_sock_destruct_common(sk); - af_alg_release_parent(sk); -} - -static void hash_release_parent_nokey(struct sock *sk) -{ - struct alg_sock *ask = alg_sk(sk); - - if (!ask->refcnt) { - sock_put(ask->parent); - return; - } - af_alg_release_parent(sk); } -static void hash_sock_destruct_nokey(struct sock *sk) -{ - hash_sock_destruct_common(sk); - hash_release_parent_nokey(sk); -} - -static int hash_accept_parent_common(void *private, struct sock *sk) +static int hash_accept_parent_nokey(void *private, struct sock *sk) { struct hash_ctx *ctx; struct alg_sock *ask = alg_sk(sk); @@ -474,21 +451,7 @@ static int hash_accept_parent(void *private, struct sock *sk) if (!tfm->has_key && crypto_ahash_has_setkey(tfm->hash)) return -ENOKEY; - return hash_accept_parent_common(private, sk); -} - -static int hash_accept_parent_nokey(void *private, struct sock *sk) -{ - int err; - - err = hash_accept_parent_common(private, sk); - if (err) - goto out; - - sk->sk_destruct = hash_sock_destruct_nokey; - -out: - return err; + return hash_accept_parent_nokey(private, sk); } static const struct af_alg_type algif_type_hash = {