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

isisd: fix area NULL pointer in isis_route_update

Browse Source 
Fix the case area is NULL.

Fixes: acc0029779 ("isisd: fix potential access to NULL pointer in isis_route_update")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2022-11-10 17:18:01 +01:00
parent e07ff2ce13
commit 41c2bf853f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/isis_route.c
View File

@ -485,6 +485,9 @@ static void isis_route_update(struct isis_area *area, struct prefix *prefix,
struct prefix_ipv6 *src_p, struct prefix_ipv6 *src_p,
struct isis_route_info *route_info) struct isis_route_info *route_info)
{ {
if (area == NULL)
return;
if (CHECK_FLAG(route_info->flag, ISIS_ROUTE_FLAG_ACTIVE)) { if (CHECK_FLAG(route_info->flag, ISIS_ROUTE_FLAG_ACTIVE)) {
if (CHECK_FLAG(route_info->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNCED)) if (CHECK_FLAG(route_info->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNCED))
return; return;
@ -492,7 +495,6 @@ static void isis_route_update(struct isis_area *area, struct prefix *prefix,
isis_route_remove_previous_sid(area, prefix, route_info); isis_route_remove_previous_sid(area, prefix, route_info);
/* Install route. */ /* Install route. */
if (area)
isis_zebra_route_add_route(area->isis, prefix, src_p, isis_zebra_route_add_route(area->isis, prefix, src_p,
route_info); route_info);
/* Install/reinstall Prefix-SID label. */ /* Install/reinstall Prefix-SID label. */
@ -509,7 +511,6 @@ static void isis_route_update(struct isis_area *area, struct prefix *prefix,
isis_zebra_prefix_sid_uninstall( isis_zebra_prefix_sid_uninstall(
area, prefix, route_info, &route_info->sr); area, prefix, route_info, &route_info->sr);
/* Uninstall route. */ /* Uninstall route. */
if (area)
isis_zebra_route_del_route(area->isis, prefix, src_p, isis_zebra_route_del_route(area->isis, prefix, src_p,
route_info); route_info);
hook_call(isis_route_update_hook, area, prefix, route_info); hook_call(isis_route_update_hook, area, prefix, route_info);