From patchwork Fri Apr 4 13:58:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 3938651 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A67D39F1EE for ; Fri, 4 Apr 2014 13:59:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D72A120384 for ; Fri, 4 Apr 2014 13:59:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15DFB2035C for ; Fri, 4 Apr 2014 13:59:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753294AbaDDN6s (ORCPT ); Fri, 4 Apr 2014 09:58:48 -0400 Received: from fieldses.org ([174.143.236.118]:59586 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752449AbaDDN6r (ORCPT ); Fri, 4 Apr 2014 09:58:47 -0400 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1WW4dn-0000Vx-1S; Fri, 04 Apr 2014 09:58:43 -0400 Date: Fri, 4 Apr 2014 09:58:43 -0400 From: "J. Bruce Fields" To: Jeff Layton Cc: Mark Lord , "J. Bruce Fields" , Albert Fluegel , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-3.14 nfsd regression Message-ID: <20140404135842.GB17594@fieldses.org> References: <533D8D73.1090603@pobox.com> <20140403171643.GB28790@pad.redhat.com> <533D9F8A.6030001@pobox.com> <20140403145504.3b04170e@tlielax.poochiereds.net> <20140403201627.GC8343@fieldses.org> <20140403192146.79679909@tlielax.poochiereds.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140403192146.79679909@tlielax.poochiereds.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Apr 03, 2014 at 07:21:46PM -0400, Jeff Layton wrote: > So according to the RFC you have to encode both the mode bits and the > ftype for v2. The type bits seem to be removed from the mode in NFSv3 > though, so perhaps we should only be doing that masking in versions > above v2? Right, the problematic patch applied the same mask in both v2 and v3 cases, so I'm reverting just the v2 part (see below). > With a quick check, it looks like the v3 code doesn't rely on those bits > and I imagine v4 doesn't either. > > It might also be nice to have the client v2 decode_fattr function to > throw a warning if the server sends us mismatched type bits and ftype > values. That would have helped us catch this sooner... Yes, that might be a reasonable thing to do, though I don't know if it's worth it. --b. commit 35a8dff14e76c00e5b52140290cfb498dc2454a0 Author: J. Bruce Fields Date: Thu Apr 3 15:10:35 2014 -0400 nfsd: revert v2 half of "nfsd: don't return high mode bits" This reverts the part of commit 6e14b46b91fee8a049b0940333ce13a820beaaa5 that changes NFSv2 behavior. Mark Lord found that it broke nfs-root for Linux clients, because it broke NFSv2. In fact, from RFC 1094: "Notice that the file type is specified both in the mode bits and in the file type. This is really a bug in the protocol and will be fixed in future versions." So NFSv2 clients really are expected to depend on the high bits of the mode. Cc: stable@kernel.org Reported-by: Mark Lord Signed-off-by: J. Bruce Fields Reviewed-by: Jeff Layton --- 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/nfsxdr.c b/fs/nfsd/nfsxdr.c index b17d932..9c769a4 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c @@ -152,7 +152,7 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, type = (stat->mode & S_IFMT); *p++ = htonl(nfs_ftypes[type >> 12]); - *p++ = htonl((u32) (stat->mode & S_IALLUGO)); + *p++ = htonl((u32) stat->mode); *p++ = htonl((u32) stat->nlink); *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));