From owner-svn-src-head@freebsd.org Sun Nov 15 07:48:53 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 133412D6998; Sun, 15 Nov 2020 07:48:53 +0000 (UTC) (envelope-from scottl@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CYkq875QBz3G8k; Sun, 15 Nov 2020 07:48:52 +0000 (UTC) (envelope-from scottl@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 E4D8218339; Sun, 15 Nov 2020 07:48:52 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AF7mqUa016901; Sun, 15 Nov 2020 07:48:52 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AF7mqW3016900; Sun, 15 Nov 2020 07:48:52 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <202011150748.0AF7mqW3016900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Sun, 15 Nov 2020 07:48:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367701 - head/lib/libutil X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: head/lib/libutil X-SVN-Commit-Revision: 367701 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.34 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: Sun, 15 Nov 2020 07:48:53 -0000 Author: scottl Date: Sun Nov 15 07:48:52 2020 New Revision: 367701 URL: https://svnweb.freebsd.org/changeset/base/367701 Log: Because getlocalbase() returns -1 on error, it needs to use a signed type internally. Do that, and make sure that conversations between signed and unsigned don't overflow Modified: head/lib/libutil/getlocalbase.c Modified: head/lib/libutil/getlocalbase.c ============================================================================== --- head/lib/libutil/getlocalbase.c Sun Nov 15 01:54:44 2020 (r367700) +++ head/lib/libutil/getlocalbase.c Sun Nov 15 07:48:52 2020 (r367701) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); ssize_t getlocalbase(char *path, size_t pathlen) { - size_t tmplen; + ssize_t tmplen; const char *tmppath; if ((pathlen == 0) || (path == NULL)) { @@ -49,13 +49,20 @@ getlocalbase(char *path, size_t pathlen) return (-1); } + /* It's unlikely that the buffer would be this big */ + if (pathlen > SSIZE_MAX) { + errno = ENOMEM; + return (-1); + } + tmppath = NULL; - tmplen = pathlen; + tmplen = (size_t)pathlen; if (issetugid() == 0) tmppath = getenv("LOCALBASE"); if ((tmppath == NULL) && - (sysctlbyname("user.localbase", path, &tmplen, NULL, 0) == 0)) { + (sysctlbyname("user.localbase", path, (size_t *)&tmplen, NULL, + 0) == 0)) { return (tmplen); } @@ -67,13 +74,13 @@ getlocalbase(char *path, size_t pathlen) #endif tmplen = strlcpy(path, tmppath, pathlen); - if ((tmplen < 0) || (tmplen >= pathlen)) { + if ((tmplen < 0) || (tmplen >= (ssize_t)pathlen)) { errno = ENOMEM; return (-1); } /* It's unlikely that the buffer would be this big */ - if (tmplen >= SSIZE_MAX) { + if (tmplen > SSIZE_MAX) { errno = ENOMEM; return (-1); }