From patchwork Wed Jan 5 20:51:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 455001 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 p05Kq0Jf001420 for ; Wed, 5 Jan 2011 20:52:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753024Ab1AEUv5 (ORCPT ); Wed, 5 Jan 2011 15:51:57 -0500 Received: from mx2.netapp.com ([216.240.18.37]:12006 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045Ab1AEUvz (ORCPT ); Wed, 5 Jan 2011 15:51:55 -0500 X-IronPort-AV: E=Sophos;i="4.60,279,1291622400"; d="scan'208";a="502095681" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 05 Jan 2011 12:51:45 -0800 Received: from localhost.localdomain (isabel3-lxp.hq.netapp.com [10.58.58.218] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p05KpZtN013531; Wed, 5 Jan 2011 12:51:45 -0800 (PST) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: bfields@redhat.com, linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH_V8 10/13] NFS RPC_AUTH_GSS unsupported on v4.1 back channel Date: Wed, 5 Jan 2011 15:51:28 -0500 Message-Id: <1294260690-3095-11-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1294260690-3095-10-git-send-email-andros@netapp.com> References: <1294260690-3095-1-git-send-email-andros@netapp.com> <1294260690-3095-2-git-send-email-andros@netapp.com> <1294260690-3095-3-git-send-email-andros@netapp.com> <1294260690-3095-4-git-send-email-andros@netapp.com> <1294260690-3095-5-git-send-email-andros@netapp.com> <1294260690-3095-6-git-send-email-andros@netapp.com> <1294260690-3095-7-git-send-email-andros@netapp.com> <1294260690-3095-8-git-send-email-andros@netapp.com> <1294260690-3095-9-git-send-email-andros@netapp.com> <1294260690-3095-10-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]); Wed, 05 Jan 2011 20:52:01 +0000 (UTC) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 15677e7..753a9e3 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -365,6 +365,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_DROP; /* * It might just be a normal user principal, in which case * userspace won't bother to tell us the name at all.