From patchwork Tue Nov 30 20:31:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 369051 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAUMTd9j024662 for ; Tue, 30 Nov 2010 22:29:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754921Ab0K3W3L (ORCPT ); Tue, 30 Nov 2010 17:29:11 -0500 Received: from mx2.netapp.com ([216.240.18.37]:53275 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753656Ab0K3W3I (ORCPT ); Tue, 30 Nov 2010 17:29:08 -0500 X-IronPort-AV: E=Sophos;i="4.59,282,1288594800"; d="scan'208";a="489187678" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 30 Nov 2010 14:29:08 -0800 Received: from localhost.localdomain (verdan01-lxp.hq.netapp.com [10.58.48.142] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id oAUMT3Zp011288; Tue, 30 Nov 2010 14:29:08 -0800 (PST) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 5/5] NFS RPC_AUTH_GSS unsupported on v4.1 back channel Date: Tue, 30 Nov 2010 15:31:11 -0500 Message-Id: <1291149071-2026-6-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1291149071-2026-5-git-send-email-andros@netapp.com> References: <1291149071-2026-1-git-send-email-andros@netapp.com> <1291149071-2026-2-git-send-email-andros@netapp.com> <1291149071-2026-3-git-send-email-andros@netapp.com> <1291149071-2026-4-git-send-email-andros@netapp.com> <1291149071-2026-5-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Nov 2010 22:29:45 +0000 (UTC) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 7c21824..dc2ead1 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -360,6 +360,9 @@ static int check_gss_callback_principal(struct nfs_client *clp, struct rpc_clnt *r = clp->cl_rpcclient; char *p = svc_gss_principal(rqstp); + /* No RPC_AUTH_GSS on NFSv4.1 back channel yet */ + if (clp->cl_minorversion != 0) + return SVC_DENIED; /* * It might just be a normal user principal, in which case * userspace won't bother to tell us the name at all.