From: hyunuktak Date: Mon, 5 Feb 2018 05:11:06 +0000 (+0900) Subject: Fixed some svace issues X-Git-Tag: submit/tizen/20180221.115722~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4ee87ed22f8188f66dce7334a50c452d2e92bd5;p=platform%2Fcore%2Fconnectivity%2Fstc-iptables.git Fixed some svace issues WGID : 304870, 304871, 304872, 304873, 304882, 304888, 304889, 304936,304939, 304940 Change-Id: I0be8a2756b7387925543aacc43a71b9226eb4f72 Signed-off-by: hyunuktak --- diff --git a/packaging/stc-iptables.spec b/packaging/stc-iptables.spec index ae3d02d..5c8d1be 100644 --- a/packaging/stc-iptables.spec +++ b/packaging/stc-iptables.spec @@ -1,6 +1,6 @@ Name: stc-iptables Summary: STC(Smart Traffic Control) iptables -Version: 0.0.11 +Version: 0.0.12 Release: 0 Group: Network & Connectivity/Other License: GPL-2.0+ diff --git a/src/helper/helper-ip6tables.c b/src/helper/helper-ip6tables.c index 341d332..8a12e23 100755 --- a/src/helper/helper-ip6tables.c +++ b/src/helper/helper-ip6tables.c @@ -55,7 +55,7 @@ static unsigned int __add_match(const char *name, ip6t_entry_match_t *start, siz match->u.match_size = IP6T_ALIGN(sizeof(ip6t_entry_match_t)) + IP6T_ALIGN(size); - strncpy(match->u.user.name, name, sizeof(match->u.user.name)); + g_strlcpy(match->u.user.name, name, XT_EXTENSION_MAXNAMELEN); memcpy(match->data, data, size); return match->u.match_size; @@ -76,7 +76,7 @@ static unsigned int __add_nfacct_match(const char *nfacct_name, ip6t_entry_match /* nfacct => "--nfacct_name " */ ip6t_nfacct_info_t nfacct; memset(&nfacct, 0, sizeof(ip6t_nfacct_info_t)); - strncpy(nfacct.name, nfacct_name, sizeof(nfacct.name)); + g_strlcpy(nfacct.name, nfacct_name, NFACCT_NAME_MAX); /* match_nfacct => "-m nfacct" */ return __add_match(IP6TC_NFACCT, start, sizeof(ip6t_nfacct_info_t), &nfacct); } @@ -105,12 +105,12 @@ static int __create_entry_data(unsigned char *entry, unsigned char *mask, switch (rule->type) { case IP6TABLES_RULE_IN: /* entry => "-i wlan0" */ - strncpy(e->ipv6.iniface, rule->ifname, IFNAMSIZ); + g_strlcpy(e->ipv6.iniface, rule->ifname, IFNAMSIZ); memset(&(e->ipv6.iniface_mask), 0xFF, IFNAMSIZ); break; case IP6TABLES_RULE_OUT: /* entry => "-o wlan0" */ - strncpy(e->ipv6.outiface, rule->ifname, IFNAMSIZ); + g_strlcpy(e->ipv6.outiface, rule->ifname, IFNAMSIZ); memset(&(e->ipv6.outiface_mask), 0xFF, IFNAMSIZ); break; default: @@ -137,7 +137,7 @@ static int __create_entry_data(unsigned char *entry, unsigned char *mask, target = (ip6t_entry_target_t *) (e->elems + size_match); target->u.target_size = SIZE_TARGET; if (rule->target) { - strncpy(target->u.user.name, rule->target, sizeof(target->u.user.name)); + g_strlcpy(target->u.user.name, rule->target, XT_EXTENSION_MAXNAMELEN); e->next_offset += SIZE_TARGET; } diff --git a/src/helper/helper-iptables.c b/src/helper/helper-iptables.c index d07df88..1119b3c 100755 --- a/src/helper/helper-iptables.c +++ b/src/helper/helper-iptables.c @@ -55,7 +55,7 @@ static unsigned int __add_match(const char *name, ipt_entry_match_t *start, size match->u.match_size = IPT_ALIGN(sizeof(ipt_entry_match_t)) + IPT_ALIGN(size); - strncpy(match->u.user.name, name, sizeof(match->u.user.name)); + g_strlcpy(match->u.user.name, name, XT_EXTENSION_MAXNAMELEN); memcpy(match->data, data, size); return match->u.match_size; @@ -76,7 +76,7 @@ static unsigned int __add_nfacct_match(const char *nfacct_name, ipt_entry_match_ /* nfacct => "--nfacct_name " */ ipt_nfacct_info_t nfacct; memset(&nfacct, 0, sizeof(ipt_nfacct_info_t)); - strncpy(nfacct.name, nfacct_name, sizeof(nfacct.name)); + g_strlcpy(nfacct.name, nfacct_name, NFACCT_NAME_MAX); /* match_nfacct => "-m nfacct" */ return __add_match(IPTC_NFACCT, start, sizeof(ipt_nfacct_info_t), &nfacct); } @@ -105,12 +105,12 @@ static int __create_entry_data(unsigned char *entry, unsigned char *mask, switch (rule->type) { case IPTABLES_RULE_IN: /* entry => "-i wlan0 */ - strncpy(e->ip.iniface, rule->ifname, IFNAMSIZ); + g_strlcpy(e->ip.iniface, rule->ifname, IFNAMSIZ); memset(&(e->ip.iniface_mask), 0xFF, IFNAMSIZ); break; case IPTABLES_RULE_OUT: /* entry => "-o wlan0 */ - strncpy(e->ip.outiface, rule->ifname, IFNAMSIZ); + g_strlcpy(e->ip.outiface, rule->ifname, IFNAMSIZ); memset(&(e->ip.outiface_mask), 0xFF, IFNAMSIZ); break; default: @@ -137,7 +137,7 @@ static int __create_entry_data(unsigned char *entry, unsigned char *mask, target = (ipt_entry_target_t *) (e->elems + size_match); target->u.target_size = SIZE_TARGET; if (rule->target) { - strncpy(target->u.user.name, rule->target, sizeof(target->u.user.name)); + g_strlcpy(target->u.user.name, rule->target, XT_EXTENSION_MAXNAMELEN); e->next_offset += SIZE_TARGET; }