Date: Mon, 16 Mar 2015 19:18:46 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280150 - head/sys/kern Message-ID: <201503161918.t2GJIk2w081828@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Mon Mar 16 19:18:45 2015 New Revision: 280150 URL: https://svnweb.freebsd.org/changeset/base/280150 Log: Use a regular sbuf + SYSCTL_OUT() rather than sbuf_new_for_sysctl() with auto-draining, to avoid a potential copyout fault while holding a lock. Pointed out by: jhb Pointy hat to: ian Modified: head/sys/kern/kern_fail.c Modified: head/sys/kern/kern_fail.c ============================================================================== --- head/sys/kern/kern_fail.c Mon Mar 16 17:45:41 2015 (r280149) +++ head/sys/kern/kern_fail.c Mon Mar 16 19:18:45 2015 (r280150) @@ -394,10 +394,12 @@ fail_point_sysctl(SYSCTL_HANDLER_ARGS) int error; /* Retrieving */ - sbuf_new_for_sysctl(&sb, NULL, 128, req); + sbuf_new(&sb, NULL, 128, SBUF_AUTOEXTEND | SBUF_INCLUDENUL); fail_point_get(fp, &sb); sbuf_trim(&sb); error = sbuf_finish(&sb); + if (error == 0) + error = SYSCTL_OUT(req, sbuf_data(&sb), sbuf_len(&sb)); sbuf_delete(&sb); /* Setting */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503161918.t2GJIk2w081828>