From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B63B3E5A0B for ; Thu, 24 Sep 2026 18:00:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790272827; cv=none; b=mqjeQFTa7cINFfuHJ0rdtXQnvXeifNb2xEz0tI7MzkLpod1Y92v9msyjMtOHe1/rGJE6gZVVy/2blSNHy3h5khfgbIuzMY6sZPvkeDlH5qeWDyeSp2z4UtU0JAkYfusVOtcARHtFUooopR2cXpkA4V5YEFFPBo8pAZxTk1vaZHA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790272827; c=relaxed/simple; bh=dIEo2BWot8KMA7bFyxIXMBMINiO703u3CNAgbTnUo2E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Jm7e4sPpr8fg+S75g8VA03Sb/RcoDO+CYUcF3eRqfdKriX6XhUSEcalCxhuMDpVY1FWn2TrOgRG6LVmmzDGQJ4SC2LUHiEjKcRbx8qPh9XeERjwvrdywWeHZiTNeErJ1jRZNc0B2epQsm/J3+cpA91HjeeWVXHD5azm46j6P4Qk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=qNcW8nj0; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="qNcW8nj0" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-52f9fc510e1so8275611cf.0 for ; Thu, 24 Sep 2026 11:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1790272822; x=1790877622; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=yIrEACM/1hk8RvSSdnwytl7iIy1+VcppA4PP9Tt2BDk=; b=qNcW8nj0/pDdjrHX+ELCleXyhNSH46+yVTvIwKXf0KEsO2lrNq/+t7BLtAJv/5kwUi 2AQLV5DG6nqODb54KYJ2Hhy8HyGJBZMXduXpgQLzeebEeIcn11k5EsbWxNYcGPXBaT1+ /qweihLG7noAHfK+Zx5EEGn0ruWcXq/Gj/S2WSYYG/9cAsBnCCVbDo0GQ6tr6T6jIO6M OeOdtj4ZPY+H89quivLjIZrF0JngYycSDR0/nPJVKUYp/eeTnJbocj21+VpbAezcSeJb 3sQPtmZy9+wwtqCXvsR5dE5N64+9dWM26DJ4nK/0tsdNaizI0KONqxKZScMTirDGCpdM wpaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790272822; x=1790877622; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=yIrEACM/1hk8RvSSdnwytl7iIy1+VcppA4PP9Tt2BDk=; b=n8NPspSLVw+3oIuXto/Sb2rSV8UYEJ2EiLu9Cu6rYPBDUqA3FeGx1+9fIOlSX6jnvq oiQDTlxjz6uZsqOWiTtbVz/cYmtgV9e76mz6Z0SPOsrDxu59wOuGljpMpU9rsLpNetUJ uVrX2kWrypWFRVXl19AGRmkj2kAj/0sYO2of9A8zL+g5BOOYHIm/j8aqyt6WnYaH7xUb 4B7s1YyTI8iM6tEY7ukgbSOe2nxfvcgh3/RjVeepY1OCsHVG/cvWNRiO/nidRKetc/TP 2up0YSu2RuCrJsfS/EsInYGjFJgjovUsRi7GqabjAPAb/4tRYv0tYP7CjevyCTEulrGW PD9A== X-Forwarded-Encrypted: i=1; AKwUvBx43q7eKOF8fJVJKYcLrleEm/jDNFBMPTg4T4SjLLhaA8AkPJGAf+XKLiXYj+2c9NcM/pflNL0L9V90@vger.kernel.org X-Gm-Message-State: AFuF++lx42q5GhjobQb03HJeq8/EdfuQ8nB6I6wU3w6A2kardlqyGGNS X+I9J0EhwOY1Hb7rfYZAFHxZYHkp+LfR7IFu9I7bLeF4rOeDWcupUa7CiTsy1OIbOM4= X-Gm-Gg: AYBFou0Xv9W2jIi8RvA6XVCSdcorvPbstYhw2mNpNU1JM+PmrKWTcQminAx1rIMZg0W ADngphdIJ5UmnXZ0ZJv7TPNnSrZXtCPekG3pp45hl9BDKvji5e/ZqbTRCWpOEmF03q6Y4Xt4iLI /wwC3R4VE7rksjK4iXscfxdw6yvsaX+9yp/Bc/uxr9Ws8L8qyco9N6UTW2wRLoMqCQGeG26FTTt /FLGd8B4gy4ISo6Zxl4VZnyaHaPfGKy7OIBRxbO5zvvLvmuIHQB4nmoRhWph5IHotPKeGlMWOJT MVAVfsMm5ZFOVshFb0BZRjrpEmr95v4JurJhctZSpefXeRvl35+7iXJgashq8gOLMQvij4RSQEj E5iZH2p52Yt3YbWNxNY4Pr6101I3f0rNhn2nE/LVc2ozBDDM1KomGPJHXe3qR1vN7cjH+A/T84Z XCjk0dUW4/a+y+FMavGXAyOekehbWG3X/2aBPHnIEAr1Ua5yNiLhGm0mPLgNnkfbTUCW+3Js0ZY ywAv8ScN+Y7sm9BmkzZVzOBYaIB+/bo577lBWL8ic1wFI+v7+UDwCc= X-Received: by 2002:ac8:5a46:0:b0:530:e682:87c with SMTP id d75a77b69052e-5330b6df434mr78501cf.33.1790272821894; Thu, 24 Sep 2026 11:00:21 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F (pool-173-79-60-52.washdc.fios.verizon.net. [173.79.60.52]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-532eb38d347sm47450101cf.25.2026.09.24.11.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 11:00:21 -0700 (PDT) Date: Thu, 24 Sep 2026 14:00:18 -0400 From: Gregory Price To: "Lorenzo Stoakes (ARM)" Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-usb@vger.kernel.org, linux-rdma@vger.kernel.org, selinux@vger.kernel.org, linux-sound@vger.kernel.org, bpf@vger.kernel.org, linux-scsi@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, fuse-devel@lists.linux.dev Subject: Re: [PATCH v3 05/40] mm/vma: ensure mmap_prepare doesn't set actions on a mergeable vma Message-ID: References: <20260917-b4-mmap-prepare-vma-flag-sanify-v3-0-4583d8a23bca@kernel.org> <20260917-b4-mmap-prepare-vma-flag-sanify-v3-5-4583d8a23bca@kernel.org> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260917-b4-mmap-prepare-vma-flag-sanify-v3-5-4583d8a23bca@kernel.org> On Thu, Sep 17, 2026 at 05:22:14PM +0100, Lorenzo Stoakes (ARM) wrote: > When a user requests an mmap_action be performed in mmap_prepare, this > involves populating the VMA range with data. > > However, if the VMA is mergeable, it might then mistakenly be merged with > another VMA without having populated the range. > > Every mmap action currently available sets VMA flags such that the VMA > cannot be merged. > > However, to ensure that no future mmap action falls foul of this, assert > that this is the case upon mmap_prepare validation. > > Signed-off-by: Lorenzo Stoakes (ARM) > --- > mm/vma.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/mm/vma.c b/mm/vma.c > index d6ed10cefc8f..62f2ce1ad5a1 100644 > --- a/mm/vma.c > +++ b/mm/vma.c > @@ -2809,6 +2809,15 @@ static int mmap_validate(unsigned long prev_start, unsigned long prev_end, > int mmap_prepare_validate(const struct vm_area_desc *prev_desc, > const struct vm_area_desc *desc) > { > + /* > + * It is not valid to execute mmap actions for VMAs which can be merged, > + * as any such merge would leave portions of the mapping incorrectly > + * unmapped. > + */ > + if (vma_flags_can_merge(&desc->vma_flags) && > + WARN_ON_ONCE(desc->action.type != MMAP_NOTHING)) > + return -EINVAL; > + If you wanted to make this unit-testable, you could pull it out into a separate function: static bool mmap_action_is_valid(const struct vm_area_desc *desc) { return desc->action.type == MMAP_NOTHING || !vma_flags_can_merge(&desc->vma_flags); } then write: if (WARN_ON_ONCE(!mmap_action_is_valid(desc))) return -EINVAL; And you can write a unit test directly against mmap_action_is_valid otherwise Reviewed-by: Gregory Price (Meta)