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

lib: fix BFD crash on interface removal

Browse Source 
- Handle badly formatted messages (don't set `ifp` in that case)
- Handle unread messages (e.g. when family is not don't trigger `assert`)

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2021-04-14 15:28:09 -03:00
parent 1ff339ac05
commit 9c39d19742
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/bfd.c
View File

@ -237,7 +237,7 @@ struct interface *bfd_get_peer_info(struct stream *s, struct prefix *dp,
memset(sp, 0, sizeof(*sp)); memset(sp, 0, sizeof(*sp));
/* Get interface index. */ /* Get interface index. */
ifindex = stream_getl(s); STREAM_GETL(s, ifindex);
/* Lookup index. */ /* Lookup index. */
if (ifindex != 0) { if (ifindex != 0) {
@ -252,25 +252,28 @@ struct interface *bfd_get_peer_info(struct stream *s, struct prefix *dp,
} }
/* Fetch destination address. */ /* Fetch destination address. */
dp->family = stream_getc(s); STREAM_GETC(s, dp->family);
plen = prefix_blen(dp); plen = prefix_blen(dp);
stream_get(&dp->u.prefix, s, plen); STREAM_GET(&dp->u.prefix, s, plen);
dp->prefixlen = stream_getc(s); STREAM_GETC(s, dp->prefixlen);
/* Get BFD status. */ /* Get BFD status. */
*status = stream_getl(s); STREAM_GETL(s, (*status));
sp->family = stream_getc(s); STREAM_GETC(s, sp->family);
plen = prefix_blen(sp); plen = prefix_blen(sp);
stream_get(&sp->u.prefix, s, plen); STREAM_GET(&sp->u.prefix, s, plen);
sp->prefixlen = stream_getc(s); STREAM_GETC(s, sp->prefixlen);
local_remote_cbit = stream_getc(s); STREAM_GETC(s, local_remote_cbit);
if (remote_cbit) if (remote_cbit)
*remote_cbit = local_remote_cbit; *remote_cbit = local_remote_cbit;
return ifp; return ifp;
stream_failure:
return NULL;
} }
/* /*
@ -1094,6 +1097,13 @@ static int zclient_bfd_session_update(ZAPI_CALLBACK_ARGS)
ifp = bfd_get_peer_info(zclient->ibuf, &dp, &sp, &state, &remote_cbit, ifp = bfd_get_peer_info(zclient->ibuf, &dp, &sp, &state, &remote_cbit,
vrf_id); vrf_id);
/*
* When interface lookup fails or an invalid stream is read, we must
* not proceed otherwise it will trigger an assertion while checking
* family type below.
*/
if (dp.family == 0 || sp.family == 0)
return 0;
if (bsglobal.debugging) { if (bsglobal.debugging) {
ifstr[0] = 0; ifstr[0] = 0;