From nobody Thu Nov 05 15:12:08 2026 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 4jL5Q13GPJz709qd for ; Thu, 05 Nov 2026 15:12:09 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL5Q071WLz4Brp for ; Thu, 05 Nov 2026 15:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891529; 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=J/L7l1Sqa82dj3lkhRkzUXtvZiGBVnVBkyelkzZWtg4=; b=M89ng8CXyGimAY6mL7D8Fhg6+EpaW3m6E+0JV0thkSARZUKoIbHI4PVhZgmvvPGH3VhScT Gyt11lq/5LyoQlxIc6SoYyzZI3CDyPZphgGcZSZpDlZeJJ3QYgba9QS4oDnRVgPVhQMGqN /z9MR793VUZkF/xcHy/2elLKEzsYNZgliexoFIcf4vQRYXM9tYORCnD4AZFdkB89tOyVwJ yBm4dqKIL/JNI1rIXy2ndRzyw5nR/MPjt4l1TSd8MdXc6r/3tg+6AwevB2XRiiLGZH6SuJ sEUNMi/7h7O1vFnehDcHC7HKF+gv0MOEgA+4gRBPr6Cq2krWSb9P90klgAEqNQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891529; b=vWrWqN9I/bzmJTxR80+sa8AgDwodxmMAyon93+0c7ei+tio3UpdNpBSvFpmWamKtZ2ACAD 5lk3CTQGF7kCQt7+GhjE50VThqC6pOJgNbZ4goc2iXliJtNAJM0HcamT5U3aRNkl+Z/oa+ +pfZWFX35W7KnG/4LG3AHY/gqujMbNbCf+ylFvOia4yPBFoo7CpfRCYh9oLSp9r5p4L0p6 Yl8zUZ//li0ajud5eBVuOS5RlWTosdfcwB+dg432bo8N7XRggJJxVFWzLCHOWRznu84KVa sMMSHoKgThPkTEirdNLahSIjLYqtyGg0kcddRoMNxgeY2VGBZ3JoqGtuNW0cPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891529; 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=J/L7l1Sqa82dj3lkhRkzUXtvZiGBVnVBkyelkzZWtg4=; b=kz/viV+I7QJQJ1dG8FjOi3J9AzxkC4HyT/H+79LEO7aNJLatDfYv/aYSXzBf7YExbKniY1 Yz1qHHmkLBJ5ovFf5mwlG9TtLLeLl+izQwFs8WXJlKrOlRQCVRAY66gWzVq6PjkhmbSQHn /2Mtx+FcLoxPSXQ4xAdNGC0fwUxUmIUdm6PKzOsNrXPRRHFIWaG9WGGhkrapUt57o58Sw8 aFf04xnWh9zvzAzseNCHMPilOoar1vVgKTUZrljguEOPHteI0sIzKNr1mxYnnXUewUJRg1 5MwH4kfvDO/81zvEhfH+e2MiNxAkXyxvsa6Ok0sHyMgSKLFflxrfFC402xKO0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL5Q06f0wzvqq for ; Thu, 05 Nov 2026 15:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3bad251da53c - stable/15 - libfetch: Limit response line length List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3bad251da53c7d6f30a391aa93b37715e2b1c61d Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:08 +0000 Message-Id: <6aec9cc8.245a1.258f67c4@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3bad251da53c7d6f30a391aa93b37715e2b1c61d commit 3bad251da53c7d6f30a391aa93b37715e2b1c61d Author: Dag-Erling Smørgrav AuthorDate: 2026-09-30 16:54:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:51 +0000 libfetch: Limit response line length When reading an FTP or HTTP response, error out if we read 64 kB before hitting a newline. Otherwise a runaway or malicious server could have us spinning for quite a while allocating more and more memory before we gave up or crashed. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60007 (cherry picked from commit 64ce9daab9ee49b4647f43141a830d7518723142) --- lib/libfetch/common.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 431fd781ac6a..da0ea6f8aaeb 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -57,6 +57,8 @@ #include "fetch.h" #include "common.h" +/* Maximum length of a line, newline included, for fetch_getln() */ +#define FETCH_LINE_MAX 65536 /*** Local data **************************************************************/ @@ -1466,9 +1468,15 @@ fetch_getln(conn_t *conn) /* look at the data we already have */ if (conn->pos < conn->buflen) { conn->line = conn->buf + conn->pos; - while (conn->pos < conn->buflen) + while (conn->pos < conn->buflen) { if (conn->buf[conn->pos++] == '\n') goto found; + if (conn->buf + conn->pos - conn->line >= + FETCH_LINE_MAX) { + errno = EPROTO; + goto fail; + } + } /* reset for the upcoming memmove() */ conn->pos = conn->line - conn->buf; } @@ -1498,9 +1506,14 @@ fetch_getln(conn_t *conn) if (rlen == 0) break; /* look for a newline */ - while (conn->pos < conn->buflen) + while (conn->pos < conn->buflen) { if (conn->buf[conn->pos++] == '\n') goto found; + if (conn->pos >= FETCH_LINE_MAX) { + errno = EPROTO; + goto fail; + } + } /* do we need a bigger buffer? */ if (conn->buflen > conn->bufsize / 2) { tmp = conn->buf;