diff options
| author | ngie <ngie@FreeBSD.org> | 2017-01-06 03:55:28 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-01-06 03:55:28 +0000 |
| commit | fa7044a0c275d3edd5de861f43175737dd47b013 (patch) | |
| tree | 4982c2be0dc3a6be023759c522b3ba23933ddd8b | |
| parent | cc385d38e467604f444e1589843230b11af1cbf4 (diff) | |
| download | FreeBSD-src-fa7044a0c275d3edd5de861f43175737dd47b013.zip FreeBSD-src-fa7044a0c275d3edd5de861f43175737dd47b013.tar.gz | |
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)
| -rw-r--r-- | contrib/bsnmp/snmp_mibII/mibII.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 3719e00..a105398 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -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; } |
