From: Vitaly Chikunov <vt@altlinux.org>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
Florian Westphal <fw@strlen.de>,
netfilter-devel@vger.kernel.org
Cc: Vitaly Chikunov <vt@altlinux.org>,
Jan Engelhardt <jengelh@inai.de>,
Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Subject: [PATCH iptables] libxtables: Fix xtables_ipaddr_to_numeric calls with xtables_ipmask_to_numeric
Date: Sat, 23 Mar 2024 06:06:41 +0300 [thread overview]
Message-ID: <20240323030641.988354-1-vt@altlinux.org> (raw)
Frequently when addr/mask is printed xtables_ipaddr_to_numeric and
xtables_ipmask_to_numeric are called together in one printf call but
xtables_ipmask_to_numeric internally calls xtables_ipaddr_to_numeric
which prints into the same static buffer causing buffer to be
overwritten and addr/mask incorrectly printed in such call scenarios.
Make xtables_ipaddr_to_numeric to use two static buffers rotating their
use. This simplistic approach will leave ABI not changed and cover all
such use cases.
Interestingly, testing stumbled over this only on non-x86 architectures.
Error message:
extensions/libebt_arp.t: ERROR: line 11 (cannot find: ebtables -I INPUT -p ARP --arp-ip-src ! 1.2.3.4/255.0.255.255)
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Cc: Jan Engelhardt <jengelh@inai.de>
Cc: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
---
libxtables/xtables.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 748a50fc..16a0640d 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -1505,7 +1505,9 @@ void xtables_param_act(unsigned int status, const char *p1, ...)
const char *xtables_ipaddr_to_numeric(const struct in_addr *addrp)
{
- static char buf[16];
+ static char abuf[2][16];
+ static int bufnum = 0;
+ char *buf = abuf[++bufnum & 1];
const unsigned char *bytep = (const void *)&addrp->s_addr;
sprintf(buf, "%u.%u.%u.%u", bytep[0], bytep[1], bytep[2], bytep[3]);
--
2.42.1
next reply other threads:[~2024-03-23 3:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 3:06 Vitaly Chikunov [this message]
2024-03-23 9:17 ` [PATCH iptables] libxtables: Fix xtables_ipaddr_to_numeric calls with xtables_ipmask_to_numeric Vitaly Chikunov
2024-03-23 13:56 ` Phil Sutter
2024-03-23 21:37 ` Vitaly Chikunov
2024-03-24 13:50 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240323030641.988354-1-vt@altlinux.org \
--to=vt@altlinux.org \
--cc=fw@strlen.de \
--cc=glebfm@altlinux.org \
--cc=jengelh@inai.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).