diff options
| author | Giuseppe Longo <giuseppelng@gmail.com> | 2013-10-12 11:21:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-12-30 23:50:52 +0100 |
| commit | 0cfd537e8020812ef02ce0e27b8b22a94d3820c3 (patch) | |
| tree | 7fdef5b897f287c2178d7861d7bf08389a4dda18 /iptables/nft-arp.c | |
| parent | 28dcf16384b223f9890567bd89056864a7e3c85d (diff) | |
nft: arp: fix possible string overflow
This patch replaces strcat with strncat and strcpy with strncpy
fixing possible string overflow.
Based on the original patch:
http://patchwork.ozlabs.org/patch/279672/
from Jaromír Končický via Jiri Popelka.
Signed-off-by: Giuseppe Longo <giuseppelng@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/nft-arp.c')
| -rw-r--r-- | iptables/nft-arp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 08f88145..17101369 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -459,7 +459,8 @@ nft_arp_print_firewall(struct nft_rule *r, unsigned int num, sprintf(buf, "%s", addr_to_dotted(&(fw.arp.src))); else sprintf(buf, "%s", addr_to_anyname(&(fw.arp.src))); - strcat(buf, mask_to_dotted(&(fw.arp.smsk))); + strncat(buf, mask_to_dotted(&(fw.arp.smsk)), + sizeof(buf) - strlen(buf) - 1); printf("-s %s ", buf); } @@ -483,7 +484,8 @@ after_devsrc: sprintf(buf, "%s", addr_to_dotted(&(fw.arp.tgt))); else sprintf(buf, "%s", addr_to_anyname(&(fw.arp.tgt))); - strcat(buf, mask_to_dotted(&(fw.arp.tmsk))); + strncat(buf, mask_to_dotted(&(fw.arp.tmsk)), + sizeof(buf) - strlen(buf) - 1); printf("-d %s ", buf); } |