svn commit: r311468 - stable/10/contrib/bsnmp/snmp_mibII

[Ngie Cooper]

Author: ngie
Date: Fri Jan  6 03:55:28 2017
New Revision: 311468
URL: https://svnweb.freebsd.org/changeset/base/311468

Log:
  MFstable/11 r311467:
  
  MFC r310873:
  
  Guard against use-after-free after calling mibif_free(..)
  
  Set variables to NULL after calling free.
  
  Also, remove unnecessary if (x != NULL) checks before calling free(x)

Modified:
  stable/10/contrib/bsnmp/snmp_mibII/mibII.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- stable/10/contrib/bsnmp/snmp_mibII/mibII.c	Fri Jan  6 03:54:26 2017	(r311467)
+++ stable/10/contrib/bsnmp/snmp_mibII/mibII.c	Fri Jan  6 03:55:28 2017	(r311468)
@@ -707,10 +707,11 @@ mibif_free(struct mibif *ifp)
 	}
 
 	free(ifp->private);
-	if (ifp->physaddr != NULL)
-		free(ifp->physaddr);
-	if (ifp->specmib != NULL)
-		free(ifp->specmib);
+	ifp->private = NULL;
+	free(ifp->physaddr);
+	ifp->physaddr = NULL;
+	free(ifp->specmib);
+	ifp->specmib = NULL;
 
 	STAILQ_FOREACH(map, &mibindexmap_list, link)
 		if (map->mibif == ifp) {
@@ -745,8 +746,8 @@ mibif_free(struct mibif *ifp)
 		at = at1;
 	}
 
-
 	free(ifp);
+	ifp = NULL;
 	mib_if_number--;
 	mib_iftable_last_change = this_tick;
 }