From owner-svn-src-stable-10@freebsd.org Wed Jul 15 16:55:57 2015 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2A039A2295; Wed, 15 Jul 2015 16:55:57 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8922110A0; Wed, 15 Jul 2015 16:55:57 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from svnmir.geo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6FGtvqn059190; Wed, 15 Jul 2015 16:55:57 GMT (envelope-from pkelsey@FreeBSD.org) Received: (from pkelsey@localhost) by svnmir.geo.freebsd.org (8.14.9/8.14.9/Submit) id t6FGtvJx059189; Wed, 15 Jul 2015 16:55:57 GMT (envelope-from pkelsey@FreeBSD.org) Message-Id: <201507151655.t6FGtvJx059189@svnmir.geo.freebsd.org> X-Authentication-Warning: svnmir.geo.freebsd.org: pkelsey set sender to pkelsey@FreeBSD.org using -f From: Patrick Kelsey Date: Wed, 15 Jul 2015 16:55:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r285604 - stable/10/lib/libc/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2015 16:55:57 -0000 Author: pkelsey Date: Wed Jul 15 16:55:56 2015 New Revision: 285604 URL: https://svnweb.freebsd.org/changeset/base/285604 Log: MFC r285188: Fix sysctl(3) so it returns the intended values for all mib names in the 'user' sysctl tree, which have all been coming back 0 or empty since r240176. Approved by: re Modified: stable/10/lib/libc/gen/sysctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/sysctl.c ============================================================================== --- stable/10/lib/libc/gen/sysctl.c Wed Jul 15 16:47:13 2015 (r285603) +++ stable/10/lib/libc/gen/sysctl.c Wed Jul 15 16:55:56 2015 (r285604) @@ -51,9 +51,21 @@ sysctl(const int *name, u_int namelen, v const void *newp, size_t newlen) { int retval; + size_t orig_oldlen; + orig_oldlen = oldlenp ? *oldlenp : 0; retval = __sysctl(name, namelen, oldp, oldlenp, newp, newlen); - if (retval != -1 || errno != ENOENT || name[0] != CTL_USER) + /* + * All valid names under CTL_USER have a dummy entry in the sysctl + * tree (to support name lookups and enumerations) with an + * empty/zero value, and the true value is supplied by this routine. + * For all such names, __sysctl() is used solely to validate the + * name. + * + * Return here unless there was a successful lookup for a CTL_USER + * name. + */ + if (retval || name[0] != CTL_USER) return (retval); if (newp != NULL) { @@ -67,7 +79,7 @@ sysctl(const int *name, u_int namelen, v switch (name[1]) { case USER_CS_PATH: - if (oldp && *oldlenp < sizeof(_PATH_STDPATH)) { + if (oldp && orig_oldlen < sizeof(_PATH_STDPATH)) { errno = ENOMEM; return -1; }