From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 BB3DD43E4B2 for ; Wed, 3 Jun 2026 11:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780484735; cv=none; b=lP/il9TAETELEK9sTkVEKiLEuVrwc6JqmHWhXF9CVs2qx6mhF2cVclGYuBhb27D42YaqJ2nRuHhIpd2YMvx3NXCpKSDCXbn3o8u9asKEvjMnirxDpys64QeNXpx+w7zpm0iaktpE95YqLkSN+Kph1zj4zt89DNCChAbcq6fY4gM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780484735; c=relaxed/simple; bh=t1BiPfq2o/Y/qY0POWhYt7Iqk2cwhm0xp6qx6Nxl0MQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jVMKDypm7jFbbGNoI2WlT1jb2qi28Hx4rqluERHyJEfYZQ0qWbAD1YQCSnbSs8BM8P0oPP3K2o4vUq13JwZzpJ0H7f7NLGGLuqIiVdQdCQOdroIwjaj+26hkZ0MOS427ECwxMKe0AI3RtLZUM7VulN0p4JfXUr5GUiAO8pQJb74= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=E0hH4/io; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="E0hH4/io" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-45ef616db45so3174246f8f.2 for ; Wed, 03 Jun 2026 04:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780484732; x=1781089532; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JPcON38i/uY+vfZomqsbE4paaQjqW1yEj/vRQWl6QlA=; b=E0hH4/iog33jzNvaaNZ+RmtQ3POM47jV/jq0toxfM0jELjbKNSMwIdF/0Xn9Yri6Lr gDNmWI680QsycRZhxi5RUJDELXQh36HeJNEx7Nhvok6DXeZqBVsW6mGl8ek8dqmGpof8 ORjreV1dGHNzwtiL1reKbwzdzi7CPzdkDX7FkwqamNs8SLncuE3et8qrqx0ra1tqoE9s 9KBGPcMcO9LpFCxxzNK6VGN2mu075ro38esq3e/TIefV6OcYIpr2xnhNoVUTyV0yROuq 3MbqiTOLQsjBi4jTm1aV78asu3KjlNpZF7aOx+tIcxEXFL34OwvAVtW0YrmJdKBcDc// k1fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780484732; x=1781089532; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JPcON38i/uY+vfZomqsbE4paaQjqW1yEj/vRQWl6QlA=; b=Irn7jkTHSoL1TmIb6S/rtb5ttKBoIwSbCKw28jmDjyUiNL4BuwA780nU1YL2Mki9tn ZtFxZ4pQ27mKy1IEqVL5aqi6nuzq9pAowdk5AS9IlXHBqnjM8nJX9P7xEk3qPmW0GgcK vZvdHjrVy+uHju0C9gQ6p13kFKIo/FJmOYG7Jk2BC6SDxp85Qck2imnrs6zi+pUpsaL6 5ZXWIcRTP0EDeK5ZnKWg/pyDek8Lqz2wduAVcByPlZ+iWyZ0zpJEOL59IDRDGQ3TsR3r FsOuMrKoygencARd3tBx8Vv+HZ6gjUCMkLVD3hBDct0X9njQIkPtVDw0Q0boTvt9do+t 721g== X-Forwarded-Encrypted: i=1; AFNElJ8NA6b5OwHOD9jifQrpjmuLZQQZDhHnlZOwNHqcvGAzKkvTH7ch7ueCRUQ4QqZw5dnoteZK4+vKX9exwJQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyw5Lq92sXmbM2mY3IOLYrPb6hB3LLG0eLDiFq6sT8nPRekI3Uu mZSWRMApsUOxBXRaeWOW+6MOrVNcQQUh4f8JEY8VFOY9w+gVXQQpt23z1aF4NiXOVb4NpTYXXTt i53mBm2M26tAtdQ== X-Received: from wrwc11.prod.google.com ([2002:a5d:63cb:0:b0:45f:60ce:4270]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:354e:b0:48a:75b9:b0bc with SMTP id 5b1f17b1804b1-490b60edb8bmr44260465e9.29.1780484732043; Wed, 03 Jun 2026 04:05:32 -0700 (PDT) Date: Wed, 3 Jun 2026 11:05:21 +0000 In-Reply-To: <20260603110522.3331819-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260603110522.3331819-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260603110522.3331819-3-smostafa@google.com> Subject: [PATCH 2/3] drivers/virt: pkvm: Fix end calculation in mmio_guard_ioremap_hook() From: Mostafa Saleh To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, will@kernel.org, rppt@kernel.org, maz@kernel.org, aneesh.kumar@kernel.org, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" Sashiko (locally) reports a logical issues in mmio_guard_ioremap_hook() mmio_guard_ioremap_hook() attempts to handle unaligned addresses and sizes. However, aligning the start address before adding the size, might shift the end to the page before. Fixes: 0f1269495800 ("drivers/virt: pkvm: Intercept ioremap using pKVM MMIO_GUARD hypercall") Signed-off-by: Mostafa Saleh --- drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c b/drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c index 4230b817a80b..d66291def0f4 100644 --- a/drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c +++ b/drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c @@ -82,8 +82,8 @@ static int mmio_guard_ioremap_hook(phys_addr_t phys, size_t size, if (protval != PROT_DEVICE_nGnRE && protval != PROT_DEVICE_nGnRnE) return 0; + end = PAGE_ALIGN(phys + size); phys = PAGE_ALIGN_DOWN(phys); - end = phys + PAGE_ALIGN(size); while (phys < end) { const int func_id = ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_FUNC_ID; -- 2.54.0.1032.g2f8565e1d1-goog