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

pimd: fix some null pointer derefs in cli

Browse source 
If pim/igmp is not enabled on an interface, the ->info pointer will be
null. Need to check that before dereferencing it.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-09-22 17:15:33 -04:00
parent b1cebe20cd
commit 21b3e44eb4
No known key found for this signature in database
GPG key ID: DAF48E0F57E0834F
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pimd/pim_cmd.c
View file

@ -3160,6 +3160,14 @@ static void clear_interfaces(struct pim_instance *pim)
clear_pim_interfaces(pim); clear_pim_interfaces(pim);
} }
#define PIM_GET_PIM_INTERFACE(pim_ifp, ifp) \
pim_ifp = ifp->info; \
if (!pim_ifp) { \
vty_out(vty, \
"%% Enable PIM and/or IGMP on this interface first\n"); \
return CMD_WARNING_CONFIG_FAILED; \
}
DEFUN (clear_ip_interfaces, DEFUN (clear_ip_interfaces,
clear_ip_interfaces_cmd, clear_ip_interfaces_cmd,
"clear ip interfaces [vrf NAME]", "clear ip interfaces [vrf NAME]",
@ -6474,7 +6482,7 @@ DEFUN (interface_ip_mroute,
struct in_addr src_addr; struct in_addr src_addr;
int result; int result;
pim_ifp = iif->info; PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim; pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg; oifname = argv[idx_interface]->arg;
@ -6525,7 +6533,7 @@ DEFUN (interface_ip_mroute_source,
struct in_addr src_addr; struct in_addr src_addr;
int result; int result;
pim_ifp = iif->info; PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim; pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg; oifname = argv[idx_interface]->arg;
@ -6580,7 +6588,7 @@ DEFUN (interface_no_ip_mroute,
struct in_addr src_addr; struct in_addr src_addr;
int result; int result;
pim_ifp = iif->info; PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim; pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg; oifname = argv[idx_interface]->arg;
@ -6632,7 +6640,7 @@ DEFUN (interface_no_ip_mroute_source,
struct in_addr src_addr; struct in_addr src_addr;
int result; int result;
pim_ifp = iif->info; PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim; pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg; oifname = argv[idx_interface]->arg;