From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98813C4332F for ; Wed, 1 Nov 2023 06:36:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17C778E0006; Wed, 1 Nov 2023 02:36:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 105C68E0002; Wed, 1 Nov 2023 02:36:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0E958E0006; Wed, 1 Nov 2023 02:36:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DD9958E0002 for ; Wed, 1 Nov 2023 02:36:44 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AF3EC1CB8A8 for ; Wed, 1 Nov 2023 06:36:44 +0000 (UTC) X-FDA: 81408427128.10.5BB55E4 Received: from out203-205-221-192.mail.qq.com (out203-205-221-192.mail.qq.com [203.205.221.192]) by imf06.hostedemail.com (Postfix) with ESMTP id 2238C18000C for ; Wed, 1 Nov 2023 06:36:41 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=qq.com header.s=s201512 header.b=k1IGOuhs; spf=pass (imf06.hostedemail.com: domain of eadavis@qq.com designates 203.205.221.192 as permitted sender) smtp.mailfrom=eadavis@qq.com; dmarc=pass (policy=quarantine) header.from=qq.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698820602; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zxqHnohc3QyJrgxGAuUHLvaz9znCZcodlirDuVlrNpM=; b=EuqBrNGzhXsDA9nqcwdAJGcLwMQeYLjoo4VRuz8fAfS11d8LC3Tlt3S+04XklgKsNPpmxM Xc99QmREKHcBtJIOCN8tt9gK4d9t1arLPi1rZ6f+PWL3gPOSnoM6uemQwRu8rIo5UMlkL6 m8i7eBAMj/FloRYGol6kjGOCHOSrqOo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698820602; a=rsa-sha256; cv=none; b=46Eqlu2jO3glTfbNJCpow8fVY+aegks9wn2xXXNSOs1KuAmpfYUb8hdVDXZCDOz+OdRhSO 3VjyBiRUKrNbAKwbhJ2ctGXyhJXu6rYfryoAt2f+35Lx3Hy740wnrTAf5gVn8hXxX+f5iA 04+zK2oScHJaH2yVmfO1lFnxKub7CXo= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=qq.com header.s=s201512 header.b=k1IGOuhs; spf=pass (imf06.hostedemail.com: domain of eadavis@qq.com designates 203.205.221.192 as permitted sender) smtp.mailfrom=eadavis@qq.com; dmarc=pass (policy=quarantine) header.from=qq.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1698820592; bh=zxqHnohc3QyJrgxGAuUHLvaz9znCZcodlirDuVlrNpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k1IGOuhslW8BNtlrS99wdmdV4BksaqHxx0wdYPXP1GsYoCdr5s+ZrUi3jmsluGE71 DSrBdGRVkH39KI00Nl3SMjawyaZTsFos0+elhN3vnFMLPy2UeUmKSPt5afZdZ1gIvn O7QmS8QjiRQhuw89d3cEiUcKvYTikXVNZWEyFmBQ= Received: from pek-lxu-l1.wrs.com ([111.198.228.56]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 91B9DCF2; Wed, 01 Nov 2023 14:36:27 +0800 X-QQ-mid: xmsmtpt1698820587tde3qiqyj Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0a+b8I3cORjzHL+H/8FU8R7w8dJCyK3z2URSWah7YLo9RJnN4/WI syAzRfBv810nwruBwejekSLAQjoJc3QYkMW0DRB4hiAwPdcyryXuoDUdXNHvxyWfasUkzoPZPNNt ugL+xHvYNQ+XrpdgR7zybZNVHk98jxaK7RUqcUSI1aeG6R11IpOrXzALy7A+imeWf194F7d1isgV 31rnFam1/ZO+sxbAGWMR3GJA7ddJ2uNkhBbXjVQN2/qAdVTmEl0t7Cao+R+Kw2f8jMHLHUhk86ym tuH3EhyISbRQLOOq2xq0kUggpU8qPxoPWqHsY9doCFOraZbIeaa3nI+GNV3DnkJQcrVrDcYO1+nP 7iEU7A5EuTX4UbmCNuoR9Yzmhjz0sXG6wvKnPfogXHK3LPOOafmPPeYSUlAGtmKKEYRJY+E5bwWt HSmdredtQ5UdNLa8+uRtFzikZeT8eHxZXL93ynjfALbNTtZItNzZc7/ek9tXYGyOMhhB4MIj6phz DsKH96ZjoVqhqfkVQ2IzjTd+//YFBqL1ABZg5CzRWoj/3CG9Nv815TM6kLS/h6kAwrgfUQYl9s94 oujGAs/d155okzcB8IH0wiZAf0+pYWLshsDruHtbHbPnuQ/hV2pd6L2Ifj5FglZWIhdP2tCcp41w zO7tqkFfLTUT1/j6LFn2SUEHOk/4jPkcG+uKG36ZbYi852dshCMOLiTBWD9wDJjodD45s6aH68ds WsTLv6F1VEfxWgJvlL4kVaVUnoqEWaErwoH3Rr1nZ3VIZlU64tZDbpSkmhXD21gzmvxxWWOkph/1 EE6MhfEekSIJlZ/AA91XOgvkq9drc4AZnsAQNl2EPxnEYyRVgeNP/W6YmXPtDqZBGl9WIs47YJ6E s+i+zawRYQx3d7xHw11R48cggonCj51LS3oI0EwXsQBgN9Wo/bRrzP0TVnvwNV4g== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Edward Adam Davis To: syzbot+6ada951e7c0f7bc8a71e@syzkaller.appspotmail.com Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, mike.kravetz@oracle.com, muchun.song@linux.dev, nathan@kernel.org, ndesaulniers@google.com, riel@surriel.com, syzkaller-bugs@googlegroups.com, trix@redhat.com Subject: [PATCH] mm/hugetlb: fix null ptr defer in hugetlb_vma_lock_write Date: Wed, 1 Nov 2023 14:36:28 +0800 X-OQ-MSGID: <20231101063627.3545950-2-eadavis@qq.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <00000000000078d1e00608d7878b@google.com> References: <00000000000078d1e00608d7878b@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: ns4spc1ikcf98y7rnsn9j5q8gp33exyg X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2238C18000C X-Rspam-User: X-HE-Tag: 1698820601-809919 X-HE-Meta: U2FsdGVkX18UQAJfMiEIvGDL5bMY4DOgG2AXkmaJ2kUC6So0IPWkQctxNA1GEyCrOzo66JjKcrKWPS8LX2aEhUm9nsQfpNp3TP+77ulvZv7XMEWGNN9SdmYPCuInrvnoanrR2XScjWPMHqASUbhF/DOsk9+IO88joUKXlD9qEwUCVUC8vNyHcsGEKLs6U1pa8pRQ1Xph/3Kt61Y0mB3DQ6raUxLTwQaiCTPCha3qhbVMw7P1JVhnTtVDwPC48lEvelfkaqluN2pgssuSKVNZBq63HujmyVIZjaWHjKQM58IvacOKaWsrmADF2/ER/Xr8UbP4HaZ89geCFYIjySBysQwpqVJ00z4o5+MPYuyLWMSqSt71f3fVUVWE+uKdQtnBUimU52LlHrXS6ZzLOVo9kfPkiv0gtP+EQ+665ECJvK5byEYC2H9aRf3eYi3gW7ZBU9xDinK7S0lD3we4QfzT00mI2Nd/PIamVZQ9tNdEOrF3tJiW4BbJR4eOq/Bdc6aqTO8T43ZKeyy6en1Nwg16CxzhN9AAjGkE369TLG4QuspPESGEOPeh3erUIz/etX5Qi0zwKXeUsvwwRKvqkfBXvymUoJgSGHQTubpN4/tgZogLGe/L35rhjnRx0YtwIV87yaD/2fvgSX90BKKehNw2Ta9V8wdEg+r0Mq0XJhypj1fT16JVvi/tDHZEJeauSKjRPo1hVs3eTwIn9l0XT/PQSh8QLHpPXu5Dxf7FTTJ3SVbiMqxShxlIbdKIzNxWQK2bLazBz5uQHnI7VAW13OtAdvk2NGeSY1LJnnVLGZuT+ReJVK1jb1fxHY4ihhIWVgbbYVbMCWY6NwBVI1/i7RnscdGFByh2o9XOAmws41OQhZPg+U5+51GyUtEBtFCmb4Z+a/SvKNhL+Y7ywTree1xJtg1wylFnkxdyHtlICXJRrzfANbDT/pMqDvNAYz42At6dPyhoP5LvGFMi/RNtJX5 Rzscm9oo 1PkNGjyEvxHJ/ZhQ0kJJc3HIMcym/FYnLPrLFjAMVxe39ZO8fQCohzQd5HqgPIZMueMJgMKty03MH472B4WSGtNAOHoe8+tab88WosBwdq3Y3CFcN0v8HuyjbYaD+wwSga3UdUBhKMseVeDdD2psT/bspXh7z2Q1RlTBDy5R6t33PJ7G9rEZfl+AHNyZzNgGNkq4kLVSBgfWkrs8FRkynpApuOktaUDIEnXJe3/jGWryhC0eaO/xT3N7p2R9IWXpem3iT47N0fzWpEweTFf/oCHnZdrINQLAVbNJ3P+ElyOlZgm3vQ7Lmhqp8r0NmrVD966ijMgk0DxBcUItt6YTDgLgNz/jjNoJRfWkNktQcr1IZl2THuuMWIlJu61WC0Vuk4NVw1wKHnnXTHMmZ2k72YN0wWA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000110, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When obtaining resv_map from vma, it is necessary to simultaneously determine the flag HPAGE_RESV_OWNER of vm_private_data. Only when they are met simultaneously, resv_map is valid. Reported-and-tested-by: syzbot+6ada951e7c0f7bc8a71e@syzkaller.appspotmail.com Fixes: bf4916922c60 ("hugetlbfs: extend hugetlb_vma_lock to private VMAs") Signed-off-by: Edward Adam Davis --- include/linux/hugetlb.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 47d25a5e1933..1a3ec1aee1a3 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -1265,9 +1265,11 @@ static inline bool __vma_shareable_lock(struct vm_area_struct *vma) return (vma->vm_flags & VM_MAYSHARE) && vma->vm_private_data; } +#define HPAGE_RESV_OWNER (1UL << 0) static inline bool __vma_private_lock(struct vm_area_struct *vma) { - return (!(vma->vm_flags & VM_MAYSHARE)) && vma->vm_private_data; + return (!(vma->vm_flags & VM_MAYSHARE)) && vma->vm_private_data && + ((unsigned long)vma->vm_private_data & HPAGE_RESV_OWNER); } /* -- 2.25.1