Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757990AbbLCASz (ORCPT ); Wed, 2 Dec 2015 19:18:55 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:40165 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757914AbbLCASx (ORCPT ); Wed, 2 Dec 2015 19:18:53 -0500 Date: Wed, 2 Dec 2015 16:18:51 -0800 From: Andrew Morton To: Kees Cook Cc: Jan Kara , Willy Tarreau , "Eric W. Biederman" , "Kirill A. Shutemov" , Oleg Nesterov , Rik van Riel , Chen Gang , Davidlohr Bueso , Andrea Arcangeli , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] fs: clear file privilege bits when mmap writing Message-Id: <20151202161851.95d8fe811705c038e3fe2d33@linux-foundation.org> In-Reply-To: <20151203000342.GA30015@www.outflux.net> References: <20151203000342.GA30015@www.outflux.net> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1577 Lines: 41 On Wed, 2 Dec 2015 16:03:42 -0800 Kees Cook wrote: > 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. > > ... > > --- 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); > + } > + Still ignoring the file_remove_privs() return value. If this is deliberate then a description of the reasons should be included? -- 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/