[2.6 patch] sound/oss/gus_wave.c: fix off by one errors

From: Adrian Bunk
Date: Fri Mar 25 2005 - 13:24:01 EST


This patch fixes two off by one errors found by the Coverity checker.
In both cases, the variables are later used as indexes for arrays with
MAX_PATCH elements.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.12-rc1-mm1-full/sound/oss/gus_wave.c.old 2005-03-23 03:19:25.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/sound/oss/gus_wave.c 2005-03-23 03:20:42.000000000 +0100
@@ -1085,7 +1085,7 @@
{
int sample_no;

- if (instr_no < 0 || instr_no > MAX_PATCH)
+ if (instr_no < 0 || instr_no >= MAX_PATCH)
instr_no = 0; /* Default to acoustic piano */

if (voice < 0 || voice > 31)
@@ -1676,7 +1676,7 @@

instr = patch.instr_no;

- if (instr < 0 || instr > MAX_PATCH)
+ if (instr < 0 || instr >= MAX_PATCH)
{
/* printk(KERN_ERR "GUS: Invalid patch number %d\n", instr);*/
return -EINVAL;

-
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/