summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Carmody <ext-phil.2.carmody@nokia.com>2010-05-24 14:33:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 08:07:03 -0700
commit08a82c6872ac1d37cb993a52f1b35f97f48295bd (patch)
tree43599b0869e8001e3e207e3498a5d510720070f2
parent4be929be34f9bdeffa40d815d32d7d60d2c7f03b (diff)
downloadop-kernel-dev-08a82c6872ac1d37cb993a52f1b35f97f48295bd.zip
op-kernel-dev-08a82c6872ac1d37cb993a52f1b35f97f48295bd.tar.gz
hvsi: fix messed up error checking getting state name
Handle out-of-range indices before reading what they refer to. And don't access the one-past-the-end element of the array either. Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Roel Kluin <roel.kluin@gmail.com> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/hvsi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 793b236..d4b14ff 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -194,10 +194,8 @@ static inline void print_state(struct hvsi_struct *hp)
"HVSI_WAIT_FOR_MCTRL_RESPONSE",
"HVSI_FSP_DIED",
};
- const char *name = state_names[hp->state];
-
- if (hp->state > ARRAY_SIZE(state_names))
- name = "UNKNOWN";
+ const char *name = (hp->state < ARRAY_SIZE(state_names))
+ ? state_names[hp->state] : "UNKNOWN";
pr_debug("hvsi%i: state = %s\n", hp->index, name);
#endif /* DEBUG */
OpenPOWER on IntegriCloud