proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-14 22:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5623 from qlyoung/fix-zebra-rtadv-interval-overflow

Browse Source 
zebra: disallow negative rtadv intvl, fix overflow
This commit is contained in:
Renato Westphal 2020-01-06 23:51:44 -03:00 committed by GitHub
commit eada87a4ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zebra/rtadv.c
View File

@ -965,16 +965,25 @@ static void zebra_interface_radv_set(ZAPI_HANDLER_ARGS, int enable)
ifindex_t ifindex; ifindex_t ifindex;
struct interface *ifp; struct interface *ifp;
struct zebra_if *zif; struct zebra_if *zif;
int ra_interval; int ra_interval_rxd;
s = msg; s = msg;
/* Get interface index and RA interval. */ /* Get interface index and RA interval. */
STREAM_GETL(s, ifindex); STREAM_GETL(s, ifindex);
STREAM_GETL(s, ra_interval); STREAM_GETL(s, ra_interval_rxd);
if (ra_interval_rxd < 0) {
zlog_warn(
"Requested RA interval %d is garbage; ignoring request",
ra_interval_rxd);
return;
}
unsigned int ra_interval = ra_interval_rxd;
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("%u: IF %u RA %s from client %s, interval %ds", zlog_debug("%u: IF %u RA %s from client %s, interval %ums",
zvrf_id(zvrf), ifindex, zvrf_id(zvrf), ifindex,
enable ? "enable" : "disable", enable ? "enable" : "disable",
zebra_route_string(client->proto), ra_interval); zebra_route_string(client->proto), ra_interval);
@ -1001,7 +1010,7 @@ static void zebra_interface_radv_set(ZAPI_HANDLER_ARGS, int enable)
SET_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED); SET_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED);
ipv6_nd_suppress_ra_set(ifp, RA_ENABLE); ipv6_nd_suppress_ra_set(ifp, RA_ENABLE);
if (ra_interval if (ra_interval
&& (ra_interval * 1000) < zif->rtadv.MaxRtrAdvInterval && (ra_interval * 1000) < (unsigned int) zif->rtadv.MaxRtrAdvInterval
&& !CHECK_FLAG(zif->rtadv.ra_configured, && !CHECK_FLAG(zif->rtadv.ra_configured,
VTY_RA_INTERVAL_CONFIGURED)) VTY_RA_INTERVAL_CONFIGURED))
zif->rtadv.MaxRtrAdvInterval = ra_interval * 1000; zif->rtadv.MaxRtrAdvInterval = ra_interval * 1000;