]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pstore/ram: Fix crash when setting number of cpus to an odd number
authorWeichen Chen <weichen.chen@mediatek.com>
Fri, 24 Feb 2023 02:36:32 +0000 (10:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Feb 2024 07:42:04 +0000 (08:42 +0100)
[ Upstream commit d49270a04623ce3c0afddbf3e984cb245aa48e9c ]

When the number of cpu cores is adjusted to 7 or other odd numbers,
the zone size will become an odd number.
The address of the zone will become:
    addr of zone0 = BASE
    addr of zone1 = BASE + zone_size
    addr of zone2 = BASE + zone_size*2
    ...
The address of zone1/3/5/7 will be mapped to non-alignment va.
Eventually crashes will occur when accessing these va.

So, use ALIGN_DOWN() to make sure the zone size is even
to avoid this bug.

Signed-off-by: Weichen Chen <weichen.chen@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Tested-by: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
Link: https://lore.kernel.org/r/20230224023632.6840-1-weichen.chen@mediatek.com
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/pstore/ram.c

index 98e579ce0d6330322711c1d2f3cd0c62954c061b..44fc3b3962882a7883e4f41d3106d51637e9bae2 100644 (file)
@@ -519,6 +519,7 @@ static int ramoops_init_przs(const char *name,
        }
 
        zone_sz = mem_sz / *cnt;
+       zone_sz = ALIGN_DOWN(zone_sz, 2);
        if (!zone_sz) {
                dev_err(dev, "%s zone size == 0\n", name);
                goto fail;