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

Commit 08a82c68 authored by Phil Carmody's avatar Phil Carmody Committed by Linus Torvalds
Browse files

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: default avatarPhil 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4be929be

drivers/char/hvsi.c

+2 −4
Original line number Diff line number Diff line
@@ -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 */