From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com ([209.85.128.66]:55031 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727000AbeJQWvS (ORCPT ); Wed, 17 Oct 2018 18:51:18 -0400 Subject: Re: [PATCH 31/34] vfs: syscall: Add fspick() to select a superblock for reconfiguration [ver #12] To: "Eric W. Biederman" Cc: David Howells , Al Viro , linux-api@vger.kernel.org, torvalds@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, mszeredi@redhat.com References: <19866.1539782101@warthog.procyon.org.uk> <68a2107f-bf70-055b-86cf-1ba2ba9422bf@gmail.com> <153754740781.17872.7869536526927736855.stgit@warthog.procyon.org.uk> <153754766004.17872.9829232103614083565.stgit@warthog.procyon.org.uk> <9b8bf436-65de-13b9-0002-0479d11c18ca@gmail.com> <20181013061141.GR32577@ZenIV.linux.org.uk> <28710.1539782412@warthog.procyon.org.uk> <87woqgiqta.fsf@xmission.com> From: Alan Jenkins Message-ID: <8f5cf2a3-c522-d0b8-1257-1814e8149956@gmail.com> Date: Wed, 17 Oct 2018 15:55:11 +0100 MIME-Version: 1.0 In-Reply-To: <87woqgiqta.fsf@xmission.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 17/10/2018 15:35, Eric W. Biederman wrote: > Alan Jenkins writes: > >> On 17/10/2018 14:20, David Howells wrote: >>> David Howells wrote: >>> >>>> I should probably check that the picked point is actually a mountpoint. >>> The root of the mount object at the path specified, that is, perhaps with >>> something like the attached. >>> >>> David >> >> I agree.  I'm happy to see this is using the same check as do_remount(). >> >> >> * change filesystem flags. dir should be a physical root of filesystem. >> * If you've mounted a non-root directory somewhere and want to do remount >> * on it - tough luck. >> */ > Davids check will work for bind mounts as well. It just won't work it > just won't work for files or subdirectories of some mountpoint. > > Eric I see.  Then I am still happy to see the fspick() check match a check in do_remount() (and it still solves the problem I was worried about). I cannot blame David for the do_remount() comment being out of date :-). # uname -r 4.18.10-200.fc.28.x86_64 # mount --bind /mnt /mnt # mount -oremount,debug /mnt # findmnt /mnt; findmnt / [findmnt shows / has been remounted, adding the ext4 "debug" mount option] > >>> --- >>> diff --git a/fs/fsopen.c b/fs/fsopen.c >>> index f673e93ac456..aaaaa17a233c 100644 >>> --- a/fs/fsopen.c >>> +++ b/fs/fsopen.c >>> @@ -186,6 +186,10 @@ SYSCALL_DEFINE3(fspick, int, dfd, const char __user *, path, unsigned int, flags >>> if (ret < 0) >>> goto err; >>> + ret = -EINVAL; >>> + if (target.mnt->mnt_root != target.dentry) >>> + goto err_path; >>> + >>> fc = vfs_new_fs_context(target.dentry->d_sb->s_type, target.dentry, >>> 0, 0, FS_CONTEXT_FOR_RECONFIGURE); >>> if (IS_ERR(fc)) { >>>