From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/11] KVM: ARM/arm64: avoid returning negative error code as bool
Date: Tue, 26 Aug 2014 15:13:22 +0100 [thread overview]
Message-ID: <1409062410-25891-4-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1409062410-25891-1-git-send-email-will.deacon@arm.com>
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: Will Deacon <will.deacon@arm.com>
---
arch/arm/kvm/coproc.c | 2 +-
arch/arm64/kvm/sys_regs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 37a0fe1bb9bb..7928dbdf2102 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -791,7 +791,7 @@ static bool is_valid_cache(u32 val)
u32 level, ctype;
if (val >= CSSELR_MAX)
- return -ENOENT;
+ return false;
/* Bottom bit is Instruction or Data bit. Next 3 bits are level. */
level = (val >> 1);
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 5805e7c4a4dd..4cc3b719208e 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1218,7 +1218,7 @@ static bool is_valid_cache(u32 val)
u32 level, ctype;
if (val >= CSSELR_MAX)
- return -ENOENT;
+ return false;
/* Bottom bit is Instruction or Data bit. Next 3 bits are level. */
level = (val >> 1);
--
2.1.0.rc1
next prev parent reply other threads:[~2014-08-26 14:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 14:13 [PATCH 00/11] Fix arm64 issues highlighted by sparse and smatch Will Deacon
2014-08-26 14:13 ` [PATCH 01/11] KVM: ARM/arm64: fix non-const declaration of function returning const Will Deacon
2014-08-26 14:21 ` Marc Zyngier
2014-08-26 14:29 ` Christoffer Dall
2014-08-26 14:13 ` [PATCH 02/11] KVM: ARM/arm64: fix broken __percpu annotation Will Deacon
2014-08-26 14:21 ` Marc Zyngier
2014-08-26 14:13 ` Will Deacon [this message]
2014-08-26 14:22 ` [PATCH 03/11] KVM: ARM/arm64: avoid returning negative error code as bool Marc Zyngier
2014-08-26 14:49 ` Christoffer Dall
2014-08-26 14:13 ` [PATCH 04/11] KVM: ARM/arm64: return -EFAULT if copy_from_user fails in set_timer_reg Will Deacon
2014-08-26 14:22 ` Marc Zyngier
2014-08-26 14:49 ` Christoffer Dall
2014-08-26 14:13 ` [PATCH 05/11] KVM: vgic: return int instead of bool when checking I/O ranges Will Deacon
2014-08-26 14:27 ` Marc Zyngier
2014-08-26 14:49 ` Christoffer Dall
2014-08-26 14:13 ` [PATCH 06/11] KVM: vgic: declare probe function pointer as const Will Deacon
2014-08-26 14:27 ` Marc Zyngier
2014-08-26 14:50 ` Christoffer Dall
2014-08-26 14:13 ` [PATCH 07/11] irqchip: gic: make gic_default_routable_irq_domain_ops static Will Deacon
2014-08-26 14:29 ` Marc Zyngier
2014-08-26 14:13 ` [PATCH 08/11] irqchip: gic-v3: declare rdist as __percpu pointer to __iomem pointer Will Deacon
2014-08-26 14:29 ` Marc Zyngier
2014-08-26 14:13 ` [PATCH 09/11] arm64: ptrace: fix compat hardware watchpoint reporting Will Deacon
2014-08-26 14:13 ` [PATCH 10/11] arm64: ptrace: fix compat reg getter/setter return values Will Deacon
2014-08-26 14:13 ` [PATCH 11/11] arm64: perf: don't rely on layout of pt_regs when grabbing sp or pc Will Deacon
2014-08-26 14:43 ` Jean Pihet
2014-08-26 14:56 ` [PATCH 00/11] Fix arm64 issues highlighted by sparse and smatch Christoffer Dall
2014-08-26 17:05 ` Will Deacon
2014-08-27 20:58 ` Christoffer Dall
2014-09-03 12:10 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409062410-25891-4-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).