From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753712AbbGINAY (ORCPT ); Thu, 9 Jul 2015 09:00:24 -0400 Received: from emvm-gh1-uea09.nsa.gov ([63.239.67.10]:59797 "EHLO emvm-gh1-uea09.nsa.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbbGINAW (ORCPT ); Thu, 9 Jul 2015 09:00:22 -0400 X-TM-IMSS-Message-ID: <5faee852000b996a@nsa.gov> Message-ID: <559E7023.8040203@tycho.nsa.gov> Date: Thu, 09 Jul 2015 08:59:15 -0400 From: Stephen Smalley Organization: National Security Agency User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Hugh Dickins CC: Stephen Smalley , Prarit Bhargava , Morten Stevens , Eric Sandeen , Dave Chinner , Daniel Wagner , Linux Kernel , Eric Paris , linux-mm@kvack.org, selinux , Andrew Morton , Linus Torvalds , David Howells Subject: Re: mm: shmem_zero_setup skip security check and lockdep conflict with XFS References: <559D51C2.7060603@tycho.nsa.gov> In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/09/2015 04:23 AM, Hugh Dickins wrote: > On Wed, 8 Jul 2015, Stephen Smalley wrote: >> On 07/08/2015 09:13 AM, Stephen Smalley wrote: >>> On Sun, Jun 14, 2015 at 12:48 PM, Hugh Dickins wrote: >>>> It appears that, at some point last year, XFS made directory handling >>>> changes which bring it into lockdep conflict with shmem_zero_setup(): >>>> it is surprising that mmap() can clone an inode while holding mmap_sem, >>>> but that has been so for many years. >>>> >>>> Since those few lockdep traces that I've seen all implicated selinux, >>>> I'm hoping that we can use the __shmem_file_setup(,,,S_PRIVATE) which >>>> v3.13's commit c7277090927a ("security: shmem: implement kernel private >>>> shmem inodes") introduced to avoid LSM checks on kernel-internal inodes: >>>> the mmap("/dev/zero") cloned inode is indeed a kernel-internal detail. >>>> >>>> This also covers the !CONFIG_SHMEM use of ramfs to support /dev/zero >>>> (and MAP_SHARED|MAP_ANONYMOUS). I thought there were also drivers >>>> which cloned inode in mmap(), but if so, I cannot locate them now. >>> >>> This causes a regression for SELinux (please, in the future, cc >>> selinux list and Paul Moore on SELinux-related changes). In > > Surprised and sorry about that, yes, I should have Cc'ed. > >>> particular, this change disables SELinux checking of mprotect >>> PROT_EXEC on shared anonymous mappings, so we lose the ability to >>> control executable mappings. That said, we are only getting that >>> check today as a side effect of our file execute check on the tmpfs >>> inode, whereas it would be better (and more consistent with the >>> mmap-time checks) to apply an execmem check in that case, in which >>> case we wouldn't care about the inode-based check. However, I am >>> unclear on how to correctly detect that situation from >>> selinux_file_mprotect() -> file_map_prot_check(), because we do have a >>> non-NULL vma->vm_file so we treat it as a file execute check. In >>> contrast, if directly creating an anonymous shared mapping with >>> PROT_EXEC via mmap(...PROT_EXEC...), selinux_mmap_file is called with >>> a NULL file and therefore we end up applying an execmem check. > > If you're willing to go forward with the change, rather than just call > for an immediate revert of it, then I think the right way to detect > the situation would be to check IS_PRIVATE(file_inode(vma->vm_file)), > wouldn't it? That seems misleading and might trigger execmem checks on non-shmem inodes. S_PRIVATE was originally introduced for fs-internal inodes that are never directly exposed to userspace, originally for reiserfs xattr inodes (reiserfs xattrs are internally implemented as their own files that are hidden from userspace) and later also applied to anon inodes. It would be better if we had an explicit way of testing that we are dealing with an anonymous shared mapping in selinux_file_mprotect() -> file_map_prot_check().