From nobody Wed Dec 28 17:40:05 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 4NhzLY6NRdz2kg8K; Wed, 28 Dec 2022 17:40:05 +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 4NhzLY4lXdz40qL; Wed, 28 Dec 2022 17:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672249205; 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=URUsXFD9OT9CVprbo7dqVGce8lziE580x2b7GrXvUuA=; b=MRsh1/XAVDxJVEChLT7QEbQNw4FP7NTlcAaffBx0BCqabxJVA1cAz29+UfF832AtDhPq4c 5jEd2NG8YIwelfzdGUgGb/8IYCLEPccWceW5kqljgY35CjWCdgHVqFqzNzxlrBLIMLKGbk IhSDhkHc0WJ01n5ECMUpORPgIkQp8pCfyz8KoiCoeV1ROtM9P/FzXwcsZwEVNaQOygC4t9 fJGxieh3b09EzjYsAbeTJrF7MiFZ0vkdA96zysFsIwU0ER00doBix0nxMG3RLhJzhopev/ G7sK6LyV/ECoWmAn2FFd3zwPD+XQfGlf923cbbl5t1TiJkQPyGsMxw4W5tXVOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672249205; 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=URUsXFD9OT9CVprbo7dqVGce8lziE580x2b7GrXvUuA=; b=TPotM7SzVZ1etsDct1fcLFCSMhzM6pXK2BuhyGAKqsKhBoYgnaCRyfYJVLqXqojrnMW6mn 8Gbj+iVjCSMrHQuVGoo2MQXC6aMW10oG2c7XpHm7ll/r9N66yQr2RIMkZat5m5muUhsQul 7W/1nM4xKLPUM4a4lf1HuVaQ91YuWgIV1nnGptDC32dbIQ67xAXJdrFM3cb7Ixe1lbtiWb FDURxz8ueyCsokzgHy+aD25DRGj7Ifb8VO5078t2VqEoGB+FO+iilw2dmGNRkBsV6Ram55 3V/x+149XYeNDSCsnrA/9vmCm2w6KbO/4r5ij5SoDfh6Nzs2SF5ZeyaYdslxJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672249205; a=rsa-sha256; cv=none; b=SOi24ZwdaBvjuv12WS77sN26G9sX8x+FhtGGZKmaQwlFeX4rNjlu3bOH5q3HLwDOKm8byX MS7ehzVs93UKbzVSDSZBS3CzMQu0DOsF64Zfu3sbtCgtqnN1QoJmOKbpd8Myo4oHX0BGUA PrSfYjUWUYcQ3oBXxIiWAIHS+n1/veNLb+WSERGzMpLW35Z4bSaaIgBEW04esO0KQk04le b9+XWSqJN0BQ2tYNe/YfN1qaKmUNbiPAmrbWACLg06cx86EY9jUbuv7o1TXcx18/C/Nb1q WRuIdeSZR38WWIz2r0jRZuNYj9EazyfdnaBC1oQQ9WOrwhdysYl9SnOMOBp+Lg== 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 4NhzLY3qgjzxxt; Wed, 28 Dec 2022 17:40:05 +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 2BSHe5aR097417; Wed, 28 Dec 2022 17:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BSHe5ol097414; Wed, 28 Dec 2022 17:40:05 GMT (envelope-from git) Date: Wed, 28 Dec 2022 17:40:05 GMT Message-Id: <202212281740.2BSHe5ol097414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d13121853497 - main - h_resolv: Fix a buffer overflow in load(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d131218534977f1b2ed590380e70d59a3b20b333 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d131218534977f1b2ed590380e70d59a3b20b333 commit d131218534977f1b2ed590380e70d59a3b20b333 Author: John Baldwin AuthorDate: 2022-12-28 17:39:18 +0000 Commit: John Baldwin CommitDate: 2022-12-28 17:39:18 +0000 h_resolv: Fix a buffer overflow in load(). fgetln() returns a pointer to an array of characters that is 'len' characters long, not 'len + 1'. While here, overwriting the contents of the buffer returned by fgetln isn't really safe, so switch to using getline() instead. Note that these fixes are a subset of those applied to a near-identical copy of this function in libc's resolv_test.c in commit 2afeaad315ac19450389b8f2befdbe7c91c37818. Reviewed by: ngie Reported by: CHERI (buffer overflow) Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D37886 --- contrib/netbsd-tests/lib/libpthread/h_resolv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/netbsd-tests/lib/libpthread/h_resolv.c b/contrib/netbsd-tests/lib/libpthread/h_resolv.c index 9c5fedcc2e7f..d8756de96d23 100644 --- a/contrib/netbsd-tests/lib/libpthread/h_resolv.c +++ b/contrib/netbsd-tests/lib/libpthread/h_resolv.c @@ -73,18 +73,18 @@ static void load(const char *fname) { FILE *fp; - size_t len; + size_t linecap; char *line; if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); - while ((line = fgetln(fp, &len)) != NULL) { - char c = line[len]; + line = NULL; + linecap = 0; + while (getline(&line, &linecap, fp) >= 0) { char *ptr; - line[len] = '\0'; + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) sl_add(hosts, strdup(ptr)); - line[len] = c; } (void)fclose(fp);