From patchwork Fri Feb 24 22:19:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9591321 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 444FB601AE for ; Fri, 24 Feb 2017 22:20:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 258CA28714 for ; Fri, 24 Feb 2017 22:20:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A7012872E; Fri, 24 Feb 2017 22:20:21 +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 A69E6287CB for ; Fri, 24 Feb 2017 22:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbdBXWUM (ORCPT ); Fri, 24 Feb 2017 17:20:12 -0500 Received: from mx143.netapp.com ([216.240.21.24]:5726 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751447AbdBXWUL (ORCPT ); Fri, 24 Feb 2017 17:20:11 -0500 X-IronPort-AV: E=Sophos;i="5.35,201,1484035200"; d="scan'208";a="178036351" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx143-out.netapp.com with ESMTP; 24 Feb 2017 14:11:25 -0800 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server id 15.0.1210.3; Fri, 24 Feb 2017 14:20:09 -0800 Received: from fc25-1.androsad.fake (dros-16.vpn.netapp.com [10.55.72.26]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id v1OMK0nZ020915; Fri, 24 Feb 2017 14:20:09 -0800 (PST) From: To: CC: , , , Andy Adamson Subject: [PATCH Version 5 11/17] SUNRPC AUTH_GSS free assertions Date: Fri, 24 Feb 2017 17:19:47 -0500 Message-ID: <20170224221953.5502-12-andros@netapp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170224221953.5502-1-andros@netapp.com> References: <20170224221953.5502-1-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 | 49 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 0b925fb..5daab12 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, int gss_vers); 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; @@ -1275,11 +1276,10 @@ gss_destroying_context(struct rpc_cred *cred) 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); } @@ -1657,6 +1657,50 @@ gss3_insert_assertion(struct gss3_assert_list *alist, struct gss3_assert *g3a) 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, *tmp; + LIST_HEAD(freelist); + + rcu_read_lock(); + spin_lock(&in->assert_lock); + list_for_each_entry_rcu(found, &in->assert_list, gss3_list) { + list_del_rcu(&found->gss3_list); + list_add(&found->gss3_list, &freelist); + } + rcu_read_unlock(); + spin_unlock(&in->assert_lock); + synchronize_rcu(); + + list_for_each_entry_safe(found, tmp, &freelist, gss3_list) { + list_del(&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; + } + kfree(found); + } +} + static struct gss3_assert * gss3_match_label(struct gss3_assert_list *in) { @@ -1821,6 +1865,7 @@ gss3_dec_create(struct rpc_rqst *req, struct xdr_stream *xdr, 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;