diff options
-rw-r--r-- | net/bridge/netfilter/ebtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 15e9575f7207..5fe2ff3b01ef 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
@@ -1368,7 +1368,6 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) | |||
1368 | if (e->bitmask == 0) | 1368 | if (e->bitmask == 0) |
1369 | return 0; | 1369 | return 0; |
1370 | 1370 | ||
1371 | strncpy(name, t->u.target->name, sizeof(name)); | ||
1372 | hlp = ubase + (((char *)e + e->target_offset) - base); | 1371 | hlp = ubase + (((char *)e + e->target_offset) - base); |
1373 | t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); | 1372 | t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); |
1374 | 1373 | ||
@@ -1378,6 +1377,7 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) | |||
1378 | ret = EBT_WATCHER_ITERATE(e, ebt_make_watchername, base, ubase); | 1377 | ret = EBT_WATCHER_ITERATE(e, ebt_make_watchername, base, ubase); |
1379 | if (ret != 0) | 1378 | if (ret != 0) |
1380 | return ret; | 1379 | return ret; |
1380 | strncpy(name, t->u.target->name, sizeof(name)); | ||
1381 | if (copy_to_user(hlp, name, EBT_FUNCTION_MAXNAMELEN)) | 1381 | if (copy_to_user(hlp, name, EBT_FUNCTION_MAXNAMELEN)) |
1382 | return -EFAULT; | 1382 | return -EFAULT; |
1383 | return 0; | 1383 | return 0; |