Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810AbcCFWSA (ORCPT ); Sun, 6 Mar 2016 17:18:00 -0500 Received: from out01.mta.xmission.com ([166.70.13.231]:39412 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbcCFWRu (ORCPT ); Sun, 6 Mar 2016 17:17:50 -0500 From: ebiederm@xmission.com (Eric W. Biederman) To: Seth Forshee Cc: Alexander Viro , Serge Hallyn , Richard Weinberger , Austin S Hemmelgarn , Miklos Szeredi , linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, fuse-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov References: <1451930639-94331-1-git-send-email-seth.forshee@canonical.com> <1451930639-94331-12-git-send-email-seth.forshee@canonical.com> <20160303170201.GA30224@ubuntu-hedt> <87twkl50g5.fsf@x220.int.ebiederm.org> <20160306154832.GA13631@ubuntu-xps13> Date: Sun, 06 Mar 2016 16:07:49 -0600 In-Reply-To: <20160306154832.GA13631@ubuntu-xps13> (Seth Forshee's message of "Sun, 6 Mar 2016 09:48:33 -0600") Message-ID: <8737s32rbe.fsf@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-AID: U2FsdGVkX1/SXo5AqlZ7hZWxd50Vch2n6JDOZDq0HtQ= X-SA-Exim-Connect-IP: 70.59.168.211 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.7 XMSubLong Long Subject * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.0 T_TM2_M_HEADER_IN_MSG BODY: No description available. * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa03 1397; Body=1 Fuz1=1 Fuz2=1] X-Spam-DCC: XMission; sa03 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Seth Forshee X-Spam-Relay-Country: X-Spam-Timing: total 1561 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 4.2 (0.3%), b_tie_ro: 3.0 (0.2%), parse: 1.34 (0.1%), extract_message_metadata: 28 (1.8%), get_uri_detail_list: 4.6 (0.3%), tests_pri_-1000: 9 (0.6%), tests_pri_-950: 2.0 (0.1%), tests_pri_-900: 1.70 (0.1%), tests_pri_-400: 46 (2.9%), check_bayes: 43 (2.8%), b_tokenize: 18 (1.1%), b_tok_get_all: 11 (0.7%), b_comp_prob: 6 (0.4%), b_tok_touch_all: 3.7 (0.2%), b_finish: 0.86 (0.1%), tests_pri_0: 1456 (93.3%), check_dkim_signature: 1.00 (0.1%), check_dkim_adsp: 4.6 (0.3%), tests_pri_500: 7 (0.4%), rewrite_mail: 0.00 (0.0%) Subject: Re: [PATCH RESEND v2 11/18] fs: Ensure the mounter of a filesystem is privileged towards its inodes X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3733 Lines: 77 Seth Forshee writes: > On Fri, Mar 04, 2016 at 04:43:06PM -0600, Eric W. Biederman wrote: >> Seth Forshee writes: >> >> > On Mon, Jan 04, 2016 at 12:03:50PM -0600, Seth Forshee wrote: >> >> The mounter of a filesystem should be privileged towards the >> >> inodes of that filesystem. Extend the checks in >> >> inode_owner_or_capable() and capable_wrt_inode_uidgid() to >> >> permit access by users priviliged in the user namespace of the >> >> inode's superblock. >> > >> > Eric - I've discovered a problem related to this patch. The patches >> > you've already applied to your testing branch make it so that s_user_ns >> > can be an unprivileged user for proc and kernfs-based mounts. In some >> > cases DAC is the only thing protecting files in these mounts (ignoring >> > MAC), and with this patch an unprivileged user could bypass DAC. >> > >> > There's a simple solution - always set s_user_ns to &init_user_ns for >> > those filesystems. I think this is the right thing to do, since the >> > backing store behind these filesystems are really kernel objects. But >> > this would break the assumption behind your patch "userns: Simpilify >> > MNT_NODEV handling" and cause a regression in mounting behavior. >> > >> > I've come up with several possible solutions for this conflict. >> > >> > 1. Drop this patch and keep on setting s_user_ns to unprivilged users. >> > This would be unfortunate because I think this patch does make sense >> > for most filesystems. >> > 2. Restrict this patch so that a user privileged towards s_user_ns is >> > only privileged towards the super blocks inodes if s_user_ns has a >> > mapping for both i_uid and i_gid. This is better than (1) but still >> > not ideal in my mind. >> > 3. Drop your patch and maintain the current MNT_NODEV behavior. >> > 4. Add a new s_iflags flag to indicate a super block is from an >> > unprivileged mount, and use this in your patch instead of s_user_ns. >> > >> > Any preference, or any other ideas? >> >> In general this is only an issue if uids and gids on the filesystem >> do not map into the user namespace. > > Yes, both capable_wrt_inode_uidgid and inode_owner_or_capable will > return true for a privileged user in the current namespace if the ids > map into that namespace. > >> Therefore the general fix is to limit the logic of checking for >> capabilities in s_user_ns if we are dealing with INVALID_UID and >> INVALID_GID. For proc and kernfs that should never be the case >> so the problem becomes a non-issue. >> >> Further I would look at limiting that relaxation to just >> inode_change_ok. So that we can easily wrap that check per filesystem >> and deny the relaxation for proc and kernfs. proc and kernfs already >> have wrappers for .setattr so denying changes when !uid_vaid and >> !gid_valid would be a trivial addition, and ensure calamity does >> not ensure. >> >> Furthmore by limiting any additional to inode_change_ok we keep >> the work of the additional tests off of the fast paths. > > So then the inode would need to be chowned before a privileged user in a > non-init namespace would be capable towards it. That seems workable. It > looks like INVALID_UID and INVALID_GID do map into init_user_ns (which > seems a bit odd) so real root remains capable towards those indoes. > > That seems okay to me then. If I was not clear I was suggesting that we allow a sufficiently privileged user in the filesysteme's s_user_ns to allow chowning files with INVALID_UID and INVALID_GID. The global root user would always be able to do that because unless capabilities are dropped it is sufficiently privileged in ever user namespace. Eric