From nobody Wed Oct 29 13:45:34 2025 X-Original-To: dev-commits-src-branches@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 4cxT5q0cwLz6Dk2C; Wed, 29 Oct 2025 13:45:35 +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 4cxT5p5MN8z3Dlf; Wed, 29 Oct 2025 13:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745534; 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=d+cv932JM1fHEb8B21GEzC2KUsJ+URacRukgtf1uU2E=; b=unhP3Uq328V/rucBhAbkxGy+q5PNJnHCXGGCcKvL4s0/oHZrLbsaFxgsjIgYSSzyPTOU5e VVmwqtlNJT6N7g6BNcq1JG0zN1FcnGr6RCxfZ20STPtM2SAzlhzPjNZ7YRf2aL4RApPljb eBZUtg+Ovj2ukLijM1Rgre7ZssvMY7kDz9ntM0XL8ppmnh8AlVZkS638C586gzTmZClqRY v3dl+/Uhm5zrrHvoempyyihAPUuCgaoU4+JBc6I0HWuOqtBL9/S9tjPjiD6xk/XR4hx5Em RY/1JWpSNbwVcBiF7Ti0sPdjUiJtXiFn3tYMiSdI+uuKwkG1naRESwLhoxHWQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745534; 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=d+cv932JM1fHEb8B21GEzC2KUsJ+URacRukgtf1uU2E=; b=sRwpOS8vksHcB6fN+p+pz0bzGFBZ6FUpcH8Iy9uwVmxHsQBE+gTf873+tP2FxMjvGEKNQl ODsZE7QAwtWM/9SdJv1d1N+xC0hMLdtdE2QDf5XmrKSXQt2zpEVr7WZzQveyXXaaUaRNGd z25FAvXxFQTEDlUL2U4aywaiAxAvLVnrrbSAAifI1/X8Q16zcXJLlOKzZuZnMkbKtEE6i+ xU0FpJTaP1ewHSida20X0i+tb+C2omXN8yoH+FBOcyy8q4uvnavispZQaI4a/sqdRuXerp Ze7cIgMOeK/eecWwUu+6rRFlDmfC3qGtMZy4VRHyQirqsP4GmElZLgCWgnqyRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745534; a=rsa-sha256; cv=none; b=cP/2zY6nieY25pQDZuD5PP3MdT1q1jfxXCYfSZO+2JzRP1AwDPtZPk/aPszUDYbXLHIGbw BB8GD75BL9lMpt7EBrr4lIf328VEy9kYks+zROD86bUANkCN8mI1YbcYIjNxe1Tvb8KErP dqIWKqjCsEAiHZ4JdlP6aEPuB39Hlu86LEuTSCiMO+n5t/HB60bvRpjKAME0RM9Bf099Yw AJbHZO/8Qx86JPNNIQLLAzhcAU4BombViNrsYGTo5zJ1rG0EuJbKKzTHy7BTnuZhXbLwCp GMJSZp5vdnimu7uKYe0xDiLrNNEGnFgzvbSAvGGnWC2QrTcJYSMnbwuwEiHdWQ== 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 4cxT5p4yy0zfsV; Wed, 29 Oct 2025 13:45:34 +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 59TDjYMV024677; Wed, 29 Oct 2025 13:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDjYuE024674; Wed, 29 Oct 2025 13:45:34 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:45:34 GMT Message-Id: <202510291345.59TDjYuE024674@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: 97875c1c30f9 - stable/14 - ipfw: Correct error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 97875c1c30f9d8e9f607f52cee50a3f1627000a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=97875c1c30f9d8e9f607f52cee50a3f1627000a7 commit 97875c1c30f9d8e9f607f52cee50a3f1627000a7 Author: Ed Maste AuthorDate: 2025-10-25 22:31:38 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:45:11 +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) (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 beff243ecdbd..b41951b9b6b9 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -5575,7 +5575,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);