Received: by 10.223.185.116 with SMTP id b49csp4196713wrg; Mon, 26 Feb 2018 13:00:58 -0800 (PST) X-Google-Smtp-Source: AG47ELtDj9CWXKJQcblALFK4d/oYD2SbS/e2GZVvOFzfT2Zfu2dk5XGBSGVW3y33YkjPGtaYbwQw X-Received: by 10.101.92.138 with SMTP id a10mr3493758pgt.129.1519678857943; Mon, 26 Feb 2018 13:00:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519678857; cv=none; d=google.com; s=arc-20160816; b=O1kpKZKu9QN4s/JtkdWTSorAlkLcvve1qE/oM3nBvz5aj6qEXPwVhkJwd29QWg86vm oJ8ekYhFJ2l8ueoQbpmHpLYDwpBeci+c4QKO0Xh0ko1d0EtYuH6sP3qxGbBPa28liuBi VZumhLlJEb36iBzPzUmlwLVGtVGMKnogLakoilrpwNC/9wUnP/S4jGcDy2osnSst3KbG v+C5F3UddXtabm5YsbvpJpp0OHdaCbgz4NEeOMXBJAxGIBf2h5GkaT6dSdKWDg9jem8b pw6bNprdqwBkurfmyBne2HjPQrc0Jl74sUUckY0qoueY+mgE8r9iiLAxxIPkPp69Ue2U E5Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zYSTgnnXYxCmWa9lwbYmCnciFanTeDNnMZ+qEifDo4w=; b=K+Qv0A2BDlVg7zMtWtpcQB6+l2IIO9jLhjxybLP9BITyizFBr0F9b2fQCoEvNiE5w+ RPXoTEIyCDibqZydaTeyiMsj4JoSdDJkeQERnUv9ThsAhzAdSVZQACbdy71tnAGPn4rZ uVw0m1XzEPyYzcgacJ7zhUgrUqQIresc31B/wsFXx+PS3Jbq98hwTWGqHgwvFneWhbeG JEWgeaqOFAOEMI9VLnez4wUsoxQQ+XuG2uHhn8Pv+yL06DQ2De0lgxN6SgcBhaXnB/7Y xS6UJq7WrjuIYxsZy578TeD1IJoVwF2bdAqj5ROUGYCVkHEQMQPSWgTBudnyHzm6sMp6 +lsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p10si5973686pgc.74.2018.02.26.13.00.40; Mon, 26 Feb 2018 13:00:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752497AbeBZUW1 (ORCPT + 99 others); Mon, 26 Feb 2018 15:22:27 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34094 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752057AbeBZUW0 (ORCPT ); Mon, 26 Feb 2018 15:22:26 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 49A80E33; Mon, 26 Feb 2018 20:22:25 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Williams , Jeff Moyer , Andrew Morton , Linus Torvalds Subject: [PATCH 4.9 32/39] device-dax: implement ->split() to catch invalid munmap attempts Date: Mon, 26 Feb 2018 21:20:53 +0100 Message-Id: <20180226201645.078680087@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226201643.660109883@linuxfoundation.org> References: <20180226201643.660109883@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams commit 9702cffdbf2129516db679e4467db81e1cd287da upstream. Similar to how device-dax enforces that the 'address', 'offset', and 'len' parameters to mmap() be aligned to the device's fundamental alignment, the same constraints apply to munmap(). Implement ->split() to fail munmap calls that violate the alignment constraint. Otherwise, we later fail VM_BUG_ON checks in the unmap_page_range() path with crash signatures of the form: vma ffff8800b60c8a88 start 00007f88c0000000 end 00007f88c0e00000 next (null) prev (null) mm ffff8800b61150c0 prot 8000000000000027 anon_vma (null) vm_ops ffffffffa0091240 pgoff 0 file ffff8800b638ef80 private_data (null) flags: 0x380000fb(read|write|shared|mayread|maywrite|mayexec|mayshare|softdirty|mixedmap|hugepage) ------------[ cut here ]------------ kernel BUG at mm/huge_memory.c:2014! [..] RIP: 0010:__split_huge_pud+0x12a/0x180 [..] Call Trace: unmap_page_range+0x245/0xa40 ? __vma_adjust+0x301/0x990 unmap_vmas+0x4c/0xa0 unmap_region+0xae/0x120 ? __vma_rb_erase+0x11a/0x230 do_munmap+0x276/0x410 vm_munmap+0x6a/0xa0 SyS_munmap+0x1d/0x30 Link: http://lkml.kernel.org/r/151130418681.4029.7118245855057952010.stgit@dwillia2-desk3.amr.corp.intel.com Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap") Signed-off-by: Dan Williams Reported-by: Jeff Moyer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/dax/dax.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -453,9 +453,21 @@ static int dax_dev_pmd_fault(struct vm_a return rc; } +static int dax_dev_split(struct vm_area_struct *vma, unsigned long addr) +{ + struct file *filp = vma->vm_file; + struct dax_dev *dax_dev = filp->private_data; + struct dax_region *dax_region = dax_dev->region; + + if (!IS_ALIGNED(addr, dax_region->align)) + return -EINVAL; + return 0; +} + static const struct vm_operations_struct dax_dev_vm_ops = { .fault = dax_dev_fault, .pmd_fault = dax_dev_pmd_fault, + .split = dax_dev_split, }; static int dax_mmap(struct file *filp, struct vm_area_struct *vma)