diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-07-26 21:31:41 +0200 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2021-07-27 10:23:36 +0200 |
| commit | b5b4f44eb30f0271e4df35784fe6c4b125fe349c (patch) | |
| tree | 7a8f699cb0b9f4e12ae063db65bfae6a0ab19994 /ripd | |
| parent | Merge pull request #9166 from idryzhov/vtysh-enable (diff) | |
| download | frr-b5b4f44eb30f0271e4df35784fe6c4b125fe349c.tar.xz frr-b5b4f44eb30f0271e4df35784fe6c4b125fe349c.zip | |
ripd: fix authentication key length
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>
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/ripd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ripd/ripd.c b/ripd/ripd.c index ccd4bf1ba..3d1427c3b 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -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; } |