Re: [PATCH] drivers/staging/speakup: avoid out-of-range access

[Samuel Thibault]

Greg KH, le Mon 07 Jan 2013 09:44:53 -0800, a écrit :
> Wait, Nickolai wrote the first patch, so how could he sign off on your
> patch?  How about sending me an add-on patch on top of the first one
> which adds the additional check?

Right, here it is:


Check that array index is in-bounds before accessing the synths[] array.

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

---
 drivers/staging/speakup/synth.c |    2 +-
 1 file changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index df95337..b91d22b 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -423,7 +423,7 @@ int synth_add(struct spk_synth *in_synth
 	int i;
 	int status = 0;
 	mutex_lock(&spk_mutex);
-	for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
+	for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
 		/* synth_remove() is responsible for rotating the array down */
 		if (in_synth == synths[i]) {
 			mutex_unlock(&spk_mutex);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/