From nobody Thu Oct 30 04:23:49 2025 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 4cxrb95nSDz6Dk5K; Thu, 30 Oct 2025 04:23:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxrb9347sz3G6F; Thu, 30 Oct 2025 04:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798229; 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=N8hICl30o1+ekkcb3MiYEq9TnwioWeHc9X4HwiS8dZE=; b=BYV0iZP/fUMkyVE2I+glHkgminrZ/f+flErH7/bUJPwKP79Qtc5y4EC9BrLXBs66SY0aB5 Vvr1SIffqPRjTVNIhtbIxoI6X3Faz2zi3utTpMmkc/xWkaKHzew9RlzMsXlIOcDoLwmiE4 rjO34QguafbCIFVERXXCJz7m/0q7F7SJb5KUCrlBNBjaDagR+3Dqq6Mci4ER81RatjbucF jBFQV5yrRhebca+ubWDc/UIOp8W//2AZITG5HTIGOtVINZW20/H9TkvGw+NNnZQDoeUGvW +TO9hnttoNa+pITV/wRGJxxdp3Okex+vOVRJK0lBBSkwNnU0EfzNtdB96Qplog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798229; 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=N8hICl30o1+ekkcb3MiYEq9TnwioWeHc9X4HwiS8dZE=; b=i/umTVzCJKMpYnu8XW/N91EytvW5MkQYRTIUcdpulgs+e9ZcwyNZJ2dqewomqt0des9va1 k8JhVpa7Xig6PmE+yhI1U+qRxUsaF6wVNTii5INXD56Pk8d8bb4IXgaryfibanSmCAMsCL 1mc3O5Qc5L9KOaDgjWHYNEFHqj+CktZns9MBA5x8AqtLonEWHtbTDIJ+JR8XKf+Z2eMErD /cvWF4JjYnAis9qFhaAXRRxtam9jOrPK8MC5fnfjZAzwxFbbGcI0u7PbONe+NBd8qnWzTv d3QtYQj3KNM+TGEvHHtcQo4gJnyw98PJnD6nQwZ8mFVEwkL3reRMNSR76GMs3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798229; a=rsa-sha256; cv=none; b=IL8ExGmfQyTqv4imO3YVz/JsBtAK7AFihdrvY4AYzo8is/Y4WTlJSt8L5lE1bU7jVFfWcF mHQJnzCurga+63zPhQwAM0a/f67rKb6nIb+2d3KdVDFcOK9YYCENuosN783JRdGPnHfKkc othfUCHd+6oFC3vcTlU6f60w9665jHNb/93jaH1bUJN+9R7qTKNht8ZD0HZLRTgAVDL8Hq IVPUkboLwOlC+oeX/cNlmkiD2CCkv5BtVY3gC1C3syoK1iZ3CixMZMSb4I9Q52i6LMGV+8 xPFQ0q/NdeAZU5u802vdx38hqWFWl+tzwc7g02UOeBB0fqxHno0PwPIhnmjFNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxrb92gmdz165Z; Thu, 30 Oct 2025 04:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59U4Nn8b084608; Thu, 30 Oct 2025 04:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4Nn6r084605; Thu, 30 Oct 2025 04:23:49 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:49 GMT Message-Id: <202510300423.59U4Nn6r084605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a986bf1f4a84 - releng/15.0 - ipfw: Correct error message 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a986bf1f4a84b4a6892fc10d14c31594d7dfc211 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a986bf1f4a84b4a6892fc10d14c31594d7dfc211 commit a986bf1f4a84b4a6892fc10d14c31594d7dfc211 Author: Ed Maste AuthorDate: 2025-10-25 22:31:38 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:23:07 +0000 ipfw: Correct error message The failed allocation in the error pertains to IP_FW_XADD, not IP_FW_ADD. Approved by: re (cperciva) Reviewed by: ae Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53359 (cherry picked from commit 498e56142660c8dd864c878e820252358c9a15cf) (cherry picked from commit c22437c8b574878241a3c897a095ae6939e66743) --- sbin/ipfw/ipfw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 2addc0295f0f..864adbf14d92 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -5802,7 +5802,7 @@ ipfw_add(char *av[]) sz = default_off + sizeof(ipfw_obj_ctlv) + tlen + rlen; if ((tbuf = calloc(1, sz)) == NULL) - err(EX_UNAVAILABLE, "malloc() failed for IP_FW_ADD"); + err(EX_UNAVAILABLE, "malloc() failed for IP_FW_XADD"); op3 = (ip_fw3_opheader *)tbuf; /* Tables first */ ctlv = (ipfw_obj_ctlv *)(op3 + 1);