anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-11 15:14:57 +02:00
Code Issues Releases Wiki Activity

pknock: use sizeof() where meaningful

Browse Source
This commit is contained in:
Jan Engelhardt
2009-10-03 13:33:51 +02:00
parent 00199427ac
commit e05a4d9586
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/libxt_pknock.c
View File

@@ -150,8 +150,8 @@ __pknock_parse(int c, char **argv, int invert, unsigned int *flags,
xtables_check_inverse(argv[optind-1], &invert, &optind, 0); xtables_check_inverse(argv[optind-1], &invert, &optind, 0);
memset(info->rule_name, 0, XT_PKNOCK_MAX_BUF_LEN + 1); memset(info->rule_name, 0, sizeof(info->rule_name));
strncpy(info->rule_name, optarg, XT_PKNOCK_MAX_BUF_LEN); strncpy(info->rule_name, optarg, sizeof(info->rule_name) - 1);
info->rule_name_len = strlen(info->rule_name); info->rule_name_len = strlen(info->rule_name);
info->option |= XT_PKNOCK_NAME; info->option |= XT_PKNOCK_NAME;
@@ -168,8 +168,8 @@ __pknock_parse(int c, char **argv, int invert, unsigned int *flags,
xtables_check_inverse(argv[optind-1], &invert, &optind, 0); xtables_check_inverse(argv[optind-1], &invert, &optind, 0);
memset(info->open_secret, 0, XT_PKNOCK_MAX_PASSWD_LEN + 1); memset(info->open_secret, 0, sizeof(info->open_secret));
strncpy(info->open_secret, optarg, XT_PKNOCK_MAX_PASSWD_LEN); strncpy(info->open_secret, optarg, sizeof(info->open_secret) - 1);
info->open_secret_len = strlen(info->open_secret); info->open_secret_len = strlen(info->open_secret);
info->option |= XT_PKNOCK_OPENSECRET; info->option |= XT_PKNOCK_OPENSECRET;
@@ -183,8 +183,8 @@ __pknock_parse(int c, char **argv, int invert, unsigned int *flags,
xtables_check_inverse(argv[optind-1], &invert, &optind, 0); xtables_check_inverse(argv[optind-1], &invert, &optind, 0);
memset(info->close_secret, 0, XT_PKNOCK_MAX_PASSWD_LEN + 1); memset(info->close_secret, 0, sizeof(info->close_secret));
strncpy(info->close_secret, optarg, XT_PKNOCK_MAX_PASSWD_LEN); strncpy(info->close_secret, optarg, sizeof(info->close_secret) - 1);
info->close_secret_len = strlen(info->close_secret); info->close_secret_len = strlen(info->close_secret);
info->option |= XT_PKNOCK_CLOSESECRET; info->option |= XT_PKNOCK_CLOSESECRET;

7
extensions/xt_pknock.c
View File

@@ -452,7 +452,7 @@ add_rule(struct xt_pknock_mtinfo *info)
INIT_LIST_HEAD(&rule->head); INIT_LIST_HEAD(&rule->head);
memset(rule->rule_name, 0, XT_PKNOCK_MAX_BUF_LEN + 1); memset(rule->rule_name, 0, sizeof(rule->rule_name));
strncpy(rule->rule_name, info->rule_name, info->rule_name_len); strncpy(rule->rule_name, info->rule_name, info->rule_name_len);
rule->rule_name_len = info->rule_name_len; rule->rule_name_len = info->rule_name_len;
@@ -769,7 +769,7 @@ has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc,
return false; return false;
} }
memset(result, 0, 64); memset(result, 0, sizeof(result));
memset(hexresult, 0, hexa_size); memset(hexresult, 0, hexa_size);
epoch_min = get_epoch_minute(); epoch_min = get_epoch_minute();
@@ -788,7 +788,8 @@ has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc,
* 4 bytes IP (32 bits) + * 4 bytes IP (32 bits) +
* 4 bytes int epoch_min (32 bits) * 4 bytes int epoch_min (32 bits)
*/ */
ret = crypto_hash_digest(&crypto.desc, sg, 8, result); ret = crypto_hash_digest(&crypto.desc, sg,
sizeof(ipsrc) + sizeof(epoch_min), result);
if (ret != 0) { if (ret != 0) {
printk("crypto_hash_digest() failed ret=%d\n", ret); printk("crypto_hash_digest() failed ret=%d\n", ret);
goto out; goto out;