From patchwork Wed Jul 27 11:02:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schubert X-Patchwork-Id: 1011392 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6RB2xkT023137 for ; Wed, 27 Jul 2011 11:02:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754565Ab1G0LC5 (ORCPT ); Wed, 27 Jul 2011 07:02:57 -0400 Received: from mailgw1.uni-kl.de ([131.246.120.220]:42040 "EHLO mailgw1.uni-kl.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754541Ab1G0LC4 (ORCPT ); Wed, 27 Jul 2011 07:02:56 -0400 Received: from itwm2.itwm.fhg.de (itwm2.itwm.fhg.de [131.246.191.3]) by mailgw1.uni-kl.de (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id p6RB2sCb032398 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Wed, 27 Jul 2011 13:02:54 +0200 Received: from mail2.itwm.fhg.de ([131.246.191.79]:58502) by itwm2.itwm.fhg.de with esmtps (TLSv1:DES-CBC3-SHA:168) (/C=DE/ST=Rheinland-Pfalz/L=Kaiserslautern/O=Fraunhofer ITWM/OU=SLG/CN=mail2.itwm.fhg.de)(verified=1) (Exim 4.74 #1) id 1Qm1t8-0007EX-OC; Wed, 27 Jul 2011 13:02:54 +0200 Subject: [PATCH 2/3] Remove check for a 32-bit cookie in nfsd4_readdir() To: linux-nfs@vger.kernel.org, linux-ext4@vger.kernel.org From: Bernd Schubert Cc: linux-fsdevel@vger.kernel.org, yong.fan@whamcloud.com, adilger@whamcloud.com, tytso@mit.edu Date: Wed, 27 Jul 2011 13:02:54 +0200 Message-ID: <20110727110254.204979.34074.stgit@localhost.localdomain> In-Reply-To: <20110727110148.204979.49551.stgit@localhost.localdomain> References: <20110727110148.204979.49551.stgit@localhost.localdomain> User-Agent: StGit/0.15 MIME-Version: 1.0 X-ITWM-CharSet: utf-8 X-ITWM-Scanned-By: mail2.itwm.fhg.de 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 27 Jul 2011 11:02:59 +0000 (UTC) Fan Yong noticed simply setting O_64BITHASH wouldn't work with nfsd v4, as nfsd4_readdir() checks for a 32 bit cookie. However, according to RFC 3530 cookies have a 64 bit type and it is also defined as u64 'struct nfsd4_readdir'. So remove the test for >32-bit values. Signed-off-by: Bernd Schubert --- fs/nfsd/nfs4proc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 3a6dbd7..f7799d3 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -682,7 +682,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion); readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion); - if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) || + if ((cookie == 1) || (cookie == 2) || (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE))) return nfserr_bad_cookie;