From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 8DB85EEC0 for ; Mon, 20 Apr 2026 04:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776661182; cv=none; b=FUdM+EWUpMhEuPiUm2nUF6o6/2voghZh+IuxmlCSn2EzdcvxbaJxp64Iew0sWyQxsYreHrlCVOVizHuOmAfG1lEVngX1eTw3PSl1NtHwWXszwudr/8+JwsNWnEIhhXjjhoqLnbBjktdKEEvD/T31oxcHiBjGGuOvQi5ZHEKUa2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776661182; c=relaxed/simple; bh=jBfz7FOTvhxHdhKXZWGNiszbBsVQb1Rs6kFsl0LRo6g=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=kTCfNwSmCkE9UWYUXi4ZGirB+7oegTmlDSXlhn4CuXk77cL8gwKIahzGvivnvcsIsU3VXfv81eR18ItNxPm1hBv+1PRK1Ar5qbXK2QlIz1foEN9i4sSyrxslaYAOOemRlrnRjkgOsl5uuRgOCZA7E3DkK1BB9kQ6V0oH04a6jgQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R9YRNHBg; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R9YRNHBg" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-35d99bae2ebso2463279a91.3 for ; Sun, 19 Apr 2026 21:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776661181; x=1777265981; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=jyZQrY+lfsRgljtAFkCrJnmLZI0e3pi10ZTaBJ1VhuQ=; b=R9YRNHBgR7x3jQxyerTO16dCfugm0i4TUOTw15r7z27f+Xv2Is+H9+DWeQh0qTOXon Mzvva92ZcRABbWQ/rk71YzKdt5xDQXgygtAuzXxfxkOWZWHs7VtWWuAZ5aF38Zj83Civ 0sGIfe1jTWnqDJGalk1dF0Uyn1KgAKuSyzYhr8/PXpKi4MoZbu94r628bh58QHBJEpEM 0ytt4t0es5dW63q0lLSTagedYZ2Nd50o2dllzZBZI26qL0K+Yqpx4iqaHMCHmwH2Cala pWd8sS3A65GatRgl3NWi0ueGCkDskm6w+CyyitsWehgtlBiSa7R2hFmevZIdtfb3Drpu vBsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776661181; x=1777265981; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jyZQrY+lfsRgljtAFkCrJnmLZI0e3pi10ZTaBJ1VhuQ=; b=kTUlfQohncZXQXn4jxkumCR1NPqF0bQJgZO0HoSVAfF9kRvH078ZMNsftY3V13gRDN N9YI9GCxSpmRpEgGDPayCHqKtCf3SQfLm7wIMUKwZd4dMms7F5J9F+hEHug783j+WIU9 o09+48Hy4e1NcYeFlbbGNYNC2z6ARoujPhinholvPQvkdKOFnvYktFTdIb3b+LehY0dE 9UqvrOhsaUjGd3YqK34wDDiqyl3puh05iB2LLMrm242NbCzmSwvznbEPzUzhkZL1RFrZ BzmAa+PlMZiZhhcsR3S49hjBxfBMplTJ5L7hk7SPYAmWa3Fe3IiLRMlghDDlf26jvHnW dlLg== X-Forwarded-Encrypted: i=1; AFNElJ+0kwBS2WGIbK2QvcYl1DsM/wsoVtpYQc68OMWKB/6MFF0t6Kk4WpGnx053GWXvl47vH8c2jlHGqmLF7+o=@vger.kernel.org X-Gm-Message-State: AOJu0YxxZ841WH/99SFVCe/tf8RWfTgGlGmyoVJSF/MRCp7RDmWwlBu7 +J2y7UEnSMYLyMs+XGDZ8EvhwnSJoboCopzkD9ynHKOe+4YtjpE79WQz X-Gm-Gg: AeBDietQVihGwpfAT8y0j85U64wdCAdVk4uWV6g7RQR/NfAfYoZYcUR8nRccpF8xIn1 +n/3UZmIUIXo5rEK37MbLDFLNuK0oF0R9LlEfpksug5o4bzwa0/QDhtGEIwYYMbTG4x1nKCMeOz RWGTXPqC0TL27CBTAGTfYXrlHQtDunYGOKejKZ91YttZD35i/6NqTCW4Bg2FO0odZg+Twx53K6t rNMbeYaI3TqFXem9437YYVA0wBIDqceyrI84NuQOJ4kaq3Xi47SdZG6z9za2XdbniSz/9+Jx25i 2+A2XP+9dX2nq03MDxHOe2DWBj0deLigV+hw7vMMR0HSyJdcEiqJb7Fh82BBy9UxZMXEmMgDz82 hY+R1bwyOcMiC+M0UwKSRQy0QzJo+wyUXH1H/L4KQ4tt9z3CjanvEUScUlF2xqkndAyD/9x7kw1 xgltMQSyXSL4xRvtqGPVoZtR0Fhd7pm7uqtzHSdGQCVBcRjocFng== X-Received: by 2002:a17:90b:3c48:b0:35f:9ab2:a5c2 with SMTP id 98e67ed59e1d1-361403af9b9mr12611390a91.6.1776661180809; Sun, 19 Apr 2026 21:59:40 -0700 (PDT) Received: from adminpc-PowerEdge-R7525 ([27.122.242.81]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36141869e88sm8742825a91.1.2026.04.19.21.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2026 21:59:40 -0700 (PDT) Date: Mon, 20 Apr 2026 13:59:36 +0900 From: Austin Kim To: Paul Walmsley , Palmer Dabbelt , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, austindh.kim@gmail.com Subject: [PATCH] riscv: check leaf entry alignment in pageattr_pxd_entry() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline During page table walking, ensure the range being processed matches the expected size of a leaf entry (P4D, PUD, or PMD). While pxd_addr_end() functions handle boundary checks, they do not inherently validate whether the entry is a leaf node of the expected size. Add WARN_ON_ONCE() to detect misalignments or partial updates of huge pages. If a mismatch is detected, return -EINVAL to prevent potential corruption of page table entries. Signed-off-by: Austin Kim --- arch/riscv/mm/pageattr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c index 3f76db3d2..1461bf77f 100644 --- a/arch/riscv/mm/pageattr.c +++ b/arch/riscv/mm/pageattr.c @@ -32,6 +32,8 @@ static int pageattr_p4d_entry(p4d_t *p4d, unsigned long addr, p4d_t val = p4dp_get(p4d); if (p4d_leaf(val)) { + if (WARN_ON_ONCE((next - addr) != P4D_SIZE)) + return -EINVAL; val = __p4d(set_pageattr_masks(p4d_val(val), walk)); set_p4d(p4d, val); } @@ -45,6 +47,8 @@ static int pageattr_pud_entry(pud_t *pud, unsigned long addr, pud_t val = pudp_get(pud); if (pud_leaf(val)) { + if (WARN_ON_ONCE((next - addr) != PUD_SIZE)) + return -EINVAL; val = __pud(set_pageattr_masks(pud_val(val), walk)); set_pud(pud, val); } @@ -58,6 +62,8 @@ static int pageattr_pmd_entry(pmd_t *pmd, unsigned long addr, pmd_t val = pmdp_get(pmd); if (pmd_leaf(val)) { + if (WARN_ON_ONCE((next - addr) != PMD_SIZE)) + return -EINVAL; val = __pmd(set_pageattr_masks(pmd_val(val), walk)); set_pmd(pmd, val); } -- 2.34.1