[PATCH v2] fs: clear file privilege bits when mmap writing

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Kees Cook <keescook@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH v2] fs: clear file privilege bits when mmap writing
Date	Thu, 03 Dec 2015 01:10:01 +0100
Message-ID	<qBpDb-5UD-1@gated-at.bofh.it> (permalink)
X-Original-To	Andrew Morton <akpm@linux-foundation.org>
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
X-Mimedefang-Filter	outflux$Revision: 1.316 $
X-Helo	www.outflux.net
X-Scanned-By	MIMEDefang 2.73
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	Jan Kara <jack@suse.cz>, Willy Tarreau <w@1wt.eu>, "Eric W. Biederman" <ebiederm@xmission.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Oleg Nesterov <oleg@redhat.com>, Rik van Riel <riel@redhat.com>, Chen Gang <gang.chen.5i5j@gmail.com>, Davidlohr Bueso <dave@stgolabs.net>, Andrea Arcangeli <aarcange@redhat.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org
X-Original-Date	Wed, 2 Dec 2015 16:03:42 -0800
X-Original-Message-ID	<20151203000342.GA30015@www.outflux.net>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1282608

Show key headers only | View raw

Normally, when a user can modify a file that has setuid or setgid bits,
those bits are cleared when they are not the file owner or a member
of the group. This is enforced when using write and truncate but not
when writing to a shared mmap on the file. This could allow the file
writer to gain privileges by changing a binary without losing the
setuid/setgid/caps bits.

Changing the bits requires holding inode->i_mutex, so it cannot be done
during the page fault (due to mmap_sem being held during the fault).
Instead, clear the bits if PROT_WRITE is being used at mmap time.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
---
v2:
 - move check from page fault to mmap open
---
 mm/mmap.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mm/mmap.c b/mm/mmap.c
index 2ce04a649f6b..a27735aabc73 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1340,6 +1340,17 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 			if (locks_verify_locked(file))
 				return -EAGAIN;
 
+			/*
+			 * If we must remove privs, we do it here since
+			 * doing it during page COW is expensive and
+			 * cannot hold inode->i_mutex.
+			 */
+			if (prot & PROT_WRITE && !IS_NOSEC(inode)) {
+				mutex_lock(&inode->i_mutex);
+				file_remove_privs(file);
+				mutex_unlock(&inode->i_mutex);
+			}
+
 			vm_flags |= VM_SHARED | VM_MAYSHARE;
 			if (!(file->f_mode & FMODE_WRITE))
 				vm_flags &= ~(VM_MAYWRITE | VM_SHARED);
-- 
1.9.1


-- 
Kees Cook
Chrome OS & Brillo Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] fs: clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-03 01:10 +0100
  Re: [PATCH v2] fs: clear file privilege bits when mmap writing Andrew Morton <akpm@linux-foundation.org> - 2015-12-03 01:20 +0100
    Re: [PATCH v2] fs: clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-03 17:10 +0100
    Re: [PATCH v2] fs: clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-03 19:20 +0100
  Re: [PATCH v2] clear file privilege bits when mmap writing yalin wang <yalin.wang2010@gmail.com> - 2015-12-04 02:50 +0100
    Re: [PATCH v2] clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-07 23:50 +0100
      Re: [PATCH v2] clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-08 01:50 +0100
        Re: [PATCH v2] clear file privilege bits when mmap writing Jan Kara <jack@suse.cz> - 2015-12-09 09:30 +0100
          Re: [PATCH v2] clear file privilege bits when mmap writing Kees Cook <keescook@chromium.org> - 2015-12-10 00:00 +0100

csiph-web