Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Wu Fengguang <fengguang.wu@intel.com>
To: Roel Kluin <roel.kluin@gmail.com>
Cc: tiwai@suse.de, alsa-devel@alsa-project.org,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v2] hda: fix out-of-bound hdmi_eld.sad[] write
Date: Wed, 29 Jul 2009 19:31:14 +0800	[thread overview]
Message-ID: <20090729113114.GA8367@localhost> (raw)
In-Reply-To: <4A702387.8090908@gmail.com>

On Wed, Jul 29, 2009 at 12:25:11PM +0200, Roel Kluin wrote:
> e->sad[] is declared with size ELD_MAX_SAD (16), but the guard allows
> the range 0-31

Good catch, thank you, Roel!

Minor fix: '>=' should be used in this line:

> +			if (n < 0 || n > ELD_MAX_SAD)

So I'd suggest this updated patch.

Thanks,
Fengguang
---
hda: fix out-of-bound hdmi_eld.sad[] write

From: Roel Kluin <roel.kluin@gmail.com>

e->sad[] is declared with size ELD_MAX_SAD=16, but the guard
allows range 0-31.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 sound/pci/hda/hda_eld.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- sound-2.6.orig/sound/pci/hda/hda_eld.c
+++ sound-2.6/sound/pci/hda/hda_eld.c
@@ -508,7 +508,7 @@ static void hdmi_write_eld_info(struct s
 	char name[64];
 	char *sname;
 	long long val;
-	int n;
+	unsigned int n;
 
 	while (!snd_info_get_line(buffer, line, sizeof(line))) {
 		if (sscanf(line, "%s %llx", name, &val) != 2)
@@ -539,7 +539,7 @@ static void hdmi_write_eld_info(struct s
 				sname++;
 				n = 10 * n + name[4] - '0';
 			}
-			if (n < 0 || n > 31) /* double the CEA limit */
+			if (n >= ELD_MAX_SAD)
 				continue;
 			if (!strcmp(sname, "_coding_type"))
 				e->sad[n].format = val;

  reply	other threads:[~2009-07-29 11:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-29 10:25 [PATCH] ALSA: Write outside array bounds Roel Kluin
2009-07-29 11:31 ` Wu Fengguang [this message]
2009-07-29 12:45   ` [PATCH v2] hda: fix out-of-bound hdmi_eld.sad[] write Takashi Iwai
2009-07-30 10:57 ` [PATCH] ALSA: Write outside array bounds Alan Horstmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090729113114.GA8367@localhost \
    --to=fengguang.wu@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=roel.kluin@gmail.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox