[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130105192944.GL5965@type.youpi.perso.aquilenet.fr>
Date: Sat, 5 Jan 2013 20:29:44 +0100
From: Samuel Thibault <samuel.thibault@...-lyon.org>
To: Nickolai Zeldovich <nickolai@...il.mit.edu>,
gregkh@...uxfoundation.org
Cc: William Hubbs <w.d.hubbs@...il.com>,
Chris Brannon <chris@...-brannons.com>,
Kirk Reiser <kirk@...ille.uwo.ca>,
linux-kernel@...r.kernel.org, speakup@...ille.uwo.ca
Subject: Re: [PATCH] drivers/staging/speakup: avoid out-of-range access
Indeed. The same happens in synth_add, so Greg please use this instead:
Check that array index is in-bounds before accessing the synths[] array.
Signed-off-by: Nickolai Zeldovich <nickolai@...il.mit.edu>
Signed-off-by: Samuel Thibault <samuel.thibault@...-lyon.org>
---
drivers/staging/speakup/synth.c | 4 ++--
1 file changed, 2 insertions(+), 2 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
@@ -342,7 +342,7 @@ int synth_init(char *synth_name)
mutex_lock(&spk_mutex);
/* First, check if we already have it loaded. */
- for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
+ for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
if (strcmp(synths[i]->name, synth_name) == 0)
synth = synths[i];
@@ -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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists