18fd73d348
- arptables-nft-helper: Remove bashisms - ebtables-helper: Drop unused variable, add a missing quote - extensions: libxt_string: Avoid buffer size warning for strncpy() - libxtables: Introduce xtables_strdup() and use it everywhere - extensions: libebt_ip6: Use xtables_ip6parse_any() - iptables-apply: Drop unused variable - nft: Avoid buffer size warnings copying iface names - nft: Avoid memleak in error path of nft_cmd_new() - libxtables: Fix memleak in xtopt_parse_hostmask() - extensions: libebt_ip6: Drop unused variables - libxtables: Drop leftover variable in xtables_numeric_to_ip6addr() Resolves: RHBZ#1938745
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 2b659cc251cd4a6d15e2c5962bb763c8dea48e1a Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Wed, 2 Jun 2021 15:15:37 +0200
|
|
Subject: [PATCH] extensions: libxt_string: Avoid buffer size warning for
|
|
strncpy()
|
|
|
|
If the target buffer does not need to be null-terminated, one may simply
|
|
use memcpy() and thereby avoid any compiler warnings.
|
|
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit 68ed965b35cdc7b55d4ebc0ba37c1ac078ccbafb)
|
|
---
|
|
extensions/libxt_string.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
|
|
index 7c6366cbbf1b3..739a8e7fd66b6 100644
|
|
--- a/extensions/libxt_string.c
|
|
+++ b/extensions/libxt_string.c
|
|
@@ -81,7 +81,7 @@ parse_string(const char *s, struct xt_string_info *info)
|
|
{
|
|
/* xt_string does not need \0 at the end of the pattern */
|
|
if (strlen(s) <= XT_STRING_MAX_PATTERN_SIZE) {
|
|
- strncpy(info->pattern, s, XT_STRING_MAX_PATTERN_SIZE);
|
|
+ memcpy(info->pattern, s, XT_STRING_MAX_PATTERN_SIZE);
|
|
info->patlen = strnlen(s, XT_STRING_MAX_PATTERN_SIZE);
|
|
return;
|
|
}
|
|
--
|
|
2.31.1
|
|
|