diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/conntrack/copy.c | 4 | ||||
| -rw-r--r-- | src/conntrack/parse.c | 4 | ||||
| -rw-r--r-- | src/conntrack/setter.c | 4 | ||||
| -rw-r--r-- | src/expect/setter.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/conntrack/copy.c b/src/conntrack/copy.c index c3a4fcc..cdce0de 100644 --- a/src/conntrack/copy.c +++ b/src/conntrack/copy.c @@ -405,8 +405,8 @@ static void copy_attr_repl_off_aft(struct nf_conntrack *dest, static void copy_attr_helper_name(struct nf_conntrack *dest, const struct nf_conntrack *orig) { - strncpy(dest->helper_name, orig->helper_name, __NFCT_HELPER_NAMELEN); - dest->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + strncpy(dest->helper_name, orig->helper_name, NFCT_HELPER_NAME_MAX); + dest->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; } static void copy_attr_zone(struct nf_conntrack *dest, diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index 8f8a01c..ee3074d 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -417,8 +417,8 @@ __parse_helper(const struct nfattr *attr, struct nf_conntrack *ct) strncpy(ct->helper_name, NFA_DATA(tb[CTA_HELP_NAME-1]), - __NFCT_HELPER_NAMELEN); - ct->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + NFCT_HELPER_NAME_MAX); + ct->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; set_bit(ATTR_HELPER_NAME, ct->set); } diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c index 3282035..df06b04 100644 --- a/src/conntrack/setter.c +++ b/src/conntrack/setter.c @@ -310,8 +310,8 @@ static void set_attr_repl_off_aft(struct nf_conntrack *ct, const void *value) static void set_attr_helper_name(struct nf_conntrack *ct, const void *value) { - strncpy(ct->helper_name, value, __NFCT_HELPER_NAMELEN); - ct->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + strncpy(ct->helper_name, value, NFCT_HELPER_NAME_MAX); + ct->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; } static void set_attr_dccp_state(struct nf_conntrack *ct, const void *value) diff --git a/src/expect/setter.c b/src/expect/setter.c index 3cde4b0..08b3547 100644 --- a/src/expect/setter.c +++ b/src/expect/setter.c @@ -39,8 +39,8 @@ static void set_exp_attr_flags(struct nf_expect *exp, const void *value) static void set_exp_attr_helper_name(struct nf_expect *exp, const void *value) { - strncpy(exp->helper_name, value, __NFCT_HELPER_NAMELEN); - exp->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + strncpy(exp->helper_name, value, NFCT_HELPER_NAME_MAX); + exp->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; } const set_exp_attr set_exp_attr_array[ATTR_EXP_MAX] = { |