From patchwork Fri Dec 23 16:04:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9487559 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 6DAAA601D3 for ; Fri, 23 Dec 2016 16:06:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FCB526E82 for ; Fri, 23 Dec 2016 16:06:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5441D27829; Fri, 23 Dec 2016 16:06: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.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 014BD26E82 for ; Fri, 23 Dec 2016 16:06:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966254AbcLWQGe (ORCPT ); Fri, 23 Dec 2016 11:06:34 -0500 Received: from mx141.netapp.com ([216.240.21.12]:7681 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755948AbcLWQGb (ORCPT ); Fri, 23 Dec 2016 11:06:31 -0500 X-IronPort-AV: E=Sophos;i="5.33,393,1477983600"; d="scan'208";a="172209680" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx141-out.netapp.com with ESMTP; 23 Dec 2016 08:03:09 -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:18 -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 uBNG6EUo024091; Fri, 23 Dec 2016 08:06:19 -0800 (PST) From: To: CC: , , Andy Adamson Subject: [PATCH Version 3 05/16] SUNRPC AUTH_GSS get RPCSEC_GSS version from gssd downcall Date: Fri, 23 Dec 2016 11:04:17 -0500 Message-ID: <1482509068-24516-6-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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 96135da..9288cc2 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -213,6 +213,7 @@ struct gss_auth { unsigned int seclen; unsigned int timeout; unsigned long now = jiffies; + unsigned int gss_v; u32 window_size; int ret; @@ -226,6 +227,13 @@ struct gss_auth { if (timeout == 0) timeout = GSSD_MIN_TIMEOUT; ctx->gc_expiry = now + ((unsigned long)timeout * HZ); + + /* RPCSEC_GSS version used to obtain context */ + p = simple_get_bytes(p, end, &gss_v, sizeof(gss_v)); + if (IS_ERR(p)) + goto err; + ctx->gc_v = gss_v; + /* Sequence number window. Determines the maximum number of * simultaneous requests */ @@ -1511,10 +1519,10 @@ static void gss_pipe_free(struct gss_pipe *p) req->rq_seqno = ctx->gc_seq++; spin_unlock(&ctx->gc_seq_lock); - *p++ = htonl((u32) RPC_GSS_VERSION); - *p++ = htonl((u32) ctx->gc_proc); - *p++ = htonl((u32) req->rq_seqno); - *p++ = htonl((u32) gss_cred->gc_service); + *p++ = htonl((u32)ctx->gc_v); + *p++ = htonl((u32)ctx->gc_proc); + *p++ = htonl((u32)req->rq_seqno); + *p++ = htonl((u32)gss_cred->gc_service); p = xdr_encode_netobj(p, &ctx->gc_wire_ctx); *cred_len = htonl((p - (cred_len + 1)) << 2);