From owner-svn-src-head@freebsd.org Sat May 9 13:00:39 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 786BD2E8F2D; Sat, 9 May 2020 13:00:39 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49K6kb2hHHz3GhM; Sat, 9 May 2020 13:00:39 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 577E41C3DE; Sat, 9 May 2020 13:00:39 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 049D0dSa037480; Sat, 9 May 2020 13:00:39 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 049D0dxb037457; Sat, 9 May 2020 13:00:39 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005091300.049D0dxb037457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 9 May 2020 13:00:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360845 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 360845 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.32 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 13:00:39 -0000 Author: kib Date: Sat May 9 13:00:38 2020 New Revision: 360845 URL: https://svnweb.freebsd.org/changeset/base/360845 Log: Avoid spurious ENOMEMs from sysctl hw.pagesizes. Reported by: Paul Floyd PR: 246215 Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D24737 Modified: head/sys/kern/kern_mib.c Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Sat May 9 12:58:27 2020 (r360844) +++ head/sys/kern/kern_mib.c Sat May 9 13:00:38 2020 (r360845) @@ -231,6 +231,7 @@ static int sysctl_hw_pagesizes(SYSCTL_HANDLER_ARGS) { int error; + size_t len; #ifdef SCTL_MASK32 int i; uint32_t pagesizes32[MAXPAGESIZES]; @@ -243,10 +244,18 @@ sysctl_hw_pagesizes(SYSCTL_HANDLER_ARGS) for (i = 0; i < MAXPAGESIZES; i++) pagesizes32[i] = (uint32_t)pagesizes[i]; - error = SYSCTL_OUT(req, pagesizes32, sizeof(pagesizes32)); + len = sizeof(pagesizes32); + if (len > req->oldlen) + len = req->oldlen; + error = SYSCTL_OUT(req, pagesizes32, len); } else #endif - error = SYSCTL_OUT(req, pagesizes, sizeof(pagesizes)); + { + len = sizeof(pagesizes); + if (len > req->oldlen) + len = req->oldlen; + error = SYSCTL_OUT(req, pagesizes, len); + } return (error); } SYSCTL_PROC(_hw, OID_AUTO, pagesizes,