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

ospfd: Fix Dereference of Null Pointer during config

Browse Source 
This construct:

struct ospf *ospf = vty->index;
if (!ospf)
  return CMD_SUCCESS;

Is present throughout the entire ospfd code base.  The command:
distance ospf external 255

Is not protected by this construct. I added this construct
to the command and in addition did a quick search to find
any others not protected and to protect them.

Ticket: CM-9725
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-03-17 17:26:46 -04:00
parent 73d2dad0bd
commit d8f70b86d7
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ospfd/ospf_vty.c
View File

@ -2463,6 +2463,9 @@ DEFUN (ospf_timers_min_ls_interval,
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
unsigned int interval; unsigned int interval;
if (!ospf)
return CMD_SUCCESS;
if (argc != 1) if (argc != 1)
{ {
vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE); vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE);
@ -2512,6 +2515,9 @@ DEFUN (ospf_timers_min_ls_arrival,
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
unsigned int arrival; unsigned int arrival;
if (!ospf)
return CMD_SUCCESS;
if (argc != 1) if (argc != 1)
{ {
vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE); vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE);
@ -2534,6 +2540,10 @@ DEFUN (no_ospf_timers_min_ls_arrival,
"OSPF minimum arrival interval delay\n") "OSPF minimum arrival interval delay\n")
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
if (!ospf)
return CMD_SUCCESS;
ospf->min_ls_arrival = OSPF_MIN_LS_ARRIVAL; ospf->min_ls_arrival = OSPF_MIN_LS_ARRIVAL;
return CMD_SUCCESS; return CMD_SUCCESS;
@ -8077,6 +8087,9 @@ DEFUN (ospf_redistribute_source,
int metric = -1; int metric = -1;
struct ospf_redist *red; struct ospf_redist *red;
if (!ospf)
return CMD_SUCCESS;
if (argc < 4) if (argc < 4)
return CMD_WARNING; /* should not happen */ return CMD_WARNING; /* should not happen */
@ -8164,6 +8177,9 @@ DEFUN (ospf_redistribute_instance_source,
u_short instance; u_short instance;
struct ospf_redist *red; struct ospf_redist *red;
if (!ospf)
return CMD_SUCCESS;
if (strncmp(argv[0], "o", 1) == 0) if (strncmp(argv[0], "o", 1) == 0)
source = ZEBRA_ROUTE_OSPF; source = ZEBRA_ROUTE_OSPF;
else else
@ -8493,6 +8509,9 @@ DEFUN (no_ospf_distance_ospf,
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
if (!ospf)
return CMD_SUCCESS;
if (argc < 3) if (argc < 3)
return CMD_WARNING; return CMD_WARNING;
@ -8534,6 +8553,9 @@ DEFUN (ospf_distance_ospf,
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
if (!ospf)
return CMD_SUCCESS;
if (argc < 3) /* should not happen */ if (argc < 3) /* should not happen */
return CMD_WARNING; return CMD_WARNING;