From patchwork Fri Feb 26 11:44:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Broz X-Patchwork-Id: 8436101 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 964799F7C9 for ; Fri, 26 Feb 2016 11:44:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F0F62020F for ; Fri, 26 Feb 2016 11:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A73022039D for ; Fri, 26 Feb 2016 11:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751185AbcBZLo2 (ORCPT ); Fri, 26 Feb 2016 06:44:28 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34739 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751488AbcBZLo0 (ORCPT ); Fri, 26 Feb 2016 06:44:26 -0500 Received: by mail-wm0-f68.google.com with SMTP id b205so8631791wmb.1; Fri, 26 Feb 2016 03:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VRgMhIB9kLBqqXuVGhAV0winLcHskOUVi3DERqcNNqQ=; b=abl0Gsw+rIqhif8jOoD4PcwjjapUq7gKy5dOfnwxag6QYwerJkMmLyM/G0bnH9bXXZ dfeNbCOH592NYYMKJUnJHoeTTFL6UA/7sEckDpIfzrLwIY4ILnPmXR9/Yms2CTL5EOsm PInWExIwJkbyP5qdoWqwsTDig5CJs8AHvh6p/3TJEqIha+yXmp99MhyiXVTpCYcLXtNq J4j+I8xQxceIlg1QiU0X50Xk+zHeJF1/o8h3VNHKxNtf1rQ2dC3/tc6ai4TyIITo7C3M oznYPXBSRWZDGYRGqRyH3OgvQ1xbjXsC/ZDPhLmKXhdbzwurOjeBedE993FyehmE1WqT X30g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VRgMhIB9kLBqqXuVGhAV0winLcHskOUVi3DERqcNNqQ=; b=PE8IWDbIjOgwkkwNcAudHLrAIx1SsUcFb6tTFp+YZpaVa4kwytxiA1JuqiLAH5O5XS l1OH6ZVVhkUjvYAVGQV+mHwFESLHPDYNLcWosi2YP8kY+2QDJUYXg3xHMm72Ykm5q6Nx M2x6EnLz0Rc4ywDC9DM9UObzfSHz5GzcXetuvxEEwiJ3ceBF1aRHca1aXWQBJiVwAXhs uOPWnj98vKWGKvIBmrGIOTETMfJ46GeC19veFmGABkbdquQrfRoukwnHfRLsSxLx2m3X vhjB9G2uMFuBtGaYWs/OjdknWWWyJy8HhwlsfXKEKbavrm4N9cWtNJMySw9xISzgl7MS Q2Tg== X-Gm-Message-State: AD7BkJJsdEHeR6DPRV0GwwyTDTXsEr4V47GUR4hCVuwDSZ7LLDHxtvP+IGki0Libwpw5bg== X-Received: by 10.194.86.68 with SMTP id n4mr1452071wjz.150.1456487064830; Fri, 26 Feb 2016 03:44:24 -0800 (PST) Received: from merlot.mazyland.net (hector.fi.muni.cz. [147.251.42.24]) by smtp.gmail.com with ESMTPSA id j10sm12058768wjb.46.2016.02.26.03.44.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Feb 2016 03:44:24 -0800 (PST) From: Milan Broz To: linux-crypto@vger.kernel.org Cc: stable@vger.kernel.org, Herbert Xu Subject: [PATCH 3/4] crypto: algif_skcipher - Remove custom release parent function Date: Fri, 26 Feb 2016 12:44:10 +0100 Message-Id: <1456487051-14652-3-git-send-email-gmazyland@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456487051-14652-1-git-send-email-gmazyland@gmail.com> References: <56D0361B.8040301@gmail.com> <1456487051-14652-1-git-send-email-gmazyland@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Herbert Xu commit d7b65aee1e7b4c87922b0232eaba56a8a143a4a0 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 --- crypto/algif_skcipher.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 566df2c..83bcf75 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -897,7 +897,7 @@ static void skcipher_wait(struct sock *sk) msleep(100); } -static void skcipher_sock_destruct_common(struct sock *sk) +static void skcipher_sock_destruct(struct sock *sk) { struct alg_sock *ask = alg_sk(sk); struct skcipher_ctx *ctx = ask->private; @@ -909,33 +909,10 @@ static void skcipher_sock_destruct_common(struct sock *sk) skcipher_free_sgl(sk); sock_kzfree_s(sk, ctx->iv, crypto_ablkcipher_ivsize(tfm)); sock_kfree_s(sk, ctx, ctx->len); -} - -static void skcipher_sock_destruct(struct sock *sk) -{ - skcipher_sock_destruct_common(sk); - af_alg_release_parent(sk); -} - -static void skcipher_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 skcipher_sock_destruct_nokey(struct sock *sk) -{ - skcipher_sock_destruct_common(sk); - skcipher_release_parent_nokey(sk); -} - -static int skcipher_accept_parent_common(void *private, struct sock *sk) +static int skcipher_accept_parent_nokey(void *private, struct sock *sk) { struct skcipher_ctx *ctx; struct alg_sock *ask = alg_sk(sk); @@ -983,21 +960,7 @@ static int skcipher_accept_parent(void *private, struct sock *sk) if (!tfm->has_key) return -ENOKEY; - return skcipher_accept_parent_common(private, sk); -} - -static int skcipher_accept_parent_nokey(void *private, struct sock *sk) -{ - int err; - - err = skcipher_accept_parent_common(private, sk); - if (err) - goto out; - - sk->sk_destruct = skcipher_sock_destruct_nokey; - -out: - return err; + return skcipher_accept_parent_nokey(private, sk); } static const struct af_alg_type algif_type_skcipher = {