Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 880afc4d authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6192bd53

sound/oss/btaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, 
	if (cmd == SOUND_OLD_MIXER_INFO) {

		_old_mixer_info 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));

                if (copy_to_user(argp, &info, sizeof(info)))

                        return -EFAULT;