From nobody Fri Oct 07 15:26:54 2022 X-Original-To: dev-commits-src-all@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 4MkXGk5mwBz4dy5N; Fri, 7 Oct 2022 15:26:54 +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 4MkXGk5MW1z43tb; Fri, 7 Oct 2022 15:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665156414; 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=3d+rnehfwh+PiHPmaAeO0I6L5yPtxfqqwttxvN23wOU=; b=EElEV+lle+ZbDO2smVVA0ptVkx7h6EdmoxCfiR9DYxGztrQqMsywNUiElNKDrPFl7Oyv+q 4/iVCkJI1YTLh5H/Ie372EMSm+wDNTmJGLMinmNBNcG0Yxq5yJ7Can9tyCceNtNRYX5fXI qOAhbkt1H5z24OZcgLa/eYG1Hi8c+9vWs9F6i4cJlRKxjsVDCZ3cHOTqFnzHD6d4wcwSN/ tnQgVONpdwVURy2vtUcuTEUV3vay/VmwSgsz2Z/MRTnFp0KKjTinhc6BlWrElGxwupK96S pCldofzGYBIYIMQhshQS9K64+BPjJ0XuoYOCc+PhkW5Mq/IVT21iP5oFFebAUA== 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 4MkXGk4Q8vzdkc; Fri, 7 Oct 2022 15:26:54 +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 297FQs0I049112; Fri, 7 Oct 2022 15:26:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 297FQs5o049111; Fri, 7 Oct 2022 15:26:54 GMT (envelope-from git) Date: Fri, 7 Oct 2022 15:26:54 GMT Message-Id: <202210071526.297FQs5o049111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 641ef7e69a49 - stable/12 - libc: Fix size range check in setvbuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 641ef7e69a49d793092859f8777817b5ecc82c51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665156414; 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=3d+rnehfwh+PiHPmaAeO0I6L5yPtxfqqwttxvN23wOU=; b=KW2jfBdHOtsb+pNiYFG4mUxqXEQqeM9QscEYIG7L/rDBtBmPLWmOOLNci/bCZ8uq9HIaJf +xNc9HzkCBlAd4uGeu9b4IH3HF99roscPXVEE3M9smVN4S+vFXvJHgvWUDcOArHfFg492I o7fkJznmVfV8RXaC/kbkm7G6X0u9n0uWZCxCuaLrP2GkvaKX78FVoDKacV/28jHbPtnkR/ vZvhrrZw3BC8mT436h3apowzOpNWPCdflwnJAwJqZSzQlKby0Xb7NGXRRiQPYTCgLcR4q8 n0IbqEYbH1hwNp2o/6oV1Aat7Ncy20VX4n2TWFFzo9u5qaSMiGWTRnvzxUXw2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665156414; a=rsa-sha256; cv=none; b=gzdrfkF56Isor1HLb7WL5Taj8K7maDoEPVPNvM2sYO7t9RgYhJDlYCfDvwiM3DZSxYvShD H6BtMGSM72ZLkgoYQkN/IWnds8SS4YRXWSi/ledkVGvMb80sDd5aHvVLD/KLH4JIYGIC6d 0FlmT264VXj9sedCa27IAjGBTw03P9+K5pLFq0OukDxzaOsTg3xi7ftCA3ViMBsNrAyiSu ky0TUlWDQBQRWLEwm6c6rGJmNV4+sqDwbwuBAdlQiBL1/p9IIy5nS7Z1LMoB5fteh8SSSM AXHt78zXxNmsiOLzbesanuLljTFcBlprf6A333F3z7fNzSBBYLs59XM837ALsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=641ef7e69a49d793092859f8777817b5ecc82c51 commit 641ef7e69a49d793092859f8777817b5ecc82c51 Author: Ed Maste AuthorDate: 2022-10-03 18:24:42 +0000 Commit: Ed Maste CommitDate: 2022-10-07 15:23:27 +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.) (cherry picked from commit 9515313b26beb005a521aff2e6edd4d75cd010da) --- 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);