From patchwork Fri Dec 23 16:04:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9487579 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 CF5A3601D3 for ; Fri, 23 Dec 2016 16:06:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C31B626246 for ; Fri, 23 Dec 2016 16:06:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B840E2711E; Fri, 23 Dec 2016 16:06:47 +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 3A9A226246 for ; Fri, 23 Dec 2016 16:06:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755225AbcLWQGq (ORCPT ); Fri, 23 Dec 2016 11:06:46 -0500 Received: from mx142.netapp.com ([216.240.21.19]:6612 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966263AbcLWQGp (ORCPT ); Fri, 23 Dec 2016 11:06:45 -0500 X-IronPort-AV: E=Sophos;i="5.33,393,1477983600"; d="scan'208";a="161000130" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx142-out.netapp.com with ESMTP; 23 Dec 2016 08:03:07 -0800 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server id 15.0.1210.3; Fri, 23 Dec 2016 08:06:22 -0800 Received: from rhel7-1ga.androsad.fake (dros-16.local.vpn.netapp.com [10.55.72.69]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id uBNG6EUs024091; Fri, 23 Dec 2016 08:06:22 -0800 (PST) From: To: CC: , , Andy Adamson Subject: [PATCH Version 3 09/16] SUNRPC AUTH_GSS free assertions Date: Fri, 23 Dec 2016 11:04:21 -0500 Message-ID: <1482509068-24516-10-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482509068-24516-1-git-send-email-andros@netapp.com> References: <1482509068-24516-1-git-send-email-andros@netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson Signed-off-by: Andy Adamson --- net/sunrpc/auth_gss/auth_gss.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index de0c9ef..8445ff4 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -59,6 +59,7 @@ static int gss3_create_label(struct rpc_cred *cred); static struct gss3_assert *gss3_use_child_handle(struct gss_cl_ctx *ctx); static struct gss3_assert *gss3_match_label(struct gss3_assert_list *in); +static void gss3_free_assertions(struct gss3_assert_list *in); static const struct rpc_authops authgss_ops; @@ -1262,11 +1263,10 @@ static void gss_pipe_free(struct gss_pipe *p) static void gss_do_free_ctx(struct gss_cl_ctx *ctx) { - dprintk("RPC: %s\n", __func__); - gss_delete_sec_context(&ctx->gc_gss_ctx); kfree(ctx->gc_wire_ctx.data); kfree(ctx->gc_acceptor.data); + gss3_free_assertions(&ctx->gc_alist); kfree(ctx); } @@ -1642,6 +1642,41 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred) spin_unlock(&alist->assert_lock); } +static void gss3_free_label(struct gss3_label *gl) +{ + kfree(gl->la_label.data); +} + +/** + * Note: Currently, only support for one assertion so gss3_num always = 1 + */ +static void gss3_free_assertions(struct gss3_assert_list *in) +{ + struct gss3_assert *found; + + spin_lock(&in->assert_lock); + + rcu_read_lock(); + list_for_each_entry_rcu(found, &in->assert_list, gss3_list) { + list_del_rcu(&found->gss3_list); + /* allocated in gss3_dec_label */ + kfree(found->gss3_handle.data); + /* gss3_num is always one for now */ + switch (found->gss3_assertion->au_type) { + case GSS3_LABEL: + gss3_free_label(&found->gss3_assertion->u.au_label); + break; + case GSS3_PRIVS: + default: + pr_warn("RPC %s Can't free unsupported au_type %d\n", + __func__, found->gss3_assertion->au_type); + return; + } + } + rcu_read_unlock(); + spin_unlock(&in->assert_lock); +} + static struct gss3_assert * gss3_match_label(struct gss3_assert_list *in) { @@ -1806,6 +1841,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred) if (unlikely(!p)) goto out_overflow; + /* freed in gss3_free_assertions */ g3cr->cr_handle = kmemdup(p, g3cr->cr_hlen, GFP_KERNEL); if (!g3cr->cr_handle) goto out_err;