From patchwork Fri Oct 18 14:03:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3067371 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 07A299F243 for ; Fri, 18 Oct 2013 14:04:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 644E32038E for ; Fri, 18 Oct 2013 14:04:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B193520502 for ; Fri, 18 Oct 2013 14:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756074Ab3JROEI (ORCPT ); Fri, 18 Oct 2013 10:04:08 -0400 Received: from mail-qc0-f180.google.com ([209.85.216.180]:34261 "EHLO mail-qc0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755995Ab3JROEG (ORCPT ); Fri, 18 Oct 2013 10:04:06 -0400 Received: by mail-qc0-f180.google.com with SMTP id e9so1694758qcy.39 for ; Fri, 18 Oct 2013 07:04:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ZygAhmEaBzqlZ9Cc1K+b785rbvBa7tYNxN88tZai+rY=; b=a3q6S4OJULUI5TQd6U3gxzlFXBHkKSDoyaesajLgyiZfkNg1Rg0ovs6cZ06GBuKeCv aZyo0xvBhqY3L+bS2JAiGUdWH2pf9z/pXV5suf39Wf4vIYDnWLJiozYGA3yLV0XwbLdX 43nHGN9dZJq6JuiEUvzeohpVWmpuoKYlNpGRXFWL1ultyaTI8rpYxwHvtwsfskjvHWDz 2Zify1r0yXOetA/FK6cwAOmILxJgk1IhPtIPWF1LNfqvGZh+OX8kMkRZ+OVjLqD9jnFl X5fK5wKqFsMDiKeSu86CmnDal7AhzrXedZEBLtohrBBqnxx4gzxr3efk4OwAC44wP7GQ /wjA== X-Gm-Message-State: ALoCoQkhoCal/n1V9O6bzmUzckIq9D410SJYaASs0MlBDNAPLBMM8PjNqUJSaUF5zyuCZfGbHgtM X-Received: by 10.229.79.137 with SMTP id p9mr4221193qck.12.1382105045222; Fri, 18 Oct 2013 07:04:05 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id d7sm5667670qas.10.2013.10.18.07.04.04 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 07:04:04 -0700 (PDT) From: Jeff Layton To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH] nfs: reject version and minorversion changes on remount attempts Date: Fri, 18 Oct 2013 10:03:37 -0400 Message-Id: <1382105017-18468-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.8.3.1 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.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Reported-by: Eric Doutreleau Signed-off-by: Jeff Layton --- fs/nfs/super.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a03b9c6..137572b 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2143,6 +2143,8 @@ nfs_compare_remount_data(struct nfs_server *nfss, if (data->flags != nfss->flags || data->rsize != nfss->rsize || data->wsize != nfss->wsize || + data->version != nfss->nfs_client->rpc_ops->version || + data->minorversion != nfss->nfs_client->cl_minorversion || data->retrans != nfss->client->cl_timeout->to_retries || data->auth_flavors[0] != nfss->client->cl_auth->au_flavor || data->acregmin != nfss->acregmin / HZ || @@ -2197,6 +2199,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) data->timeo = 10U * nfss->client->cl_timeout->to_initval / HZ; data->nfs_server.port = nfss->port; data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen; + data->version = nfsvers; + data->minorversion = nfss->nfs_client->cl_minorversion; memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr, data->nfs_server.addrlen);