From patchwork Wed Oct 7 13:42:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 527290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 401A8140D95; Thu, 8 Oct 2015 00:42:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZjozK-0004os-Bc; Wed, 07 Oct 2015 13:42:34 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZjozC-0004md-Gg for kernel-team@lists.ubuntu.com; Wed, 07 Oct 2015 13:42:26 +0000 Received: by wiclk2 with SMTP id lk2so29192956wic.1 for ; Wed, 07 Oct 2015 06:42:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mNPoCXvnRkUnm1h060MEuXYYx4xk7ezVaBTZWbSqhsc=; b=d3rWcqPFdf3YqT4QmLje8yUy3oHtBsDbu760Fhz9m+8e4k4ypTLasWQo5HXd6fmgoH IralsKnEKIVqpvIC8d2OrXBMCOqScEdGuD/uERsXTTJviDOafRU7rois6Aop4M0ClkjA tKbGLiwkuNQAJw+PcNigIxGu4PKVmw1OJwdm4iS11C8hd79hVhiwdIZ0s9WtmWrnhpcK bFJIr0cvv5YOIZ546ZTjoU645Wq/Z6u0EFxMVwcWylo6R/rLv/4BJdVYTwxP8Sw4zf/N UzqQeYtMwKjtZ3iUoMxO4od8gTVY8n8oebq6tcaSru94gjIuvsA8dlpLfgDAjxQhdC97 Lk6Q== X-Gm-Message-State: ALoCoQlWMjKK6ENK+X69KmlMH2m6Umb+gLvA+nVR7cjUwkN2pZMG49xWYcMTmqMPx1j5Y1CTHM02 X-Received: by 10.180.87.6 with SMTP id t6mr22337408wiz.20.1444225346316; Wed, 07 Oct 2015 06:42:26 -0700 (PDT) Received: from localhost ([2001:470:6973:2:7598:aede:4690:3e43]) by smtp.gmail.com with ESMTPSA id x9sm39340746wjf.44.2015.10.07.06.42.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 06:42:25 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/master-next 2/2] UBUNTU: SAUCE: aufs3: mmap: Fix races in madvise_remove() and sys_msync() Date: Wed, 7 Oct 2015 14:42:17 +0100 Message-Id: <1444225339-5467-5-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1444225339-5467-1-git-send-email-apw@canonical.com> References: <1444225339-5467-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Ben Hutchings In madvise_remove() and sys_msync() we drop the mmap_sem before dropping references to the mapped file(s). As soon as we drop the mmap_sem, the vma we got them from might be destroyed by another thread, so calling vma_do_fput() is a possible use-after-free. In these cases we don't actually need a reference to the aufs file, so revert to using get_file() and fput() directly. Bug-Link: https://bugs.debian.org/796036 CVE-2015-7312 BugLink: http://bugs.launchpad.net/bugs/1503655 Signed-off-by: Ben Hutchings Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader Acked-by: Tim Gardner Signed-off-by: Brad Figg --- mm/madvise.c | 4 ++-- mm/msync.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 5e700b1..539eeb9 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -327,12 +327,12 @@ static long madvise_remove(struct vm_area_struct *vma, * vma's reference to the file) can go away as soon as we drop * mmap_sem. */ - vma_get_file(vma); + get_file(f); up_read(¤t->mm->mmap_sem); error = do_fallocate(f, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, end - start); - vma_fput(vma); + fput(f); down_read(¤t->mm->mmap_sem); return error; } diff --git a/mm/msync.c b/mm/msync.c index 02d770e..632df45 100644 --- a/mm/msync.c +++ b/mm/msync.c @@ -80,10 +80,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags) start = vma->vm_end; if ((flags & MS_SYNC) && file && (vma->vm_flags & VM_SHARED)) { - vma_get_file(vma); + get_file(file); up_read(&mm->mmap_sem); error = vfs_fsync(file, 0); - vma_fput(vma); + fput(file); if (error || start >= end) goto out; down_read(&mm->mmap_sem);