matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ripd: fix authentication key length

Browse source 
We were overwriting the last byte of the key when it's exactly 16 bytes.

Fixes #8151.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-07-26 22:31:41 +03:00
parent 53d7080980
commit b5b4f44eb3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ripd/ripd.c
View file

@ -920,9 +920,11 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
if (key == NULL || key->string == NULL)
return 0;
strlcpy(auth_str, key->string, sizeof(auth_str));
memcpy(auth_str, key->string,
MIN(sizeof(auth_str), strlen(key->string)));
} else if (ri->auth_str)
strlcpy(auth_str, ri->auth_str, sizeof(auth_str));
memcpy(auth_str, ri->auth_str,
MIN(sizeof(auth_str), strlen(ri->auth_str)));
if (auth_str[0] == 0)
return 0;
@ -965,9 +967,11 @@ static void rip_auth_prepare_str_send(struct rip_interface *ri, struct key *key,
memset(auth_str, 0, len);
if (key && key->string)
strlcpy(auth_str, key->string, len);
memcpy(auth_str, key->string,
MIN((size_t)len, strlen(key->string)));
else if (ri->auth_str)
strlcpy(auth_str, ri->auth_str, len);
memcpy(auth_str, ri->auth_str,
MIN((size_t)len, strlen(ri->auth_str)));
return;
}