From: walter harms <wharms@bfs.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Clemens Ladisch <clemens@ladisch.de>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] ALSA: dice: fix array limits in dice_proc_read()
Date: Fri, 29 Nov 2013 10:48:28 +0100 [thread overview]
Message-ID: <529862EC.60104@bfs.de> (raw)
In-Reply-To: <20131129081409.GA3490@elgon.mountain>
Am 29.11.2013 09:14, schrieb Dan Carpenter:
> The array limits are supposed to be in units of u32 instead of in bytes.
> The current code has a potential array overflow.
>
> Fixes: c614475b0ea9 ('ALSA: dice: add a proc file to show device information')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
> index 57bcd31fcc12..c0aa64941cee 100644
> --- a/sound/firewire/dice.c
> +++ b/sound/firewire/dice.c
> @@ -1019,7 +1019,7 @@ static void dice_proc_read(struct snd_info_entry *entry,
>
> if (dice_proc_read_mem(dice, &tx_rx_header, sections[2], 2) < 0)
> return;
> - quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx));
> + quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx) / 4);
it is a bit late but ...
sizeof(buf.tx) / 4 looks like ARRAY_SIZE(buf.tx)
If yes i suggest ARRAY_SIZE() because it gets rid of the "magic" 4.
re,
wh
> for (stream = 0; stream < tx_rx_header.number; ++stream) {
> if (dice_proc_read_mem(dice, &buf.tx, sections[2] + 2 +
> stream * tx_rx_header.size,
> @@ -1045,7 +1045,7 @@ static void dice_proc_read(struct snd_info_entry *entry,
>
> if (dice_proc_read_mem(dice, &tx_rx_header, sections[4], 2) < 0)
> return;
> - quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx));
> + quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx) / 4);
> for (stream = 0; stream < tx_rx_header.number; ++stream) {
> if (dice_proc_read_mem(dice, &buf.rx, sections[4] + 2 +
> stream * tx_rx_header.size,
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
WARNING: multiple messages have this Message-ID (diff)
From: walter harms <wharms@bfs.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Clemens Ladisch <clemens@ladisch.de>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] ALSA: dice: fix array limits in dice_proc_read()
Date: Fri, 29 Nov 2013 09:48:28 +0000 [thread overview]
Message-ID: <529862EC.60104@bfs.de> (raw)
In-Reply-To: <20131129081409.GA3490@elgon.mountain>
Am 29.11.2013 09:14, schrieb Dan Carpenter:
> The array limits are supposed to be in units of u32 instead of in bytes.
> The current code has a potential array overflow.
>
> Fixes: c614475b0ea9 ('ALSA: dice: add a proc file to show device information')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
> index 57bcd31fcc12..c0aa64941cee 100644
> --- a/sound/firewire/dice.c
> +++ b/sound/firewire/dice.c
> @@ -1019,7 +1019,7 @@ static void dice_proc_read(struct snd_info_entry *entry,
>
> if (dice_proc_read_mem(dice, &tx_rx_header, sections[2], 2) < 0)
> return;
> - quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx));
> + quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx) / 4);
it is a bit late but ...
sizeof(buf.tx) / 4 looks like ARRAY_SIZE(buf.tx)
If yes i suggest ARRAY_SIZE() because it gets rid of the "magic" 4.
re,
wh
> for (stream = 0; stream < tx_rx_header.number; ++stream) {
> if (dice_proc_read_mem(dice, &buf.tx, sections[2] + 2 +
> stream * tx_rx_header.size,
> @@ -1045,7 +1045,7 @@ static void dice_proc_read(struct snd_info_entry *entry,
>
> if (dice_proc_read_mem(dice, &tx_rx_header, sections[4], 2) < 0)
> return;
> - quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx));
> + quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx) / 4);
> for (stream = 0; stream < tx_rx_header.number; ++stream) {
> if (dice_proc_read_mem(dice, &buf.rx, sections[4] + 2 +
> stream * tx_rx_header.size,
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2013-11-29 9:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 8:14 [patch] ALSA: dice: fix array limits in dice_proc_read() Dan Carpenter
2013-11-29 8:14 ` Dan Carpenter
2013-11-29 9:11 ` Clemens Ladisch
2013-11-29 9:11 ` Clemens Ladisch
2013-11-29 9:24 ` Takashi Iwai
2013-11-29 9:24 ` Takashi Iwai
2013-11-29 9:48 ` walter harms [this message]
2013-11-29 9:48 ` walter harms
2013-11-29 9:55 ` Takashi Iwai
2013-11-29 9:55 ` Takashi Iwai
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=529862EC.60104@bfs.de \
--to=wharms@bfs.de \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=perex@perex.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.