From patchwork Fri Dec 23 16:04:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9487581 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 D00CF601D3 for ; Fri, 23 Dec 2016 16:06:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C35C726246 for ; Fri, 23 Dec 2016 16:06:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B83E62711E; Fri, 23 Dec 2016 16:06:48 +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 7680E26246 for ; Fri, 23 Dec 2016 16:06:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966263AbcLWQGr (ORCPT ); Fri, 23 Dec 2016 11:06:47 -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 S1760474AbcLWQGr (ORCPT ); Fri, 23 Dec 2016 11:06:47 -0500 X-IronPort-AV: E=Sophos;i="5.33,393,1477983600"; d="scan'208";a="161000134" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx142-out.netapp.com with ESMTP; 23 Dec 2016 08:03:08 -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 uBNG6EUt024091; Fri, 23 Dec 2016 08:06:23 -0800 (PST) From: To: CC: , , Andy Adamson Subject: [PATCH Version 3 10/16] SUNRPC: AUTH_GSS add RPC_GSS_PROC_CREATE case for wrap and unwrap Date: Fri, 23 Dec 2016 11:04:22 -0500 Message-ID: <1482509068-24516-11-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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 8445ff4..2b284e1 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -2325,7 +2325,8 @@ static void gss_wrap_req_encode(kxdreproc_t encode, struct rpc_rqst *rqstp, int status = -EIO; dprintk("RPC: %5u %s\n", task->tk_pid, __func__); - if (ctx->gc_proc != RPC_GSS_PROC_DATA) { + if (!(ctx->gc_proc == RPC_GSS_PROC_DATA || + ctx->gc_proc == RPC_GSS_PROC_CREATE)) { /* The spec seems a little ambiguous here, but I think that not * wrapping context destruction requests makes the most sense. */ @@ -2444,7 +2445,8 @@ static void gss_wrap_req_encode(kxdreproc_t encode, struct rpc_rqst *rqstp, int savedlen = head->iov_len; int status = -EIO; - if (ctx->gc_proc != RPC_GSS_PROC_DATA) + if (!(ctx->gc_proc == RPC_GSS_PROC_DATA || + ctx->gc_proc == RPC_GSS_PROC_CREATE)) goto out_decode; switch (gss_cred->gc_service) { case RPC_GSS_SVC_NONE: