Date: Fri, 2 Oct 2015 15:07:03 +0000 (UTC) From: Eric van Gyzen <vangyzen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r288500 - stable/9/sbin/dmesg Message-ID: <201510021507.t92F730p044988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vangyzen Date: Fri Oct 2 15:07:02 2015 New Revision: 288500 URL: https://svnweb.freebsd.org/changeset/base/288500 Log: MFC r281787 dmesg: accommodate message buffer growth between the sysctl calls Allocate 12.5% extra space to avoid ENOMEM when the message buffer is growing steadily. Reported by: Steve Wahl <steve_wahl@dell.com> (and tested) Approved by: kib (mentor until recently) Obtained from: Dell Inc. Modified: stable/9/sbin/dmesg/dmesg.c Directory Properties: stable/9/sbin/dmesg/ (props changed) Modified: stable/9/sbin/dmesg/dmesg.c ============================================================================== --- stable/9/sbin/dmesg/dmesg.c Fri Oct 2 14:36:41 2015 (r288499) +++ stable/9/sbin/dmesg/dmesg.c Fri Oct 2 15:07:02 2015 (r288500) @@ -112,6 +112,9 @@ main(int argc, char *argv[]) */ if (sysctlbyname("kern.msgbuf", NULL, &buflen, NULL, 0) == -1) err(1, "sysctl kern.msgbuf"); + /* Allocate extra room for growth between the sysctl calls. */ + buflen += buflen/8; + /* Allocate more than sysctl sees, for room to append \n\0. */ if ((bp = malloc(buflen + 2)) == NULL) errx(1, "malloc failed"); if (sysctlbyname("kern.msgbuf", bp, &buflen, NULL, 0) == -1)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510021507.t92F730p044988>