From patchwork Mon Oct 24 11:27:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp440303wru; Mon, 24 Oct 2022 06:04:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4BgDoKzxLAMeWLmpArTFsLmh4krbJdxNDqw+JcdTSew2Sev/lmzocqsOcM8/HYSe8bejS9 X-Received: by 2002:a17:902:e80b:b0:183:7463:f628 with SMTP id u11-20020a170902e80b00b001837463f628mr33477160plg.19.1666616644798; Mon, 24 Oct 2022 06:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616644; cv=none; d=google.com; s=arc-20160816; b=FmU5ChmyrHQM38zOrdQ2Z2xuq4yK4lwyDTm9Hl/UCPbydtvM+BzIgWzwovJWrW8zXj hLMqfbH8OrtSfflO5ZIj7WPvg20N55ZeiYX15lUAISV1rqVOZA0OkVaq7w/cQ46LvghX scHd5NbwqWJcInkqRG2l2oZWDSHZUiwj9cN7ZsOSUMYEu46jm1LfxnUSYZKGlSENym8h ClGrWTErJmAaKNpsRXwVIKVPUSM4qpmd//njjdk1b8Mlk5z9A/ewTIf2oOZjIt9w+x1o drfVh/dutywNfkF5+WRy84NHZfg1h/ohO9I9tXqVcEsSTcqKc0hp1qVRIPZscZsUa1SN T+xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ld7JOZLtb/FB7M/IoOYE0lYaSDlO8v2HFgrqtUBStvI=; b=CcKeC4QBsTby0ZHIhWDPqTY5StexAJck7hVVM1G+nRSIkSYbm+gF1z8Vqcb5y6JYLN slw79hDoJcsr27GFRiiWyhFaGqxWBJgxEey79FVa5XjWg2dXii8iAQz9SzL37b6oBxoF 665PWJzDhL+Mn1Asf+4Yzq8A64PRHyPcJIH7ygOTWLdklSAiv0O3ZepWWEgb5ntJD4Ua JIKgwKgAbKisAIqF4sUdcsLTGPUWZOIcYsr+NQg9IveTH01zSkvtBsgBlDEBChlCtRtA Vb+HBy5zT4z8+Ojoo/3e34K/K4aI6kkkDVLN5V0WUitox1i13T9EuZf2IM1kQyaq6RtX Byww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=So6idco7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ip7-20020a17090b314700b00202eab3e1b5si10986495pjb.10.2022.10.24.06.03.33; Mon, 24 Oct 2022 06:04:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=So6idco7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235089AbiJXNC5 (ORCPT + 99 others); Mon, 24 Oct 2022 09:02:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235213AbiJXM7j (ORCPT ); Mon, 24 Oct 2022 08:59:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C150D9AC3E; Mon, 24 Oct 2022 05:18:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4525A61320; Mon, 24 Oct 2022 12:17:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55FEAC433D6; Mon, 24 Oct 2022 12:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613863; bh=tmj7cEVGDBCQselsv8wG2LDghm14ih3ZoJfiAIEa8Ow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=So6idco7cPMbBY5wMI0SIf2nBGHv3ThHqIYjVRD5hRwhgXBRwQV/HTEOXad3Sf9iM Z9VRqu0g4+n3gJtm/snyCtxUwojKJpdAf8PVTpAnx2zpF9oM3wiCp6u+D1Pp9anwVZ HW7EjnqVAf+/zGtwC67mz06CVcgmhOPWbBzrh/Ro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Carlos Llamas , Catalin Marinas , Andrii Nakryiko , Liam Howlett , "Christian Brauner (Microsoft)" , Michal Hocko , Suren Baghdasaryan , Andrew Morton Subject: [PATCH 5.10 042/390] mm/mmap: undo ->mmap() when arch_validate_flags() fails Date: Mon, 24 Oct 2022 13:27:19 +0200 Message-Id: <20221024113024.402510437@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574214958770894?= X-GMAIL-MSGID: =?utf-8?q?1747574214958770894?= From: Carlos Llamas commit deb0f6562884b5b4beb883d73e66a7d3a1b96d99 upstream. Commit c462ac288f2c ("mm: Introduce arch_validate_flags()") added a late check in mmap_region() to let architectures validate vm_flags. The check needs to happen after calling ->mmap() as the flags can potentially be modified during this callback. If arch_validate_flags() check fails we unmap and free the vma. However, the error path fails to undo the ->mmap() call that previously succeeded and depending on the specific ->mmap() implementation this translates to reference increments, memory allocations and other operations what will not be cleaned up. There are several places (mainly device drivers) where this is an issue. However, one specific example is bpf_map_mmap() which keeps count of the mappings in map->writecnt. The count is incremented on ->mmap() and then decremented on vm_ops->close(). When arch_validate_flags() fails this count is off since bpf_map_mmap_close() is never called. One can reproduce this issue in arm64 devices with MTE support. Here the vm_flags are checked to only allow VM_MTE if VM_MTE_ALLOWED has been set previously. From userspace then is enough to pass the PROT_MTE flag to mmap() syscall to trigger the arch_validate_flags() failure. The following program reproduces this issue: #include #include #include #include #include int main(void) { union bpf_attr attr = { .map_type = BPF_MAP_TYPE_ARRAY, .key_size = sizeof(int), .value_size = sizeof(long long), .max_entries = 256, .map_flags = BPF_F_MMAPABLE, }; int fd; fd = syscall(__NR_bpf, BPF_MAP_CREATE, &attr, sizeof(attr)); mmap(NULL, 4096, PROT_WRITE | PROT_MTE, MAP_SHARED, fd, 0); return 0; } By manually adding some log statements to the vm_ops callbacks we can confirm that when passing PROT_MTE to mmap() the map->writecnt is off upon ->release(): With PROT_MTE flag: root@debian:~# ./bpf-test [ 111.263874] bpf_map_write_active_inc: map=9 writecnt=1 [ 111.288763] bpf_map_release: map=9 writecnt=1 Without PROT_MTE flag: root@debian:~# ./bpf-test [ 157.816912] bpf_map_write_active_inc: map=10 writecnt=1 [ 157.830442] bpf_map_write_active_dec: map=10 writecnt=0 [ 157.832396] bpf_map_release: map=10 writecnt=0 This patch fixes the above issue by calling vm_ops->close() when the arch_validate_flags() check fails, after this we can proceed to unmap and free the vma on the error path. Link: https://lkml.kernel.org/r/20220930003844.1210987-1-cmllamas@google.com Fixes: c462ac288f2c ("mm: Introduce arch_validate_flags()") Signed-off-by: Carlos Llamas Reviewed-by: Catalin Marinas Acked-by: Andrii Nakryiko Reviewed-by: Liam Howlett Cc: Christian Brauner (Microsoft) Cc: Michal Hocko Cc: Suren Baghdasaryan Cc: [5.10+] Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/mmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1856,7 +1856,7 @@ unsigned long mmap_region(struct file *f if (!arch_validate_flags(vma->vm_flags)) { error = -EINVAL; if (file) - goto unmap_and_free_vma; + goto close_and_free_vma; else goto free_vma; } @@ -1900,6 +1900,9 @@ out: return addr; +close_and_free_vma: + if (vma->vm_ops && vma->vm_ops->close) + vma->vm_ops->close(vma); unmap_and_free_vma: vma->vm_file = NULL; fput(file);