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

ripd: 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 19:55:28 +00:00
parent 9825c71ed9
commit 5c84f23817
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ripd/ripd.c
View File

@ -851,7 +851,7 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
MD5_CTX ctx; MD5_CTX ctx;
uint8_t digest[RIP_AUTH_MD5_SIZE]; uint8_t digest[RIP_AUTH_MD5_SIZE];
uint16_t packet_len; uint16_t packet_len;
char auth_str[RIP_AUTH_MD5_SIZE]; char auth_str[RIP_AUTH_MD5_SIZE] = {};
if (IS_RIP_DEBUG_EVENT) if (IS_RIP_DEBUG_EVENT)
zlog_debug("RIPv2 MD5 authentication from %s", zlog_debug("RIPv2 MD5 authentication from %s",
@ -895,8 +895,6 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
/* retrieve authentication data */ /* retrieve authentication data */
md5data = (struct rip_md5_data *)(((uint8_t *)packet) + packet_len); md5data = (struct rip_md5_data *)(((uint8_t *)packet) + packet_len);
memset(auth_str, 0, RIP_AUTH_MD5_SIZE);
if (ri->key_chain) { if (ri->key_chain) {
keychain = keychain_lookup(ri->key_chain); keychain = keychain_lookup(ri->key_chain);
if (keychain == NULL) if (keychain == NULL)
@ -906,9 +904,9 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
if (key == NULL || key->string == NULL) if (key == NULL || key->string == NULL)
return 0; return 0;
strncpy(auth_str, key->string, RIP_AUTH_MD5_SIZE); strlcpy(auth_str, key->string, sizeof(auth_str));
} else if (ri->auth_str) } else if (ri->auth_str)
strncpy(auth_str, ri->auth_str, RIP_AUTH_MD5_SIZE); strlcpy(auth_str, ri->auth_str, sizeof(auth_str));
if (auth_str[0] == 0) if (auth_str[0] == 0)
return 0; return 0;
@ -941,9 +939,9 @@ static void rip_auth_prepare_str_send(struct rip_interface *ri, struct key *key,
memset(auth_str, 0, len); memset(auth_str, 0, len);
if (key && key->string) if (key && key->string)
strncpy(auth_str, key->string, len); strlcpy(auth_str, key->string, len);
else if (ri->auth_str) else if (ri->auth_str)
strncpy(auth_str, ri->auth_str, len); strlcpy(auth_str, ri->auth_str, len);
return; return;
} }
@ -1389,13 +1387,12 @@ static int rip_send_packet(uint8_t *buf, int size, struct sockaddr_in *to,
if (IS_RIP_DEBUG_PACKET) { if (IS_RIP_DEBUG_PACKET) {
#define ADDRESS_SIZE 20 #define ADDRESS_SIZE 20
char dst[ADDRESS_SIZE]; char dst[ADDRESS_SIZE];
dst[ADDRESS_SIZE - 1] = '\0';
if (to) { if (to) {
strncpy(dst, inet_ntoa(to->sin_addr), ADDRESS_SIZE - 1); strlcpy(dst, inet_ntoa(to->sin_addr), sizeof(dst));
} else { } else {
sin.sin_addr.s_addr = htonl(INADDR_RIP_GROUP); sin.sin_addr.s_addr = htonl(INADDR_RIP_GROUP);
strncpy(dst, inet_ntoa(sin.sin_addr), ADDRESS_SIZE - 1); strlcpy(dst, inet_ntoa(sin.sin_addr), sizeof(dst));
} }
#undef ADDRESS_SIZE #undef ADDRESS_SIZE
zlog_debug("rip_send_packet %s > %s (%s)", zlog_debug("rip_send_packet %s > %s (%s)",
@ -2100,8 +2097,7 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
key = key_lookup_for_send(keychain); key = key_lookup_for_send(keychain);
} }
/* to be passed to auth functions later */ /* to be passed to auth functions later */
rip_auth_prepare_str_send(ri, key, auth_str, rip_auth_prepare_str_send(ri, key, auth_str, sizeof(auth_str));
RIP_AUTH_SIMPLE_SIZE);
if (strlen(auth_str) == 0) if (strlen(auth_str) == 0)
return; return;
} }