* PATCH: further OSS audio updates
@ 2003-07-27 20:27 Alan Cox
0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2003-07-27 20:27 UTC (permalink / raw)
To: linux-kernel, torvalds
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/oss/ac97_codec.c linux-2.6.0-test2-ac1/sound/oss/ac97_codec.c
--- linux-2.6.0-test2/sound/oss/ac97_codec.c 2003-07-14 14:11:57.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/oss/ac97_codec.c 2003-07-23 16:32:08.000000000 +0100
@@ -513,8 +513,9 @@
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
- strncpy(info.id, codec->name, sizeof(info.id));
- strncpy(info.name, codec->name, sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, codec->name, sizeof(info.id));
+ strlcpy(info.name, codec->name, sizeof(info.name));
info.modify_counter = codec->modcnt;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
@@ -522,8 +523,9 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
- strncpy(info.id, codec->name, sizeof(info.id));
- strncpy(info.name, codec->name, sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, codec->name, sizeof(info.id));
+ strlcpy(info.name, codec->name, sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/oss/cmpci.c linux-2.6.0-test2-ac1/sound/oss/cmpci.c
--- linux-2.6.0-test2/sound/oss/cmpci.c 2003-07-14 14:11:57.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/oss/cmpci.c 2003-07-23 16:32:08.000000000 +0100
@@ -1272,8 +1272,9 @@
VALIDATE_STATE(s);
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
- strncpy(info.id, "cmpci", sizeof(info.id));
- strncpy(info.name, "C-Media PCI", sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, "cmpci", sizeof(info.id));
+ strlcpy(info.name, "C-Media PCI", sizeof(info.name));
info.modify_counter = s->mix.modcnt;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
@@ -1281,8 +1282,9 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
- strncpy(info.id, "cmpci", sizeof(info.id));
- strncpy(info.name, "C-Media cmpci", sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, "cmpci", sizeof(info.id));
+ strlcpy(info.name, "C-Media cmpci", sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/oss/dmasound/dmasound_core.c linux-2.6.0-test2-ac1/sound/oss/dmasound/dmasound_core.c
--- linux-2.6.0-test2/sound/oss/dmasound/dmasound_core.c 2003-07-27 19:56:30.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/oss/dmasound/dmasound_core.c 2003-07-27 20:50:02.000000000 +0100
@@ -351,8 +351,9 @@
case SOUND_MIXER_INFO:
{
mixer_info info;
- strncpy(info.id, dmasound.mach.name2, sizeof(info.id));
- strncpy(info.name, dmasound.mach.name2, sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, dmasound.mach.name2, sizeof(info.id));
+ strlcpy(info.name, dmasound.mach.name2, sizeof(info.name));
info.modify_counter = mixer.modify_counter;
if (copy_to_user((int *)arg, &info, sizeof(info)))
return -EFAULT;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/oss/hal2.c linux-2.6.0-test2-ac1/sound/oss/hal2.c
--- linux-2.6.0-test2/sound/oss/hal2.c 2003-07-27 19:56:30.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/oss/hal2.c 2003-07-23 16:32:08.000000000 +0100
@@ -787,9 +787,9 @@
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
-
- strncpy(info.id, hal2str, sizeof(info.id));
- strncpy(info.name, hal2str, sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, hal2str, sizeof(info.id));
+ strlcpy(info.name, hal2str, sizeof(info.name));
info.modify_counter = hal2->mixer.modcnt;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
@@ -797,9 +797,9 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
-
- strncpy(info.id, hal2str, sizeof(info.id));
- strncpy(info.name, hal2str, sizeof(info.name));
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.id, hal2str, sizeof(info.id));
+ strlcpy(info.name, hal2str, sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/oss/harmony.c linux-2.6.0-test2-ac1/sound/oss/harmony.c
--- linux-2.6.0-test2/sound/oss/harmony.c 2003-07-27 19:56:30.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/oss/harmony.c 2003-07-23 15:56:03.000000000 +0100
@@ -1296,7 +1296,6 @@
unregister_parisc_driver(&harmony_driver);
}
-EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("Alex DeVries <alex@linuxcare.com>");
MODULE_DESCRIPTION("Harmony sound driver");
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-07-27 23:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-27 20:27 PATCH: further OSS audio updates Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).