The patch titled oss: strlcpy is smart enough has been added to the -mm tree. Its filename is oss-strlcpy-is-smart-enough.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: oss: strlcpy is smart enough From: Jean Delvare <khali@xxxxxxxxxxxx> 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@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- sound/oss/btaudio.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN sound/oss/btaudio.c~oss-strlcpy-is-smart-enough sound/oss/btaudio.c --- a/sound/oss/btaudio.c~oss-strlcpy-is-smart-enough +++ a/sound/oss/btaudio.c @@ -344,7 +344,7 @@ static int btaudio_mixer_ioctl(struct in 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; _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are origin.patch git-dvb.patch scatterlisth-needs-typesh.patch cleanup-the-includes-of-linux-pcih.patch s390-strlcpy-is-smart-enough.patch sound-strlcpy-is-smart-enough.patch oss-strlcpy-is-smart-enough.patch xtensa-strlcpy-is-smart-enough.patch ehea-strlcpy-is-smart-enough.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html