summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authortrociny <trociny@FreeBSD.org>2012-02-01 18:03:21 +0000
committertrociny <trociny@FreeBSD.org>2012-02-01 18:03:21 +0000
commitd5f58367fb7382e6a75853b828e28120cea880ac (patch)
tree62c3ababa9fa71d02f96b1fa42534b2114602d4f /usr.bin
parentbd849a2aadb65525a867b63fadacf22c044935d2 (diff)
downloadFreeBSD-src-d5f58367fb7382e6a75853b828e28120cea880ac.zip
FreeBSD-src-d5f58367fb7382e6a75853b828e28120cea880ac.tar.gz
Try to avoid ambiguity when sysctl returns ENOMEM additionally
checking the returned oldlen: when ENOMEM is due to the supplied buffer being too short the return oldlen is equal to buffer size. Without this additional check sockstat gets stuck in loop leaking the memory if the returned ENOMEM was due the exceeded memorylocked limit. This is easily can be observed running `limits -l 1k sockstat'. Submitted by: Andrey Zonov <andrey zonov org> MFC after: 1 week
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/sockstat/sockstat.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index dff7761..0114cc4 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -296,7 +296,7 @@ gather_inet(int proto)
break;
if (errno == ENOENT)
goto out;
- if (errno != ENOMEM)
+ if (errno != ENOMEM || len != bufsize)
err(1, "sysctlbyname()");
bufsize *= 2;
}
@@ -424,7 +424,7 @@ gather_unix(int proto)
len = bufsize;
if (sysctlbyname(varname, buf, &len, NULL, 0) == 0)
break;
- if (errno != ENOMEM)
+ if (errno != ENOMEM || len != bufsize)
err(1, "sysctlbyname()");
bufsize *= 2;
}
@@ -476,14 +476,15 @@ out:
static void
getfiles(void)
{
- size_t len;
+ size_t len, olen;
- if ((xfiles = malloc(len = sizeof *xfiles)) == NULL)
+ olen = len = sizeof *xfiles;
+ if ((xfiles = malloc(len)) == NULL)
err(1, "malloc()");
while (sysctlbyname("kern.file", xfiles, &len, 0, 0) == -1) {
- if (errno != ENOMEM)
+ if (errno != ENOMEM || len != olen)
err(1, "sysctlbyname()");
- len *= 2;
+ olen = len *= 2;
if ((xfiles = realloc(xfiles, len)) == NULL)
err(1, "realloc()");
}
OpenPOWER on IntegriCloud