Date: Fri, 23 Apr 2021 11:15:38 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1f3d09306bf5 - stable/13 - sysctl_handle_string: do not malloc when SYSCTL_IN cannot fault Message-ID: <202104231115.13NBFcHJ013883@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1f3d09306bf5d3572c0cda033a4c83603216c598 commit 1f3d09306bf5d3572c0cda033a4c83603216c598 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-04-18 16:09:30 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-04-23 11:14:11 +0000 sysctl_handle_string: do not malloc when SYSCTL_IN cannot fault (cherry picked from commit 4342ba184c15f3b8912e95f93fe313731963f065) --- sys/kern/kern_sysctl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index ffb6ac196ba3..4bfe7073e5a3 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1785,6 +1785,15 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS) sx_xlock(&sysctlstringlock); ((char *)arg1)[0] = '\0'; sx_xunlock(&sysctlstringlock); + } else if (req->newfunc == sysctl_new_kernel) { + arg2 = req->newlen - req->newidx; + sx_xlock(&sysctlstringlock); + error = SYSCTL_IN(req, arg1, arg2); + if (error == 0) { + ((char *)arg1)[arg2] = '\0'; + req->newidx += arg2; + } + sx_xunlock(&sysctlstringlock); } else { arg2 = req->newlen - req->newidx; tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104231115.13NBFcHJ013883>