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

ospfd: Make ospf_passive_interface_update calls friendly to static analysis

Browse Source 
* ospf_vty.c: ({no_}ospf_passive_interface_addr_cmd) To a static analyser,
  the call to ospf_passive_interface_update can look like uninitialised memory
  in addr might be read from. It won't be, as ospf_passive_interface_update
  only reads addr if params != IF_DEF_PARAMS, but not clear. Split up the
  helper into the two cases to make it clear.

(cherry picked from commit e1bcd4741c24ff990a9413ead9a9e37b80153046)
This commit is contained in:
Paul Jakma 2014-09-19 16:41:10 +01:00 committed by Daniel Walton
parent 0908a2fdd3
commit f842f16640
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ospfd/ospf_vty.c
View File

@ -323,9 +323,9 @@ ospf_passive_interface_default (struct ospf *ospf, u_char newval)
} }
static void static void
ospf_passive_interface_update (struct ospf *ospf, struct interface *ifp, ospf_passive_interface_update_addr (struct ospf *ospf, struct interface *ifp,
struct in_addr addr, struct ospf_if_params *params, u_char value,
struct ospf_if_params *params, u_char value) struct in_addr addr)
{ {
u_char dflt; u_char dflt;
@ -345,7 +345,14 @@ ospf_passive_interface_update (struct ospf *ospf, struct interface *ifp,
ospf_free_if_params (ifp, addr); ospf_free_if_params (ifp, addr);
ospf_if_update_params (ifp, addr); ospf_if_update_params (ifp, addr);
} }
else }
static void
ospf_passive_interface_update (struct ospf *ospf, struct interface *ifp,
struct ospf_if_params *params, u_char value)
{
params->passive_interface = value;
if (params == IF_DEF_PARAMS (ifp))
{ {
if (value != ospf->passive_interface_default) if (value != ospf->passive_interface_default)
SET_IF_PARAM (params, passive_interface); SET_IF_PARAM (params, passive_interface);
@ -392,8 +399,11 @@ DEFUN (ospf_passive_interface,
params = ospf_get_if_params (ifp, addr); params = ospf_get_if_params (ifp, addr);
ospf_if_update_params (ifp, addr); ospf_if_update_params (ifp, addr);
ospf_passive_interface_update_addr (ospf, ifp, params,
OSPF_IF_PASSIVE, addr);
} }
ospf_passive_interface_update (ospf, ifp, addr, params, OSPF_IF_PASSIVE);
ospf_passive_interface_update (ospf, ifp, params, OSPF_IF_PASSIVE);
/* XXX We should call ospf_if_set_multicast on exactly those /* XXX We should call ospf_if_set_multicast on exactly those
* interfaces for which the passive property changed. It is too much * interfaces for which the passive property changed. It is too much
@ -472,9 +482,11 @@ DEFUN (no_ospf_passive_interface,
params = ospf_lookup_if_params (ifp, addr); params = ospf_lookup_if_params (ifp, addr);
if (params == NULL) if (params == NULL)
return CMD_SUCCESS; return CMD_SUCCESS;
ospf_passive_interface_update_addr (ospf, ifp, params, OSPF_IF_ACTIVE,
addr);
} }
ospf_passive_interface_update (ospf, ifp, addr, params, OSPF_IF_ACTIVE); ospf_passive_interface_update (ospf, ifp, params, OSPF_IF_ACTIVE);
/* XXX We should call ospf_if_set_multicast on exactly those /* XXX We should call ospf_if_set_multicast on exactly those
* interfaces for which the passive property changed. It is too much * interfaces for which the passive property changed. It is too much
* work to determine this set, so we do this for every interface. * work to determine this set, so we do this for every interface.