Date: Mon, 27 Nov 2017 03:47:12 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326242 - stable/11/sys/kern Message-ID: <201711270347.vAR3lC8U009989@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Nov 27 03:47:12 2017 New Revision: 326242 URL: https://svnweb.freebsd.org/changeset/base/326242 Log: MFC r325755: Be more careful when doing calculation with request from userland. Modified: stable/11/sys/kern/kern_proc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_proc.c ============================================================================== --- stable/11/sys/kern/kern_proc.c Mon Nov 27 02:44:36 2017 (r326241) +++ stable/11/sys/kern/kern_proc.c Mon Nov 27 03:47:12 2017 (r326242) @@ -1933,7 +1933,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS) if (error != 0 || req->newptr == NULL) return (error); - if (req->newlen + sizeof(struct pargs) > ps_arg_cache_limit) + if (req->newlen > ps_arg_cache_limit - sizeof(struct pargs)) return (ENOMEM); newpa = pargs_alloc(req->newlen); error = SYSCTL_IN(req, newpa->ar_args, req->newlen);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711270347.vAR3lC8U009989>