From fe9bab2df96cec7011773aab272515b9faa9b6c4 Mon Sep 17 00:00:00 2001 From: Eugene Teo <eugene.teo@eugeneteo.net> Date: Sat, 25 Mar 2006 03:08:07 -0800 Subject: [PATCH] Fix sb_mixer use before validation dev should be validated before it is being used as index to array. Coverity bug #871 Signed-off-by: Eugene Teo <eugene.teo@eugeneteo.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --- sound/oss/sb_mixer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c index f56898c398..ccb21d48d4 100644 --- a/sound/oss/sb_mixer.c +++ b/sound/oss/sb_mixer.c @@ -273,14 +273,14 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right) int regoffs; unsigned char val; + if ((dev < 0) || (dev >= devc->iomap_sz)) + return -EINVAL; + regoffs = (*devc->iomap)[dev][LEFT_CHN].regno; if (regoffs == 0) return -EINVAL; - if ((dev < 0) || (dev >= devc->iomap_sz)) - return -EINVAL; - val = sb_getmixer(devc, regoffs); change_bits(devc, &val, dev, LEFT_CHN, left); -- cgit v1.2.2