[PATCH] more wrong strlcpy's

diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 94486ec02a4e81284e3324d80f18febd1e6b6ec8..afa3fcc7985ec9a89bace7f209ae370160bfc935 100644 (file)
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -1046,8 +1046,8 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg)
        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 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg)
        }
        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 --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 087f1af7c7e5099b36888a5d432842abbc372b98..f808701b514ed56a10c1b02877dd2048a10c3c6e 100644 (file)
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -289,8 +289,8 @@ static int get_mixer_info(int dev, caddr_t arg)
 {
        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 @@ static int get_old_mixer_info(int dev, caddr_t arg)
 {
        _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;