Skip to contentSkip to conversation

binfmt_elf: remove redundant zero fill

PATCH New Németh Márton 1 participant 1 message Nov 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/4 binfmt_elf: remove redundant zero fill

From: Márton Németh <[email protected]>

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 .

---

fs/binfmt_elf.c 2009-11-21 22:12:15.000000000 +0100 renamed from fs/binfmt_elf.c 2009-11-14 07:06:49.000000000 +0100 +1 -1
diff -u -p a/fs/binfmt_elf.c b/fs/binfmt_elf.c
@@ -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;
 }
fs/binfmt_elf_fdpic.c 2009-11-21 22:14:43.000000000 +0100 renamed from fs/binfmt_elf_fdpic.c 2009-11-14 07:06:49.000000000 +0100 +1 -1
diff -u -p a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
@@ -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;
 }