Skip to contentSkip to conversation

bridge: netfilter: using strlcpy() instead of strncpy()

PATCH Applied Chen Gang 3 participants 5 messages May 17, 2013 – May 23, 2013

Subsystems (4)
lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 bridge: netfilter: using strlcpy() instead of strncpy()

'name' has already set all zero when it is defined, so not need let strncpy() to pad it again.

'name' is a string, better always let is NUL terminated, so use strlcpy() instead of strncpy().

---
 net/bridge/netfilter/ebtables.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
net/bridge/netfilter/ebtables.c +3 -3
index 3d110c4..ac78024 100644
@@ -1339,7 +1339,7 @@ static inline int ebt_make_matchname(const struct ebt_entry_match *m,
 
 	/* ebtables expects 32 bytes long names but xt_match names are 29 bytes
 	   long. Copy 29 bytes and fill remaining bytes with zeroes. */
-	strncpy(name, m->u.match->name, sizeof(name));
+	strlcpy(name, m->u.match->name, sizeof(name));
 	if (copy_to_user(hlp, name, EBT_FUNCTION_MAXNAMELEN))
 		return -EFAULT;
 	return 0;
@@ -1351,7 +1351,7 @@ static inline int ebt_make_watchername(const struct ebt_entry_watcher *w,
 	char __user *hlp = ubase + ((char *)w - base);
 	char name[EBT_FUNCTION_MAXNAMELEN] = {};
 
-	strncpy(name, w->u.watcher->name, sizeof(name));
+	strlcpy(name, w->u.watcher->name, sizeof(name));
 	if (copy_to_user(hlp , name, EBT_FUNCTION_MAXNAMELEN))
 		return -EFAULT;
 	return 0;
@@ -1377,7 +1377,7 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase)
 	ret = EBT_WATCHER_ITERATE(e, ebt_make_watchername, base, ubase);
 	if (ret != 0)
 		return ret;
-	strncpy(name, t->u.target->name, sizeof(name));
+	strlcpy(name, t->u.target->name, sizeof(name));
 	if (copy_to_user(hlp, name, EBT_FUNCTION_MAXNAMELEN))
 		return -EFAULT;
 	return 0;
Signature · 1 line
1.7.7.6
author
#2 lore raw
Quoted 11 lines · Bart De Schuymer

Op 17/05/2013 10:07, Chen Gang schreef:

Quoted 9 lines

'name' has already set all zero when it is defined, so not need let strncpy() to pad it again.

'name' is a string, better always let is NUL terminated, so use strlcpy() instead of strncpy().

Thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation
maintainer Applied
#3 lore raw
In reply to Chen Gang
Quoted 6 lines · Chen Gang

'name' has already set all zero when it is defined, so not need let strncpy() to pad it again.

'name' is a string, better always let is NUL terminated, so use strlcpy() instead of strncpy().

Applied, thanks.

author
#4 lore raw
Quoted 10 lines · Pablo Neira Ayuso
Quoted 6 lines · Chen Gang
Quoted 6 lines

'name' has already set all zero when it is defined, so not need let strncpy() to pad it again.

'name' is a string, better always let is NUL terminated, so use strlcpy() instead of strncpy().

Applied, thanks.

Thank you too.

Signature · 3 lines
Chen Gang

Asianux Corporation