From patchwork Tue Apr 11 17:22:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill O'Donnell X-Patchwork-Id: 9675783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 830C9600CB for ; Tue, 11 Apr 2017 17:22:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73E7128579 for ; Tue, 11 Apr 2017 17:22:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68C3328584; Tue, 11 Apr 2017 17:22:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10C3C28579 for ; Tue, 11 Apr 2017 17:22:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752467AbdDKRWp (ORCPT ); Tue, 11 Apr 2017 13:22:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35796 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752389AbdDKRWl (ORCPT ); Tue, 11 Apr 2017 13:22:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29A0680482 for ; Tue, 11 Apr 2017 17:22:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 29A0680482 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=billodo@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 29A0680482 Received: from localhost.localdomain.com (ovpn-123-0.rdu2.redhat.com [10.10.123.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD6B7C05A4 for ; Tue, 11 Apr 2017 17:22:35 +0000 (UTC) From: Bill O'Donnell To: linux-xfs@vger.kernel.org Subject: [PATCH v2] xfsprogs: ensure growfs rejects non-existent mount point Date: Tue, 11 Apr 2017 12:22:35 -0500 Message-Id: <20170411172235.9361-1-billodo@redhat.com> In-Reply-To: <20170407175809.8540-1-billodo@redhat.com> References: <20170407175809.8540-1-billodo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 11 Apr 2017 17:22:36 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xfs_growfs manpage clearly states that the filesystem must be mounted to be grown. Current behavior allows xfs_growfs to proceed if the filesystem /containing/ the path of the desired target is mounted. This is not the specified behavior. Instead, also check the targeted fs argument against the entry found in the fstable lookup. Unless the targeted fs is actually mounted, reject the command. In order to cover bind-mounts, create a new lookup function based on the mountpoints instead of just the device name. Signed-off-by: Bill O'Donnell --- v2: in order to properly handle relative pathnames, symlinks, and bind-mounts, use realpath to establish canonical path name. This also requires the introduction of a lookup function based on the target mountpoint. growfs/xfs_growfs.c | 10 +++++++++- include/path.h | 1 + libxcmd/paths.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index a294e14..a61e2f1 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -133,6 +133,7 @@ main(int argc, char **argv) int spinodes; int rmapbt_enabled; int reflink_enabled; + char rpath[PATH_MAX]; progname = basename(argv[0]); setlocale(LC_ALL, ""); @@ -202,7 +203,14 @@ main(int argc, char **argv) aflag = 1; fs_table_initialise(0, NULL, 0, NULL); - fs = fs_table_lookup(argv[optind], FS_MOUNT_POINT); + + if (!realpath(argv[optind], rpath)) { + fprintf(stderr, _("%s: %s is not a mounted XFS filesystem\n"), + progname, argv[optind]); + return 1; + } + + fs = fs_table_lookup_mount(rpath); if (!fs) { fprintf(stderr, _("%s: %s is not a mounted XFS filesystem\n"), progname, argv[optind]); diff --git a/include/path.h b/include/path.h index d077bac..1d3a902 100644 --- a/include/path.h +++ b/include/path.h @@ -56,6 +56,7 @@ extern void fs_table_insert_project_path(char *__dir, uint __projid); extern fs_path_t *fs_table_lookup(const char *__dir, uint __flags); +extern fs_path_t *fs_table_lookup_mount(const char *__dir); typedef struct fs_cursor { uint count; /* total count of mount entries */ diff --git a/libxcmd/paths.c b/libxcmd/paths.c index 816acc2..10927c6 100644 --- a/libxcmd/paths.c +++ b/libxcmd/paths.c @@ -86,6 +86,27 @@ fs_table_lookup( return NULL; } +/* + * Find the FS table entry for the given path. Compare + * the path to mountpoint entries in the table. + */ +struct fs_path * +fs_table_lookup_mount( + const char *dir) +{ + uint i; + dev_t dev = 0; + + if (fs_device_number(dir, &dev)) + return NULL; + + for (i = 0; i < fs_count; i++) { + if (strcmp(fs_table[i].fs_dir, dir) == 0) + return &fs_table[i]; + } + return NULL; +} + static int fs_table_insert( char *dir,