From: Alexander Stein <alexander.stein@systec-electronic.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [PATCH] hda_hwdep: Fix possible buffer overflow
Date: Wed, 26 Oct 2011 09:48:12 +0200 [thread overview]
Message-ID: <1319615292-27396-1-git-send-email-alexander.stein@systec-electronic.com> (raw)
If a line in the firmware file is larger than the given buffer size (and
so the firmware file size), size is set to a value larger than the actual
buffer size. This results in an overflow in the buffer passed.
Fix this by copying only up to 127 chars per line.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
sound/pci/hda/hda_hwdep.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index bf3ced5..61da08d 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -745,6 +745,7 @@ static int parse_line_mode(char *buf, struct hda_bus *bus)
* if successfully copied a line
*
* the spaces at the beginning and the end of the line are stripped
+ * lines read are clamped to 127 chars
*/
static int get_line_from_fw(char *buf, int size, struct firmware *fw)
{
@@ -756,8 +757,6 @@ static int get_line_from_fw(char *buf, int size, struct firmware *fw)
}
if (!fw->size)
return 0;
- if (size < fw->size)
- size = fw->size;
for (len = 0; len < fw->size; len++) {
if (!*p)
@@ -768,7 +767,8 @@ static int get_line_from_fw(char *buf, int size, struct firmware *fw)
break;
}
if (len < size)
- *buf++ = *p++;
+ *buf++ = *p;
+ p++;
}
*buf = 0;
fw->size -= len;
--
1.7.3.4
next reply other threads:[~2011-10-26 7:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-26 7:48 Alexander Stein [this message]
2011-10-26 12:58 ` Takashi Iwai
2011-10-26 13:15 ` Alexander Stein
2011-10-26 13:20 ` Takashi Iwai
2011-11-01 8:40 ` [PATCH v2] " Alexander Stein
2011-11-01 8:47 ` 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=1319615292-27396-1-git-send-email-alexander.stein@systec-electronic.com \
--to=alexander.stein@systec-electronic.com \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®