d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in case of iflist request on non-initialized tracker.

Browse Source
This commit is contained in:
Alexander V. Chernikov 2014-08-14 08:42:16 +00:00
parent 18ad419788
commit 35d5a820e5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netpfil/ipfw/ip_fw_iface.c
View File

@ -489,6 +489,7 @@ export_iface_internal(struct namedobj_instance *ii, struct named_object *no,
int int
ipfw_list_ifaces(struct ip_fw_chain *ch, struct sockopt_data *sd) ipfw_list_ifaces(struct ip_fw_chain *ch, struct sockopt_data *sd)
{ {
struct namedobj_instance *ii;
struct _ipfw_obj_lheader *olh; struct _ipfw_obj_lheader *olh;
struct dump_iface_args da; struct dump_iface_args da;
uint32_t count, size; uint32_t count, size;
@ -500,7 +501,11 @@ ipfw_list_ifaces(struct ip_fw_chain *ch, struct sockopt_data *sd)
return (EINVAL); return (EINVAL);
IPFW_UH_RLOCK(ch); IPFW_UH_RLOCK(ch);
count = ipfw_objhash_count(CHAIN_TO_II(ch)); ii = CHAIN_TO_II(ch);
if (ii != NULL)
count = ipfw_objhash_count(ii);
else
count = 0;
size = count * sizeof(ipfw_iface_info) + sizeof(ipfw_obj_lheader); size = count * sizeof(ipfw_iface_info) + sizeof(ipfw_obj_lheader);
/* Fill in header regadless of buffer size */ /* Fill in header regadless of buffer size */
@ -517,10 +522,10 @@ ipfw_list_ifaces(struct ip_fw_chain *ch, struct sockopt_data *sd)
da.ch = ch; da.ch = ch;
da.sd = sd; da.sd = sd;
ipfw_objhash_foreach(CHAIN_TO_II(ch), export_iface_internal, &da); if (ii != NULL)
ipfw_objhash_foreach(ii, export_iface_internal, &da);
IPFW_UH_RUNLOCK(ch); IPFW_UH_RUNLOCK(ch);
return (0); return (0);
} }