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(). Signed-off-by: Chen Gang <gang.chen@asianux.com> Acked-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
00028aa370
commit
8bc14d25ff
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue