From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Lutomirski Subject: Re: [PATCH] mnt: Prevent pivot_root from creating a loop in the mount tree Date: Tue, 14 Oct 2014 09:41:29 -0700 Message-ID: References: <87bnpmihks.fsf@x220.int.ebiederm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: "security@kernel.org" , Al Viro , Serge Hallyn , Linux FS Devel To: "Eric W. Biederman" Return-path: Received: from mail-lb0-f171.google.com ([209.85.217.171]:41064 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754323AbaJNQlv (ORCPT ); Tue, 14 Oct 2014 12:41:51 -0400 Received: by mail-lb0-f171.google.com with SMTP id z12so8580352lbi.16 for ; Tue, 14 Oct 2014 09:41:50 -0700 (PDT) In-Reply-To: <87bnpmihks.fsf@x220.int.ebiederm.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Wed, Oct 8, 2014 at 10:42 AM, Eric W. Biederman wrote: > > Andy Lutomirski recently demonstrated that when chroot is used to set > the root path below the path for the new ``root'' passed to pivot_root > the pivot_root system call succeeds and leaks mounts. As part of my security fix what-happened-to-it quest: what happened to this fix? --Andy > > In examining the code I see that starting with a new root that is > below the current root in the mount tree will result in a loop in the > mount tree after the mounts are detached and then reattached to one > another. Resulting in all kinds of ugliness including a leak of that > mounts involved in the leak of the mount loop. > > Prevent this problem by ensuring that the new mount is reachable from > the current root of the mount tree. > > Reported-by: Andy Lutomirski > Signed-off-by: "Eric W. Biederman" > --- > fs/namespace.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/fs/namespace.c b/fs/namespace.c > index b3bdda8b5a01..7b776285832e 100644 > --- a/fs/namespace.c > +++ b/fs/namespace.c > @@ -2830,6 +2830,9 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, > /* make sure we can reach put_old from new_root */ > if (!is_path_reachable(old_mnt, old.dentry, &new)) > goto out4; > + /* make certain new is below the root */ > + if (!is_path_reachable(new_mnt, new.dentry, &root)) > + goto out4; > root_mp->m_count++; /* pin it so it won't go away */ > lock_mount_hash(); > detach_mnt(new_mnt, &parent_path); > -- > 1.9.1 > -- Andy Lutomirski AMA Capital Management, LLC