From nobody Tue Oct 04 16:04:03 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MhjF00jK9z4f8R8; Tue, 4 Oct 2022 16:04:04 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhjF0077lz403M; Tue, 4 Oct 2022 16:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LlfdJuuxepjaOFnjuXthAoYt12J+qAvTuHWfm6Bd3UU=; b=qnsBnMpEsJa+/N+exqzHy0PGPLXVHPnrEhzewa7MNZj/SYSbnGLvt6QCuOJ6s2l2Q2dkFs 7z6Q5F12XWgA0crIaVQhZNWGNBotHcTCyrXLp4lcLXyzBv3/Jb7iPKRcC0oMXbA4bbXPlK 62SzGmoEXo5O7awbzqR9IzsAGUBS0b80xRB+nt3WSWaQ0BHGHZWWTMMb87tCdYSVySNsHN TMV/9wUxpnr18371RvGQOYVZ4XtVUTfYkE6+WWgHSbpRr8FankNTsFL2drcQ2uUcTpRZ8C 4qepEGcIMW5aUbhoTa/HMpXJh5/owHXemq8SKjlhL2hx9ym3p6GeyB1C/xta+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MhjDz6HLszcRb; Tue, 4 Oct 2022 16:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 294G43vj022485; Tue, 4 Oct 2022 16:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294G4391022484; Tue, 4 Oct 2022 16:04:03 GMT (envelope-from git) Date: Tue, 4 Oct 2022 16:04:03 GMT Message-Id: <202210041604.294G4391022484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9515313b26be - main - libc: Fix size range check in setvbuf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9515313b26beb005a521aff2e6edd4d75cd010da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LlfdJuuxepjaOFnjuXthAoYt12J+qAvTuHWfm6Bd3UU=; b=MRRU1NAztMwI823av6Cm45xzRqnslr77krNpAJwC0a10rjF/qmrvHjnNaZ9fy2y8zA0zo4 PPXlPY7cp/vaea28qro36Wrf0uUqBAh4i9PccsXoTZN33Z/5BEPa+wyWtqES0X9vv/elFC oy8ZE9Dia7DSd+KMgekWqLeLnvrpYm4rg67hSyLYWnOZuiszDjots226pDMEE28oRhNb7K zUKt6qpJ7EhoIfPOw7+WcMIN/pq6XykGIjKtb7VkSw50rFUN94P0an2LgispCYjc1ZxiiO VbAczCUTYTbaDtrZKOlUmeYAa5sWDN2QWQ0puaDU/KJ9a4Nc4Jo0S2rzVVNKug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664899444; a=rsa-sha256; cv=none; b=WBsFUFIyI3Fqsma9j9nNR46+3llgEgOKJKLrdHeV+OJmIBjWR54x3K4tRpn0bZf9jBgLr1 YiPwBSmPsibuVi/74riIRgd0LYijG+Wlwr/fr3SUefLUvAPZ7/6SwRVPK8KlqzQPJQf7HI ZernR+uLktdCEyejxt89OC4f8FDzPXVYQPV/pcW+pRn9nBeDbiXy8TLB9NtRdL6fy3W+bk i5vfJFRveKeu0RoIdkUexntRcgSxEziT/rLl/Z2sJTVU6dFAZ51awDKVde3hf+l/XAhbj7 CjSMnweo12IQxd6pk+uYgbrmnunEeVp5TTyIVI6LfFckGV6FH0Bu4BTqzBXdog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9515313b26beb005a521aff2e6edd4d75cd010da commit 9515313b26beb005a521aff2e6edd4d75cd010da Author: Ed Maste AuthorDate: 2022-10-03 18:24:42 +0000 Commit: Ed Maste CommitDate: 2022-10-04 16:03:56 +0000 libc: Fix size range check in setvbuf From enh at google.com via openbsd-tech mailing list via pfg@: The existing test is wrong for LP64, where size_t has twice as many relevant bits as int, not just one. (Found by inspection by rprichard.) --- lib/libc/stdio/setvbuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index 03a3c7263125..8947e61e7c29 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -39,6 +39,7 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; __FBSDID("$FreeBSD$"); #include "namespace.h" +#include #include #include #include "un-namespace.h" @@ -62,7 +63,7 @@ setvbuf(FILE * __restrict fp, char * __restrict buf, int mode, size_t size) * when setting _IONBF. */ if (mode != _IONBF) - if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0) + if ((mode != _IOFBF && mode != _IOLBF) || size > INT_MAX) return (EOF); FLOCKFILE_CANCELSAFE(fp);