Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'fix/oss' into for-linus
* fix/oss:
sound: mpu401.c: Buffer overflow
sound: aedsp16: Buffer overflow
+5
-4
sound/oss/aedsp16.c
+5
-4
sound/oss/aedsp16.c
···
325
325
/*
326
326
* Size of character arrays that store name and version of sound card
327
327
*/
328
-
#define CARDNAMELEN 15 /* Size of the card's name in chars */
329
-
#define CARDVERLEN 2 /* Size of the card's version in chars */
328
+
#define CARDNAMELEN 15 /* Size of the card's name in chars */
329
+
#define CARDVERLEN 10 /* Size of the card's version in chars */
330
+
#define CARDVERDIGITS 2 /* Number of digits in the version */
330
331
331
332
#if defined(CONFIG_SC6600)
332
333
/*
···
411
410
412
411
static int soft_cfg __initdata = 0; /* bitmapped config */
413
412
static int soft_cfg_mss __initdata = 0; /* bitmapped mss config */
414
-
static int ver[CARDVERLEN] __initdata = {0, 0}; /* DSP Ver:
413
+
static int ver[CARDVERDIGITS] __initdata = {0, 0}; /* DSP Ver:
415
414
hi->ver[0] lo->ver[1] */
416
415
417
416
#if defined(CONFIG_SC6600)
···
958
957
* string is finished.
959
958
*/
960
959
ver[len++] = ret;
961
-
} while (len < CARDVERLEN);
960
+
} while (len < CARDVERDIGITS);
962
961
sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);
963
962
964
963
DBG(("success.\n"));
+1
-1
sound/oss/mpu401.c
+1
-1
sound/oss/mpu401.c
···
1074
1074
sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name);
1075
1075
else
1076
1076
sprintf(mpu_synth_info[m].name,
1077
-
"MPU-401 %d.%d%c Midi interface #%d",
1077
+
"MPU-401 %d.%d%c MIDI #%d",
1078
1078
(int) (devc->version & 0xf0) >> 4,
1079
1079
devc->version & 0x0f,
1080
1080
revision_char,