From patchwork Wed Oct 7 13:42:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 527289 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 BF2AE140D92; Thu, 8 Oct 2015 00:42:34 +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 1ZjozH-0004nV-2V; Wed, 07 Oct 2015 13:42:31 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZjozB-0004mR-6Z for kernel-team@lists.ubuntu.com; Wed, 07 Oct 2015 13:42:25 +0000 Received: by wicfx3 with SMTP id fx3so29096240wic.0 for ; Wed, 07 Oct 2015 06:42:25 -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=EiRGAAm8u4JW+drMexrf1bnNl6gzzifdSMMz1cgFWUg=; b=AYOpx2AuBVCsovPnWc7VSSgXr8bTDpiZTYRu+F/jKmJT6JYaOGb/bbYQtQOsK0lRUW ssursSiAAQkLDHnlL9vP4GJlyg4dxFv9kSxJ5TzNmaz5u70LHbTq/KK2B5RqA4HSeSvD W3YEJo4b3b5EakOQ8bsTmQqXgjKV9GwAJnri20qPVfgdhNxTG3CrMcuONqeBEFa2iVjs Ftzces92tiG8Ii17l2AQRL4hk88vGW8JA6xlcdhLPw3USH8ERMkv1W5spVPHT0Zu+H/s 61ImlL1Tsi+noeAX17uWsSdpZKnI6G3GGS4/ESwC6fsFWeRB4pM939XTHIK6YVoV/G9o wkEg== X-Gm-Message-State: ALoCoQk40XO1CaATkURgBDi2nu6yvnbAlETXoLG0MnFqaZaCZU/+9q/9f+IvtwNhm0kygYcUPd+U X-Received: by 10.180.8.3 with SMTP id n3mr1887369wia.41.1444225344804; Wed, 07 Oct 2015 06:42:24 -0700 (PDT) Received: from localhost ([2001:470:6973:2:7598:aede:4690:3e43]) by smtp.gmail.com with ESMTPSA id o10sm2678927wia.4.2015.10.07.06.42.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 06:42:24 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/master-next 1/2] Revert "UBUNTU: SAUCE: aufs3: mmap: Fix races in madvise_remove() and sys_msync()" Date: Wed, 7 Oct 2015 14:42:16 +0100 Message-Id: <1444225339-5467-4-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 This reverts commit b28f4925f999316d7d3510ea476b1d19afae3de0. BugLink: http://bugs.launchpad.net/bugs/1503655 Signed-off-by: Andy Whitcroft --- 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 e0504c4..5e700b1 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. */ - get_file(vma); + vma_get_file(vma); up_read(¤t->mm->mmap_sem); error = do_fallocate(f, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, end - start); - fput(vma); + vma_fput(vma); down_read(¤t->mm->mmap_sem); return error; } diff --git a/mm/msync.c b/mm/msync.c index b2d70d9..02d770e 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)) { - get_file(vma); + vma_get_file(vma); up_read(&mm->mmap_sem); error = vfs_fsync(file, 0); - fput(vma); + vma_fput(vma); if (error || start >= end) goto out; down_read(&mm->mmap_sem);