From owner-svn-src-all@FreeBSD.ORG Thu May 14 10:54:57 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAD511065673; Thu, 14 May 2009 10:54:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DAB488FC1C; Thu, 14 May 2009 10:54:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4EAsvVu088978; Thu, 14 May 2009 10:54:57 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4EAsvp1088977; Thu, 14 May 2009 10:54:57 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200905141054.n4EAsvp1088977@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 14 May 2009 10:54:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192094 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2009 10:54:58 -0000 Author: kib Date: Thu May 14 10:54:57 2009 New Revision: 192094 URL: http://svn.freebsd.org/changeset/base/192094 Log: Do not advance req->oldidx when sysctl_old_user returning an error due to copyout failure or short buffer. The later breaks the usermode iterators of the sysctl results that pack arbitrary number of variable-sized structures. Iterator expects that kernel filled exactly oldlen bytes, and tries to interpret half-filled or garbage structure at the end of the buffer. In particular, kinfo_getfile(3) segfaulted. Reported and tested by: pho MFC after: 3 weeks Modified: head/sys/kern/kern_sysctl.c Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Thu May 14 10:47:11 2009 (r192093) +++ head/sys/kern/kern_sysctl.c Thu May 14 10:54:57 2009 (r192094) @@ -1221,9 +1221,9 @@ sysctl_old_kernel(struct sysctl_req *req if (i > 0) bcopy(p, (char *)req->oldptr + req->oldidx, i); } - req->oldidx += l; if (req->oldptr && i != l) return (ENOMEM); + req->oldidx += l; return (0); } @@ -1320,9 +1320,10 @@ sysctl_old_user(struct sysctl_req *req, size_t i, len, origidx; origidx = req->oldidx; - req->oldidx += l; - if (req->oldptr == NULL) + if (req->oldptr == NULL) { + req->oldidx += l; return (0); + } /* * If we have not wired the user supplied buffer and we are currently * holding locks, drop a witness warning, as it's possible that @@ -1344,6 +1345,7 @@ sysctl_old_user(struct sysctl_req *req, return (error); if (i < l) return (ENOMEM); + req->oldidx += l; return (0); }