From patchwork Mon Oct 21 13:51:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3077421 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4119BF924 for ; Mon, 21 Oct 2013 13:51:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FE9B20360 for ; Mon, 21 Oct 2013 13:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7632420353 for ; Mon, 21 Oct 2013 13:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979Ab3JUNvv (ORCPT ); Mon, 21 Oct 2013 09:51:51 -0400 Received: from mail-gg0-f177.google.com ([209.85.161.177]:56100 "EHLO mail-gg0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752893Ab3JUNvv (ORCPT ); Mon, 21 Oct 2013 09:51:51 -0400 Received: by mail-gg0-f177.google.com with SMTP id t2so1590511ggn.36 for ; Mon, 21 Oct 2013 06:51:50 -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=eE0jvuzgG+hycyX9tYVxC9lY5X5SxVVeajgrdxqavFyzT3zW/04DscPBR6eKP+IofP TLFQ8TNfe7+kgMeSVEEG1eZ3fZiQYBOjSPRlJaAL5g4YoMwcFa1DCnnxiaFvP5+XCths UdFIPyvAmMCrIhr2gnw3+0qhd+J1yerxL4H6gDS84H7tVS5/9JsgCLVUARv6aLstH3oo cC2DZKG+/ILKtNw49zmBuzxa5DybGwPAAm7hxb5T06fSzTVReami6Xesuu0PsYPa5sBS DH1joKATscX3MYpRhleemsCtgBvmPQ5gcLslYoruKKnoO7rf3YtFrFX6VRz1GSgxWQDp aY9A== X-Gm-Message-State: ALoCoQnchR1jm4wma6IZFGdJ5N/8lQEmGUG0+FSRLER6qyDEQdeHFZ1kVx8p5GaNUbZHYDv3LCUw X-Received: by 10.236.92.70 with SMTP id i46mr1143856yhf.83.1382363510142; Mon, 21 Oct 2013 06:51:50 -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 g25sm26964126yhg.6.2013.10.21.06.51.48 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2013 06:51:49 -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: Mon, 21 Oct 2013 09:51:45 -0400 Message-Id: <1382363505-6481-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);