Re: [PATCH RESEND] x86/boot: Fix off-by-one error in sme_clear_pgd()

From: Andrew Morton

Date: Fri Oct 30 2026 - 21:46:48 EST


On Fri, 18 Sep 2026 16:27:13 +0200 Thorsten Blum <blum@xxxxxxxxxx> wrote:

> The mapping helpers __sme_map_range_pmd() and __sme_map_range_pte(), and
> therefore sme_encrypt_kernel(), use exclusive end addresses and stop
> before vaddr reaches vaddr_end.
>
> However, sme_clear_pgd() treats vaddr_end as inclusive when calculating
> the last PGD entry to clear. If vaddr_end is PGD-aligned, the first PGD
> entry outside the range is cleared too.
>
> Use vaddr_end - 1 to calculate the last PGD entry within the range.

When fixing a bug, please always fully describe the worst-case
userspace-visible runtime effects of that bug.

I'm guessing "none known, this is from code inspection"?

Thanks.

> --- a/arch/x86/boot/startup/sme.c
> +++ b/arch/x86/boot/startup/sme.c
> @@ -99,7 +99,7 @@ static void __init sme_clear_pgd(struct sme_populate_pgd_data *ppd)
> pgd_t *pgd_p;
>
> pgd_start = ppd->vaddr & PGDIR_MASK;
> - pgd_end = ppd->vaddr_end & PGDIR_MASK;
> + pgd_end = (ppd->vaddr_end - 1) & PGDIR_MASK;
>
> pgd_size = (((pgd_end - pgd_start) / PGDIR_SIZE) + 1) * sizeof(pgd_t);
>