From: Márton Németh <nm127@xxxxxxxxxxx> The buffer is first zeroed out by memset(). Then strncpy() is used to fill the content. The strncpy() function also pads the string till the end of the specified length, which is redundant. The strncpy() does not ensures that the string will be properly closed with 0. Use strlcpy() instead. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression buffer; expression size; expression str; @@ memset(buffer, 0, size); ... - strncpy( + strlcpy( buffer, str, sizeof(buffer) ); @@ expression buffer; expression size; expression str; @@ memset(&buffer, 0, size); ... - strncpy( + strlcpy( &buffer, str, sizeof(buffer)); @@ expression buffer; identifier field; expression size; expression str; @@ memset(buffer, 0, size); ... - strncpy( + strlcpy( buffer->field, str, sizeof(buffer->field) ); @@ expression buffer; identifier field; expression size; expression str; @@ memset(&buffer, 0, size); ... - strncpy( + strlcpy( buffer.field, str, sizeof(buffer.field)); // </smpl> On strncpy() vs strlcpy() see http://www.gratisoft.us/todd/papers/strlcpy.html . Signed-off-by: Márton Németh <nm127@xxxxxxxxxxx> --- diff -u -p a/fs/binfmt_elf.c b/fs/binfmt_elf.c --- a/fs/binfmt_elf.c 2009-11-14 07:06:49.000000000 +0100 +++ b/fs/binfmt_elf.c 2009-11-21 22:12:15.000000000 +0100 @@ -1399,7 +1399,7 @@ static int fill_psinfo(struct elf_prpsin SET_UID(psinfo->pr_uid, cred->uid); SET_GID(psinfo->pr_gid, cred->gid); rcu_read_unlock(); - strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname)); + strlcpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname)); return 0; } diff -u -p a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c --- a/fs/binfmt_elf_fdpic.c 2009-11-14 07:06:49.000000000 +0100 +++ b/fs/binfmt_elf_fdpic.c 2009-11-21 22:14:43.000000000 +0100 @@ -1452,7 +1452,7 @@ static int fill_psinfo(struct elf_prpsin SET_UID(psinfo->pr_uid, cred->uid); SET_GID(psinfo->pr_gid, cred->gid); rcu_read_unlock(); - strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname)); + strlcpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname)); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
