From patchwork Mon Oct 21 13:52:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3077431 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 4A221BF924 for ; Mon, 21 Oct 2013 13:52:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 430802039E for ; Mon, 21 Oct 2013 13:52:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA24420377 for ; Mon, 21 Oct 2013 13:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753309Ab3JUNwa (ORCPT ); Mon, 21 Oct 2013 09:52:30 -0400 Received: from mail-ye0-f173.google.com ([209.85.213.173]:61094 "EHLO mail-ye0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752872Ab3JUNwa (ORCPT ); Mon, 21 Oct 2013 09:52:30 -0400 Received: by mail-ye0-f173.google.com with SMTP id m4so1602000yen.32 for ; Mon, 21 Oct 2013 06:52:29 -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=5LV1i/ElVDaMeac7cuMrrx7Xbsknjkx9DScq0ygEFEw=; b=Tfl7nCePsKzcS7Z0OLE8zsoKtocAHIG+RKiVuJ80o83eAa3TbgC8dHxYslwc+eijxx HylYJDsAqYqISmF8edUE00F7DzTevvhV9ocYV4BvE8RYAlMtaREUbid/8iwoRhUC004X 3OdNM/LsFeLQbLFti/01Shtt4O+ofC/Igmrrf/Q6MUUiDNxzvttkCNLPJfGed5Lx1cOe bhc08Pdb2OG5GO3exqnsNNhj4LHD39y2WXjYuh6wani16Q6oHTvgdp/Kfd15OhyZSuDm Vk/9A5u4iSRxKFlcKa82hlW5R8ONXJSDdBY16RjJ4iOnwe+ZLm79yXxfOa44ryDMHYZ+ oXjA== X-Gm-Message-State: ALoCoQlYPwYsQv4yGhxR1AjAdXNiQqUM51F6XoN03+iExIPBXBuveB3rEg8d0XjbZCQKWumiaN5S X-Received: by 10.236.171.195 with SMTP id r43mr1155018yhl.56.1382363549566; Mon, 21 Oct 2013 06:52:29 -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 g14sm26936399yhb.23.2013.10.21.06.52.28 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2013 06:52:29 -0700 (PDT) From: Jeff Layton To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH] nfs: fix handling of invalid mount options in nfs_remount Date: Mon, 21 Oct 2013 09:52:19 -0400 Message-Id: <1382363539-6549-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 nfs_parse_mount_options returns 0 on error, not -errno. Reported-by: Karel Zak Signed-off-by: Jeff Layton --- fs/nfs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 137572b..3f5a7a8 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2205,8 +2205,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) data->nfs_server.addrlen); /* overwrite those values with any that were specified */ - error = nfs_parse_mount_options((char *)options, data); - if (error < 0) + error = -EINVAL; + if (!nfs_parse_mount_options((char *)options, data)) goto out; /*