* [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits()
@ 2011-01-29 0:40 Jesper Juhl
2011-01-29 10:46 ` Wu Fengguang
2011-01-29 11:01 ` Takashi Iwai
0 siblings, 2 replies; 5+ messages in thread
From: Jesper Juhl @ 2011-01-29 0:40 UTC (permalink / raw)
To: linux-kernel; +Cc: alsa-devel, Takashi Iwai, Jaroslav Kysela, Wu Fengguang
In hdmi_show_short_audio_desc() we call snd_print_pcm_bits() like this:
snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
that last argument is supposed to be the size of the buffer that
snd_print_pcm_bits() writes to, so I believe it should be this:
snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
hda_eld.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Compile tested only. I don't have relevant hardware.
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 4a66347..74b0560 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -381,7 +381,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
snd_print_pcm_rates(a->rates, buf, sizeof(buf));
if (a->format == AUDIO_CODING_TYPE_LPCM)
- snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
+ snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
else if (a->max_bitrate)
snprintf(buf2, sizeof(buf2),
", max bitrate = %d", a->max_bitrate);
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits()
2011-01-29 0:40 [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits() Jesper Juhl
@ 2011-01-29 10:46 ` Wu Fengguang
2011-01-29 11:01 ` Takashi Iwai
1 sibling, 0 replies; 5+ messages in thread
From: Wu Fengguang @ 2011-01-29 10:46 UTC (permalink / raw)
To: Jesper Juhl; +Cc: linux-kernel, alsa-devel, Takashi Iwai, Jaroslav Kysela
On Sat, Jan 29, 2011 at 01:40:04AM +0100, Jesper Juhl wrote:
> if (a->format == AUDIO_CODING_TYPE_LPCM)
> - snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> + snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
Good catch!
Reviewed-by: Wu Fengguang <fengguang.wu@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits()
@ 2011-01-29 10:46 ` Wu Fengguang
0 siblings, 0 replies; 5+ messages in thread
From: Wu Fengguang @ 2011-01-29 10:46 UTC (permalink / raw)
To: Jesper Juhl; +Cc: Takashi Iwai, alsa-devel, linux-kernel
On Sat, Jan 29, 2011 at 01:40:04AM +0100, Jesper Juhl wrote:
> if (a->format == AUDIO_CODING_TYPE_LPCM)
> - snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> + snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
Good catch!
Reviewed-by: Wu Fengguang <fengguang.wu@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits()
2011-01-29 0:40 [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits() Jesper Juhl
@ 2011-01-29 11:01 ` Takashi Iwai
2011-01-29 11:01 ` Takashi Iwai
1 sibling, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2011-01-29 11:01 UTC (permalink / raw)
To: Jesper Juhl; +Cc: linux-kernel, alsa-devel, Jaroslav Kysela, Wu Fengguang
At Sat, 29 Jan 2011 01:40:04 +0100 (CET),
Jesper Juhl wrote:
>
> In hdmi_show_short_audio_desc() we call snd_print_pcm_bits() like this:
> snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> that last argument is supposed to be the size of the buffer that
> snd_print_pcm_bits() writes to, so I believe it should be this:
> snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Thanks, but this was already fixed in sound git tree and included in
the pending pull request for 2.6.38.
Takashi
> ---
> hda_eld.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Compile tested only. I don't have relevant hardware.
>
> diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
> index 4a66347..74b0560 100644
> --- a/sound/pci/hda/hda_eld.c
> +++ b/sound/pci/hda/hda_eld.c
> @@ -381,7 +381,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
> snd_print_pcm_rates(a->rates, buf, sizeof(buf));
>
> if (a->format == AUDIO_CODING_TYPE_LPCM)
> - snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> + snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
> else if (a->max_bitrate)
> snprintf(buf2, sizeof(buf2),
> ", max bitrate = %d", a->max_bitrate);
>
>
> --
> Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits()
@ 2011-01-29 11:01 ` Takashi Iwai
0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2011-01-29 11:01 UTC (permalink / raw)
To: Jesper Juhl; +Cc: alsa-devel, Wu Fengguang, linux-kernel
At Sat, 29 Jan 2011 01:40:04 +0100 (CET),
Jesper Juhl wrote:
>
> In hdmi_show_short_audio_desc() we call snd_print_pcm_bits() like this:
> snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> that last argument is supposed to be the size of the buffer that
> snd_print_pcm_bits() writes to, so I believe it should be this:
> snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Thanks, but this was already fixed in sound git tree and included in
the pending pull request for 2.6.38.
Takashi
> ---
> hda_eld.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Compile tested only. I don't have relevant hardware.
>
> diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
> index 4a66347..74b0560 100644
> --- a/sound/pci/hda/hda_eld.c
> +++ b/sound/pci/hda/hda_eld.c
> @@ -381,7 +381,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
> snd_print_pcm_rates(a->rates, buf, sizeof(buf));
>
> if (a->format == AUDIO_CODING_TYPE_LPCM)
> - snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
> + snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
> else if (a->max_bitrate)
> snprintf(buf2, sizeof(buf2),
> ", max bitrate = %d", a->max_bitrate);
>
>
> --
> Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-29 11:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-29 0:40 [PATCH] sound, hda_eld: suspicious sizeof() in call to snd_print_pcm_bits() Jesper Juhl
2011-01-29 10:46 ` Wu Fengguang
2011-01-29 10:46 ` Wu Fengguang
2011-01-29 11:01 ` Takashi Iwai
2011-01-29 11:01 ` Takashi Iwai
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.