Explorar o código

oss: strlcpy is smart enough

strlcpy already accounts for the trailing zero in its length
computation, so there is no need to substract one to the buffer size.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jean Delvare %!s(int64=18) %!d(string=hai) anos
pai
achega
880afc4d76
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      sound/oss/btaudio.c

+ 1 - 1
sound/oss/btaudio.c

@@ -344,7 +344,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
 	if (cmd == SOUND_OLD_MIXER_INFO) {
 	if (cmd == SOUND_OLD_MIXER_INFO) {
 		_old_mixer_info info;
 		_old_mixer_info info;
 		memset(&info,0,sizeof(info));
 		memset(&info,0,sizeof(info));
-                strlcpy(info.id,"bt878",sizeof(info.id)-1);
+                strlcpy(info.id, "bt878", sizeof(info.id));
                 strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
                 strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
                         return -EFAULT;