Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d45766 authored by Will Deacon's avatar Will Deacon Committed by Christoffer Dall
Browse files

KVM: ARM/arm64: avoid returning negative error code as bool 



is_valid_cache returns true if the specified cache is valid.
Unfortunately, if the parameter passed it out of range, we return
-ENOENT, which ends up as true leading to potential hilarity.

This patch returns false on the failure path instead.

Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 4000be42

arch/arm/kvm/coproc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -791,7 +791,7 @@ static bool is_valid_cache(u32 val) 
	u32 level, ctype;

	u32 level, ctype;





	if (val >= CSSELR_MAX)

	if (val >= CSSELR_MAX)

		return -ENOENT;

		return false;





	/* Bottom bit is Instruction or Data bit.  Next 3 bits are level. */

	/* Bottom bit is Instruction or Data bit.  Next 3 bits are level. */

        level = (val >> 1);

        level = (val >> 1);

arch/arm64/kvm/sys_regs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1218,7 +1218,7 @@ static bool is_valid_cache(u32 val) 
	u32 level, ctype;

	u32 level, ctype;





	if (val >= CSSELR_MAX)

	if (val >= CSSELR_MAX)

		return -ENOENT;

		return false;





	/* Bottom bit is Instruction or Data bit.  Next 3 bits are level. */

	/* Bottom bit is Instruction or Data bit.  Next 3 bits are level. */

	level = (val >> 1);

	level = (val >> 1);