proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-04 06:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: strncpy -> strlcpy

Browse Source 
strncpy is a byte copy function not a string copy function

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-02-26 20:34:39 +00:00
parent eb266ecb84
commit 4d65d9278e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ospfd/ospf_dump.c
View File

@ -538,8 +538,7 @@ static void ospf_header_dump(struct ospf_header *ospfh)
case OSPF_AUTH_NULL: case OSPF_AUTH_NULL:
break; break;
case OSPF_AUTH_SIMPLE: case OSPF_AUTH_SIMPLE:
memset(buf, 0, 9); strlcpy(buf, (char *)ospfh->u.auth_data, sizeof(buf));
strncpy(buf, (char *)ospfh->u.auth_data, 8);
zlog_debug(" Simple Password %s", buf); zlog_debug(" Simple Password %s", buf);
break; break;
case OSPF_AUTH_CRYPTOGRAPHIC: case OSPF_AUTH_CRYPTOGRAPHIC:

23
ospfd/ospf_vty.c
View File

@ -954,8 +954,9 @@ static int ospf_vl_set_security(struct ospf_vl_data *vl_data,
if (vl_config->auth_key) { if (vl_config->auth_key) {
memset(IF_DEF_PARAMS(ifp)->auth_simple, 0, memset(IF_DEF_PARAMS(ifp)->auth_simple, 0,
OSPF_AUTH_SIMPLE_SIZE + 1); OSPF_AUTH_SIMPLE_SIZE + 1);
strncpy((char *)IF_DEF_PARAMS(ifp)->auth_simple, strlcpy((char *)IF_DEF_PARAMS(ifp)->auth_simple,
vl_config->auth_key, OSPF_AUTH_SIMPLE_SIZE); vl_config->auth_key,
sizeof(IF_DEF_PARAMS(ifp)->auth_simple));
} else if (vl_config->md5_key) { } else if (vl_config->md5_key) {
if (ospf_crypt_key_lookup(IF_DEF_PARAMS(ifp)->auth_crypt, if (ospf_crypt_key_lookup(IF_DEF_PARAMS(ifp)->auth_crypt,
vl_config->crypto_key_id) vl_config->crypto_key_id)
@ -967,8 +968,8 @@ static int ospf_vl_set_security(struct ospf_vl_data *vl_data,
ck = ospf_crypt_key_new(); ck = ospf_crypt_key_new();
ck->key_id = vl_config->crypto_key_id; ck->key_id = vl_config->crypto_key_id;
memset(ck->auth_key, 0, OSPF_AUTH_MD5_SIZE + 1); memset(ck->auth_key, 0, OSPF_AUTH_MD5_SIZE + 1);
strncpy((char *)ck->auth_key, vl_config->md5_key, strlcpy((char *)ck->auth_key, vl_config->md5_key,
OSPF_AUTH_MD5_SIZE); sizeof(ck->auth_key));
ospf_crypt_key_add(IF_DEF_PARAMS(ifp)->auth_crypt, ck); ospf_crypt_key_add(IF_DEF_PARAMS(ifp)->auth_crypt, ck);
} else if (vl_config->crypto_key_id != 0) { } else if (vl_config->crypto_key_id != 0) {
@ -1147,14 +1148,12 @@ DEFUN (ospf_area_vlink,
if (vl_config.crypto_key_id < 0) if (vl_config.crypto_key_id < 0)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
memset(md5_key, 0, OSPF_AUTH_MD5_SIZE + 1); strlcpy(md5_key, argv[idx + 3]->arg, sizeof(md5_key));
strncpy(md5_key, argv[idx + 3]->arg, OSPF_AUTH_MD5_SIZE);
vl_config.md5_key = md5_key; vl_config.md5_key = md5_key;
} }
if (argv_find(argv, argc, "authentication-key", &idx)) { if (argv_find(argv, argc, "authentication-key", &idx)) {
memset(auth_key, 0, OSPF_AUTH_SIMPLE_SIZE + 1); strlcpy(auth_key, argv[idx + 1]->arg, sizeof(auth_key));
strncpy(auth_key, argv[idx + 1]->arg, OSPF_AUTH_SIMPLE_SIZE);
vl_config.auth_key = auth_key; vl_config.auth_key = auth_key;
} }
@ -6895,9 +6894,8 @@ DEFUN (ip_ospf_authentication_key,
ospf_if_update_params(ifp, addr); ospf_if_update_params(ifp, addr);
} }
memset(params->auth_simple, 0, OSPF_AUTH_SIMPLE_SIZE + 1); strlcpy((char *)params->auth_simple, argv[3]->arg,
strncpy((char *)params->auth_simple, argv[3]->arg, sizeof(params->auth_simple));
OSPF_AUTH_SIMPLE_SIZE);
SET_IF_PARAM(params, auth_simple); SET_IF_PARAM(params, auth_simple);
return CMD_SUCCESS; return CMD_SUCCESS;
@ -7006,8 +7004,7 @@ DEFUN (ip_ospf_message_digest_key,
ck = ospf_crypt_key_new(); ck = ospf_crypt_key_new();
ck->key_id = (uint8_t)key_id; ck->key_id = (uint8_t)key_id;
memset(ck->auth_key, 0, OSPF_AUTH_MD5_SIZE + 1); strlcpy((char *)ck->auth_key, cryptkey, sizeof(ck->auth_key));
strncpy((char *)ck->auth_key, cryptkey, OSPF_AUTH_MD5_SIZE);
ospf_crypt_key_add(params->auth_crypt, ck); ospf_crypt_key_add(params->auth_crypt, ck);
SET_IF_PARAM(params, auth_crypt); SET_IF_PARAM(params, auth_crypt);