From nobody Wed Oct 29 13:40: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 4cxT0K5DYZz6DjxW; Wed, 29 Oct 2025 13:40: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 4cxT0K3wskz3Btr; Wed, 29 Oct 2025 13:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745249; 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=CH1lyuwjFaye6tGcFJ6ZaPfL0n3RgVMPAkNVBwRg7VU=; b=cCmreXoUBrWNaEua62gOYBHr40xLoKQspdFPJ9XIXAplXgLuUkV4cQtDNEW1oRvvX7xo6Y 8ZAp9uqvG1UTShfl8t2+G5VL5o/3wUEqrYHzvs+segkyhT+uNXpqb0zPXRdcxSfiQXeQdP uBAqSonZ4hMiPNXqzRMjfGEmPNp9a0zWQq4emsB4rqFfya8AWsZVKgSOgTqK3hTiYP0Pqp dAWdF47qx9ZD+AtHpPe7oE7kREHat/lvlZdHlUzlfQQhaDa0misFZbeYs77wsQgqBlGZ8X 2QH4eH1AZLuJzf6pMstlQmAu6MgewkXsLEDXjnDiRay58RRGGWjlRq9Qg6gO/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745249; 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=CH1lyuwjFaye6tGcFJ6ZaPfL0n3RgVMPAkNVBwRg7VU=; b=mp57gGvPqnFomgJy4svO3yHWQ0rU0SI/91xuck1Xwt4z5N5eTXfnBlHCQG8sen9LsH5zmO AMlZbPNPZEi+J9lKqqCuoVsb+j0kJAb8drbXXHa1ldZrREZKaIHMtIpqIxDHCBmZY7yBk1 V13YNKGUjVFpTee27zLSjZpJ4AWNSJuG/lKB1YLfibAdNSenIpLslRcrIlpWg0AiGIxAX7 f3jnqFCjtDzxtOtSIzFSSovX2a0P9G1pApnG7ILbuueOaN50bq9ZqUIAqq9x2PC9W+6NT2 JDJ5sMi/Sr9pDY+7AdN4KGw4wwgtxcnqJZ3/ZwdAJI06xjbGobuIb4DcA8NU3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745249; a=rsa-sha256; cv=none; b=MToYjkEkX3g9qGF9HyECT1EOngr5/4wSC66HgI3SH+ckKUGUTipO6oPj6NKKEfpoMFRMqq X6x6M5dv4z7H12SvVyktvxhcFpyI7rbytNHBXKnbiPENTti9q68rz06HLn9LprpQyfqjxf UawXESH0ailH/px0lwVs3nbYJYtUjuMOj/N7qO97pbjB2QmH5xpTIp3b7nkdtbuRIqwR7H FoQ/OpX1XSZWP7i8yb2u/Yv6/ZcV73w0TKhWb27zlJXIFETNO97DVhy0po3CZMcg1J/ZQB 1p0bHx5hZKVEnmWWNGB8aOl2UGwyqi2lLz+F2A0Fv1iH60q/01yxJyTVJONDSw== 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 4cxT0K3WVLzddV; Wed, 29 Oct 2025 13:40: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 59TDen6Y015672; Wed, 29 Oct 2025 13:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDenPg015670; Wed, 29 Oct 2025 13:40:49 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:40:49 GMT Message-Id: <202510291340.59TDenPg015670@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: c22437c8b574 - stable/15 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c22437c8b574878241a3c897a095ae6939e66743 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c22437c8b574878241a3c897a095ae6939e66743 commit c22437c8b574878241a3c897a095ae6939e66743 Author: Ed Maste AuthorDate: 2025-10-25 22:31:38 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:40:29 +0000 ipfw: Correct error message The failed allocation in the error pertains to IP_FW_XADD, not IP_FW_ADD. Reviewed by: ae Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53359 (cherry picked from commit 498e56142660c8dd864c878e820252358c9a15cf) --- 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);