diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-12-30 23:44:39 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-12-30 23:44:39 +0000 |
| commit | 8373993535327bc2e7250e98a1cd50fade281490 (patch) | |
| tree | 9bcd026b9408d54628898841d2a05b8b365ac3d2 /contrib/bsnmp | |
| parent | d481a9257222ed46248abf8a031a68cadef47455 (diff) | |
| download | src-8373993535327bc2e7250e98a1cd50fade281490.tar.gz src-8373993535327bc2e7250e98a1cd50fade281490.zip | |
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)
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=310873
Diffstat (limited to 'contrib/bsnmp')
| -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 3719e0074afe..a1053988b8c6 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; } |