proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: fix divide-by-zero

Browse Source 
x % 0 = FPE

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-06-14 14:06:01 +00:00
parent 93f855c24a
commit 6196c77a4f
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zebra/irdp_interface.c
View File

@ -476,19 +476,15 @@ DEFUN (ip_irdp_minadvertinterval,
zi=ifp->info; zi=ifp->info;
irdp=&zi->irdp; irdp=&zi->irdp;
if( (unsigned) atoi(argv[idx_number]->arg) <= irdp->MaxAdvertInterval) { if((unsigned) atoi(argv[idx_number]->arg) < irdp->MaxAdvertInterval) {
irdp->MinAdvertInterval = atoi(argv[idx_number]->arg); irdp->MinAdvertInterval = atoi(argv[idx_number]->arg);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
else {
vty_out (vty, "ICMP warning maxadvertinterval is greater or equal than minadvertinterval%s", vty_out (vty, "%% MinAdvertInterval must be less than MaxAdvertInterval");
VTY_NEWLINE);
vty_out (vty, "Please correct!%s",
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
}
DEFUN (ip_irdp_maxadvertinterval, DEFUN (ip_irdp_maxadvertinterval,
ip_irdp_maxadvertinterval_cmd, ip_irdp_maxadvertinterval_cmd,
@ -506,20 +502,15 @@ DEFUN (ip_irdp_maxadvertinterval,
zi=ifp->info; zi=ifp->info;
irdp=&zi->irdp; irdp=&zi->irdp;
if(irdp->MinAdvertInterval < (unsigned) atoi(argv[idx_number]->arg)) {
if( irdp->MinAdvertInterval <= (unsigned) atoi(argv[idx_number]->arg) ) {
irdp->MaxAdvertInterval = atoi(argv[idx_number]->arg); irdp->MaxAdvertInterval = atoi(argv[idx_number]->arg);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
else {
vty_out (vty, "ICMP warning maxadvertinterval is greater or equal than minadvertinterval%s", vty_out (vty, "%% MaxAdvertInterval must be greater than MinAdvertInterval");
VTY_NEWLINE);
vty_out (vty, "Please correct!%s",
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
}
/* DEFUN needs to be fixed for negative ranages... /* DEFUN needs to be fixed for negative ranages...
* "ip irdp preference <-2147483648-2147483647>", * "ip irdp preference <-2147483648-2147483647>",

1
zebra/irdp_main.c
View File

@ -234,6 +234,7 @@ int irdp_send_thread(struct thread *t_advert)
} }
tmp = irdp->MaxAdvertInterval-irdp->MinAdvertInterval; tmp = irdp->MaxAdvertInterval-irdp->MinAdvertInterval;
assert (tmp > 0);
timer = (random () % tmp) + 1; timer = (random () % tmp) + 1;
timer = irdp->MinAdvertInterval + timer; timer = irdp->MinAdvertInterval + timer;