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

Merge pull request #2766 from lyq140/branch1

Browse Source 
ripd: null check key
This commit is contained in:
Donald Sharp 2018-08-01 10:42:52 -04:00 committed by GitHub
commit 037f162fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/keychain.c
View File

@ -172,7 +172,7 @@ struct key *key_match_for_accept(const struct keychain *keychain,
if (key->accept.start == 0 if (key->accept.start == 0
|| (key->accept.start <= now || (key->accept.start <= now
&& (key->accept.end >= now || key->accept.end == -1))) && (key->accept.end >= now || key->accept.end == -1)))
if (strncmp(key->string, auth_str, 16) == 0) if (key->string && (strncmp(key->string, auth_str, 16) == 0))
return key; return key;
} }
return NULL; return NULL;

2
ripd/ripd.c
View File

@ -828,7 +828,7 @@ static int rip_auth_simple_password(struct rte *rte, struct sockaddr_in *from,
struct key *key; struct key *key;
keychain = keychain_lookup(ri->key_chain); keychain = keychain_lookup(ri->key_chain);
if (keychain == NULL) if (keychain == NULL || keychain->key == NULL)
return 0; return 0;
key = key_match_for_accept(keychain, auth_str); key = key_match_for_accept(keychain, auth_str);