From owner-svn-src-all@freebsd.org Fri May 13 07:56:15 2016 Return-Path: Delivered-To: svn-src-all@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 E8224B3885E; Fri, 13 May 2016 07:56:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B837C11AF; Fri, 13 May 2016 07:56:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4D7uEXr052380; Fri, 13 May 2016 07:56:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D7uEiF052379; Fri, 13 May 2016 07:56:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605130756.u4D7uEiF052379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 13 May 2016 07:56:14 +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: r299613 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Fri, 13 May 2016 07:56:16 -0000 Author: ngie Date: Fri May 13 07:56:14 2016 New Revision: 299613 URL: https://svnweb.freebsd.org/changeset/base/299613 Log: MFC r298678: r298678 (by cem): posix4_mib: Don't overrun facility_initialized array The facility_initialized and facility arrays are the same size and were intended to be indexed the same. I believe this mismatch was just a typo/braino in r208731. CID: 1017430 Modified: stable/10/sys/kern/posix4_mib.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/posix4_mib.c ============================================================================== --- stable/10/sys/kern/posix4_mib.c Fri May 13 07:17:38 2016 (r299612) +++ stable/10/sys/kern/posix4_mib.c Fri May 13 07:56:14 2016 (r299613) @@ -114,9 +114,9 @@ p31b_sysctl_proc(SYSCTL_HANDLER_ARGS) num = arg2; if (!P31B_VALID(num)) return (EINVAL); - val = facility_initialized[num] ? facility[num - 1] : 0; + val = facility_initialized[num - 1] ? facility[num - 1] : 0; error = sysctl_handle_int(oidp, &val, 0, req); - if (error == 0 && req->newptr != NULL && facility_initialized[num]) + if (error == 0 && req->newptr != NULL && facility_initialized[num - 1]) facility[num - 1] = val; return (error); } @@ -138,7 +138,7 @@ p31b_unsetcfg(int num) { facility[num - 1] = 0; - facility_initialized[num -1] = 0; + facility_initialized[num - 1] = 0; } int