summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-05-20 23:56:32 +0200
committerFlorian Westphal <fw@strlen.de>2018-05-20 23:56:32 +0200
commit14ec9984811a1c5d39010ebbd3ff171fd8f51652 (patch)
tree28d6bbb4cecfc43388aaf2ae25323da613902b65 /iptables
parent5e2b473a64bc772a5fb08d121fbfd969ca652bec (diff)
xtables-compat: ebtables: prefer snprintf to strncpy
gcc emits these warnings: xtables-eb-translate.c:185:2: warning: ‘strncpy’ specified bound 29 equals destination size [-Wstringop-truncation] strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/xtables-eb-translate.c3
-rw-r--r--iptables/xtables-eb.c7
2 files changed, 6 insertions, 4 deletions
diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c
index e54415a2..d274151a 100644
--- a/iptables/xtables-eb-translate.c
+++ b/iptables/xtables-eb-translate.c
@@ -182,7 +182,8 @@ static struct xtables_target *command_jump(struct iptables_command_state *cs,
target->t = xtables_calloc(1, size);
target->t->u.target_size = size;
- strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name));
+ snprintf(target->t->u.user.name,
+ sizeof(target->t->u.user.name), "%s", jumpto);
target->t->u.user.name[sizeof(target->t->u.user.name)-1] = '\0';
target->t->u.user.revision = target->revision;
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index ba26aca1..8708bea3 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -397,7 +397,8 @@ static struct xtables_target *command_jump(struct iptables_command_state *cs,
target->t = xtables_calloc(1, size);
target->t->u.target_size = size;
- strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name));
+ snprintf(target->t->u.user.name,
+ sizeof(target->t->u.user.name), "%s", jumpto);
target->t->u.user.name[sizeof(target->t->u.user.name)-1] = '\0';
target->t->u.user.revision = target->revision;
@@ -637,8 +638,8 @@ static void __ebt_load_watcher(const char *name, const char *typename)
watcher->t = xtables_calloc(1, size);
watcher->t->u.target_size = size;
- strncpy(watcher->t->u.user.name, name,
- sizeof(watcher->t->u.user.name));
+ snprintf(watcher->t->u.user.name,
+ sizeof(watcher->t->u.user.name), "%s", name);
watcher->t->u.user.name[sizeof(watcher->t->u.user.name)-1] = '\0';
watcher->t->u.user.revision = watcher->revision;