lkml.org 
[lkml]   [2003]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectPATCH: more wrong strlcpy's
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.75/sound/oss/sonicvibes.c linux-2.5.75-ac1/sound/oss/sonicvibes.c
--- linux-2.5.75/sound/oss/sonicvibes.c 2003-07-10 21:08:53.000000000 +0100
+++ linux-2.5.75-ac1/sound/oss/sonicvibes.c 2003-07-11 16:27:40.000000000 +0100
@@ -1046,8 +1046,8 @@
VALIDATE_STATE(s);
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
- strlcpy(info.id, "SonicVibes", sizeof(info.id));
- strlcpy(info.name, "S3 SonicVibes", sizeof(info.name));
+ strncpy(info.id, "SonicVibes", sizeof(info.id));
+ strncpy(info.name, "S3 SonicVibes", sizeof(info.name));
info.modify_counter = s->mix.modcnt;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
@@ -1055,8 +1055,8 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
- strlcpy(info.id, "SonicVibes", sizeof(info.id));
- strlcpy(info.name, "S3 SonicVibes", sizeof(info.name));
+ strncpy(info.id, "SonicVibes", sizeof(info.id));
+ strncpy(info.name, "S3 SonicVibes", 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.5.75/sound/oss/soundcard.c linux-2.5.75-ac1/sound/oss/soundcard.c
--- linux-2.5.75/sound/oss/soundcard.c 2003-07-10 21:09:33.000000000 +0100
+++ linux-2.5.75-ac1/sound/oss/soundcard.c 2003-07-11 16:27:26.000000000 +0100
@@ -289,8 +289,8 @@
{
mixer_info info;

- strlcpy(info.id, mixer_devs[dev]->id, sizeof(info.id));
- strlcpy(info.name, mixer_devs[dev]->name, sizeof(info.name));
+ strncpy(info.id, mixer_devs[dev]->id, sizeof(info.id));
+ strncpy(info.name, mixer_devs[dev]->name, sizeof(info.name));
info.modify_counter = mixer_devs[dev]->modify_counter;
if (__copy_to_user(arg, &info, sizeof(info)))
return -EFAULT;
@@ -301,8 +301,8 @@
{
_old_mixer_info info;

- strlcpy(info.id, mixer_devs[dev]->id, sizeof(info.id));
- strlcpy(info.name, mixer_devs[dev]->name, sizeof(info.name));
+ strncpy(info.id, mixer_devs[dev]->id, sizeof(info.id));
+ strncpy(info.name, mixer_devs[dev]->name, sizeof(info.name));
if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT;
return 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:46    [W:0.023 / U:0.404 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site