From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDF14C2D0E4 for ; Tue, 24 Nov 2020 14:00:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B2222076B for ; Tue, 24 Nov 2020 14:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726752AbgKXOAB (ORCPT ); Tue, 24 Nov 2020 09:00:01 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:54719 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726085AbgKXOAA (ORCPT ); Tue, 24 Nov 2020 09:00:00 -0500 Received: from ip5f5af0a0.dynamic.kabel-deutschland.de ([95.90.240.160] helo=wittgenstein) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khYrD-0002SV-VO; Tue, 24 Nov 2020 13:59:48 +0000 Date: Tue, 24 Nov 2020 14:59:46 +0100 From: Christian Brauner To: Tycho Andersen Cc: Andy Lutomirski , Mimi Zohar , James Bottomley , Andreas Dilger , Christoph Hellwig , Jonathan Corbet , smbarber@chromium.org, Christoph Hellwig , Casey Schaufler , linux-ext4@vger.kernel.org, Mrunal Patel , Kees Cook , Arnd Bergmann , Jann Horn , selinux@vger.kernel.org, Josh Triplett , Seth Forshee , Aleksa Sarai , Alexander Viro , Lennart Poettering , OGAWA Hirofumi , Geoffrey Thomas , David Howells , John Johansen , Theodore Tso , Dmitry Kasatkin , containers@lists.linux-foundation.org, linux-security-module@vger.kernel.org, linux-audit@redhat.com, "Eric W. Biederman" , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, Alban Crequy , linux-integrity@vger.kernel.org, Stephen Smalley , Todd Kjos Subject: Re: [PATCH v2 07/39] mount: attach mappings to mounts Message-ID: <20201124135946.27krt6za2qapyx43@wittgenstein> References: <20201115103718.298186-1-christian.brauner@ubuntu.com> <20201115103718.298186-8-christian.brauner@ubuntu.com> <20201123154719.GD4025434@cisco> <20201123162428.GA24807@cisco> <20201124123035.hbv4sstyoucht7xp@wittgenstein> <20201124133740.GA52954@cisco> <20201124134035.2l36avuaqp6gxyum@wittgenstein> <20201124134459.GB52954@cisco> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201124134459.GB52954@cisco> Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Tue, Nov 24, 2020 at 08:44:59AM -0500, Tycho Andersen wrote: > On Tue, Nov 24, 2020 at 02:40:35PM +0100, Christian Brauner wrote: > > On Tue, Nov 24, 2020 at 08:37:40AM -0500, Tycho Andersen wrote: > > > On Tue, Nov 24, 2020 at 01:30:35PM +0100, Christian Brauner wrote: > > > > On Mon, Nov 23, 2020 at 11:24:28AM -0500, Tycho Andersen wrote: > > > > > On Mon, Nov 23, 2020 at 10:47:19AM -0500, Tycho Andersen wrote: > > > > > > On Sun, Nov 15, 2020 at 11:36:46AM +0100, Christian Brauner wrote: > > > > > > > +static inline struct user_namespace *mnt_user_ns(const struct vfsmount *mnt) > > > > > > > +{ > > > > > > > + return mnt->mnt_user_ns; > > > > > > > +} > > > > > > > > > > > > I think you might want a READ_ONCE() here. Right now it seems ok, since the > > > > > > mnt_user_ns can't change, but if we ever allow it to change (and I see you have > > > > > > a idmapped_mounts_wip_v2_allow_to_change_idmapping branch on your public tree > > > > > > :D), the pattern of, > > > > > > > > > > > > user_ns = mnt_user_ns(path->mnt); > > > > > > if (mnt_idmapped(path->mnt)) { > > > > > > uid = kuid_from_mnt(user_ns, uid); > > > > > > gid = kgid_from_mnt(user_ns, gid); > > > > > > } > > > > > > > > > > > > could race. > > > > > > > > > > Actually, isn't a race possible now? > > > > > > > > > > kuid_from_mnt(mnt_user_ns(path->mnt) /* &init_user_ns */); > > > > > WRITE_ONCE(mnt->mnt.mnt_user_ns, user_ns); > > > > > WRITE_ONCE(m->mnt.mnt_flags, flags); > > > > > kgid_from_mnt(mnt_user_ns(path->mnt) /* the right user ns */); > > > > > > > > > > So maybe it should be: > > > > > > > > > > if (mnt_idmapped(path->mnt)) { > > > > > barrier(); > > > > > user_ns = mnt_user_ns(path->mnt); > > > > > uid = kuid_from_mnt(user_ns, uid); > > > > > gid = kgid_from_mnt(user_ns, gid); > > > > > } > > > > > > > > > > since there's no data dependency between mnt_idmapped() and > > > > > mnt_user_ns()? > > > > > > > > I think I had something to handle this case in another branch of mine. > > > > The READ_ONCE() you mentioned in another patch I had originally dropped > > > > because I wasn't sure whether it works on pointers but after talking to > > > > Jann and David it seems that it handles pointers fine. > > > > Let me take a look and fix it in the next version. I just finished > > > > porting the test suite to xfstests as Christoph requested and I'm > > > > looking at this now. > > > > > > Another way would be to just have mnt_idmapped() test > > > mnt_user_ns() != &init_user_ns instead of the flags; then I think you > > > get the data dependency and thus correct ordering for free. > > > > I indeed dropped mnt_idmapped() which is unnecessary. :) > > It still might be a nice helper to prevent people from checking the > flags and forgetting that there's a memory ordering issue, though. I just mentioned this offline but for the record: the flag is gone since we can rely on the pointer alone. :) Christian