arm64: fix rodata=full again
authorArd Biesheuvel <ardb@kernel.org>
Thu, 3 Nov 2022 17:00:15 +0000 (18:00 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 8 Nov 2022 16:21:40 +0000 (16:21 +0000)
commit2081b3bd0c11757725dcab9ba5d38e1bddb03459
tree44db4725504b49d316a277bb5f6d45015f3221ad
parent85f1506337f0c79a4955edfeee86a18628e3735f
arm64: fix rodata=full again

Commit 2e8cff0a0eee87b2 ("arm64: fix rodata=full") addressed a couple of
issues with the rodata= kernel command line option, which is not a
simple boolean on arm64, and inadvertently got broken due to changes in
the generic bool handling.

Unfortunately, the resulting code never clears the rodata_full boolean
variable if it defaults to true and rodata=on or rodata=off is passed,
as the generic code is not aware of the existence of this variable.

Given the way this code is plumbed together, clearing rodata_full when
returning false from arch_parse_debug_rodata() may result in
inconsistencies if the generic code decides that it cannot parse the
right hand side, so the best way to deal with this is to only take
rodata_full in account if rodata_enabled is also true.

Fixes: 2e8cff0a0eee ("arm64: fix rodata=full")
Cc: <stable@vger.kernel.org> # 6.0.x
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20221103170015.4124426-1-ardb@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/mm/pageattr.c