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

ospfd: fix regression in recent commit

Browse Source 
commit '717750433839762d23a5f8d88fe0b4d57c8d490a' causes SEGV error,
when 'oi = ospf_if_lookup_recv_if (ospf, iph->ip_src, ifp);' returns
NULL.

* ospf_packet.c
  * ospf_read(): change a place of calling 'ospf_verify_header()'
This commit is contained in:
YAMAMOTO Shigeru 2011-09-28 21:00:14 +04:00 committed by Denis Ovsienko
parent 52ecbbea36
commit 3aad46bdaa
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ospfd/ospf_packet.c
View File

@ -2455,16 +2455,10 @@ ospf_read (struct thread *thread)
/* associate packet with ospf interface */ /* associate packet with ospf interface */
oi = ospf_if_lookup_recv_if (ospf, iph->ip_src, ifp); oi = ospf_if_lookup_recv_if (ospf, iph->ip_src, ifp);
/* Verify header fields before any further processing. */ /* ospf_verify_header() relies on a valid "oi" and thus can be called only
ret = ospf_verify_header (ibuf, oi, iph, ospfh); after the passive/backbone/other checks below are passed. These checks
if (ret < 0) in turn access the fields of unverified "ospfh" structure for their own
{ purposes and must remain very accurate in doing this. */
if (IS_DEBUG_OSPF_PACKET (0, RECV))
zlog_debug ("ospf_read[%s]: Header check failed, "
"dropping.",
inet_ntoa (iph->ip_src));
return ret;
}
/* If incoming interface is passive one, ignore it. */ /* If incoming interface is passive one, ignore it. */
if (oi && OSPF_IF_PASSIVE_STATUS (oi) == OSPF_IF_PASSIVE) if (oi && OSPF_IF_PASSIVE_STATUS (oi) == OSPF_IF_PASSIVE)
@ -2556,6 +2550,17 @@ ospf_read (struct thread *thread)
return 0; return 0;
} }
/* Verify more OSPF header fields. */
ret = ospf_verify_header (ibuf, oi, iph, ospfh);
if (ret < 0)
{
if (IS_DEBUG_OSPF_PACKET (0, RECV))
zlog_debug ("ospf_read[%s]: Header check failed, "
"dropping.",
inet_ntoa (iph->ip_src));
return ret;
}
/* Show debug receiving packet. */ /* Show debug receiving packet. */
if (IS_DEBUG_OSPF_PACKET (ospfh->type - 1, RECV)) if (IS_DEBUG_OSPF_PACKET (ospfh->type - 1, RECV))
{ {