Commit ec86fe52 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/oss' into for-linus

* fix/oss:
  sound: mpu401.c: Buffer overflow
  sound: aedsp16: Buffer overflow
parents d62e345f a987004f
...@@ -326,7 +326,8 @@ ...@@ -326,7 +326,8 @@
* Size of character arrays that store name and version of sound card * Size of character arrays that store name and version of sound card
*/ */
#define CARDNAMELEN 15 /* Size of the card's name in chars */ #define CARDNAMELEN 15 /* Size of the card's name in chars */
#define CARDVERLEN 2 /* Size of the card's version in chars */ #define CARDVERLEN 10 /* Size of the card's version in chars */
#define CARDVERDIGITS 2 /* Number of digits in the version */
#if defined(CONFIG_SC6600) #if defined(CONFIG_SC6600)
/* /*
...@@ -410,7 +411,7 @@ ...@@ -410,7 +411,7 @@
static int soft_cfg __initdata = 0; /* bitmapped config */ static int soft_cfg __initdata = 0; /* bitmapped config */
static int soft_cfg_mss __initdata = 0; /* bitmapped mss config */ static int soft_cfg_mss __initdata = 0; /* bitmapped mss config */
static int ver[CARDVERLEN] __initdata = {0, 0}; /* DSP Ver: static int ver[CARDVERDIGITS] __initdata = {0, 0}; /* DSP Ver:
hi->ver[0] lo->ver[1] */ hi->ver[0] lo->ver[1] */
#if defined(CONFIG_SC6600) #if defined(CONFIG_SC6600)
...@@ -957,7 +958,7 @@ static int __init aedsp16_dsp_version(int port) ...@@ -957,7 +958,7 @@ static int __init aedsp16_dsp_version(int port)
* string is finished. * string is finished.
*/ */
ver[len++] = ret; ver[len++] = ret;
} while (len < CARDVERLEN); } while (len < CARDVERDIGITS);
sprintf(DSPVersion, "%d.%d", ver[0], ver[1]); sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);
DBG(("success.\n")); DBG(("success.\n"));
......
...@@ -1074,7 +1074,7 @@ int attach_mpu401(struct address_info *hw_config, struct module *owner) ...@@ -1074,7 +1074,7 @@ int attach_mpu401(struct address_info *hw_config, struct module *owner)
sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name); sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name);
else else
sprintf(mpu_synth_info[m].name, sprintf(mpu_synth_info[m].name,
"MPU-401 %d.%d%c Midi interface #%d", "MPU-401 %d.%d%c MIDI #%d",
(int) (devc->version & 0xf0) >> 4, (int) (devc->version & 0xf0) >> 4,
devc->version & 0x0f, devc->version & 0x0f,
revision_char, revision_char,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment