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

Merge pull request #1227 from qlyoung/pim-cli-npd

Browse Source 
pimd: fix some null pointer derefs in cli
This commit is contained in:
Jafar Al-Gharaibeh 2017-09-23 22:17:38 -05:00 committed by GitHub
commit c84ed8700e
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);
}
#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,
clear_ip_interfaces_cmd,
"clear ip interfaces [vrf NAME]",
@ -6474,7 +6482,7 @@ DEFUN (interface_ip_mroute,
struct in_addr src_addr;
int result;
pim_ifp = iif->info;
PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg;
@ -6525,7 +6533,7 @@ DEFUN (interface_ip_mroute_source,
struct in_addr src_addr;
int result;
pim_ifp = iif->info;
PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg;
@ -6580,7 +6588,7 @@ DEFUN (interface_no_ip_mroute,
struct in_addr src_addr;
int result;
pim_ifp = iif->info;
PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg;
@ -6632,7 +6640,7 @@ DEFUN (interface_no_ip_mroute_source,
struct in_addr src_addr;
int result;
pim_ifp = iif->info;
PIM_GET_PIM_INTERFACE(pim_ifp, iif);
pim = pim_ifp->pim;
oifname = argv[idx_interface]->arg;