From nobody Mon Oct 27 12:55:10 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 4cwD4Z33fvz6DYZB; Mon, 27 Oct 2025 12:55:10 +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 4cwD4Z2RfDz3P43; Mon, 27 Oct 2025 12:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569710; 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=TWE85Nonpakt3yht8+LMa3AEldQnfzeIxeCGPt2Eqy4=; b=ownDq0VhxV7HyZ8Qe9lhEhJGczoMGRsLr+sehqKpzrTkpVte7/9ArZezD11jrwqzB23iBv r7SjnRNNhdlFkOB3gOKX6eaatB0fIX1jR93z59AjXdCDgGiBd4eOqAoecRyfgk0zi9b26T hQkpmpQLLCKYAgLX51fI/CXiM/NOYR8ZSZdhELwG0xL/iHR97/8q6o8xEGWzJ3QUGgKuNN JH6RKWXATSuKDkOP1Wq6bA/kWQ/WnQPnnIToBpLZbf9ZjcbsWmGDmV80R7UmNbEaFno1ap 0V+2Q00KNSgtl7mOQXvFzr42LFzWsLQCWtHnjqfJ+ZO3q0omxNbnRGU3OfFwIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569710; 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=TWE85Nonpakt3yht8+LMa3AEldQnfzeIxeCGPt2Eqy4=; b=whmvzKT9RCJkUrhoQ11ZfOTBesVxVkNkjZ9S14Apo3PLHWhqAbRq+guYp7MuWkxOhpSHG6 jVkGQTrHFJTtpoCYwpYMqmytm9jU8E/PxHiC5tPbmHhQuYgDfudgTS4wWB67IUdCGKUvKN F1hJleeksJlpZQivYsxylJ/19OSeC2QCT9mJ+CouAAxsE3DAcznGKa4sKkUc1sDC8Cpquj yQHJgGQrBdGxpoRyntgRsfLj7mWmO+5RnOjZoiXCK9bAL2nO4DeIznkoZzZie/QztA3wRb 4MdHh8IBioPwylU/noD89WXDrkomdX29FSrf1M5+Cha/czF/N8Sg6xVZdduaDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569710; a=rsa-sha256; cv=none; b=LXQVxjnndv/oy9eVg92s5/1qWpAkIwI0oNQkdGB3L4onOJ/C2FfUaeXW+6W27q8yzCUbQB wZPbq/mC8sDJ4VrTM6YiNVhg985fPj1sOC4bIQeEREif7kJyDAXPiATAG+0po3/+kFn9JL E2Vdy4tYu3KIU/w14mlFm6AX/AD/oaprTqA5S+xJ3pJqDoJ7JVs4+elt1yeFWAvlxpPQY+ x6t8J4qFPz+ex4y6wJ7S5/074UwzvcjDV4tmc9mfLxX2Tku10EoMPmsEak1HysaH3gIuGp gTelGdOqKRNZP7hxydJt7aNVfAUKdes3l4V/uL/28cD74xYYTtsPCIMp4uju5g== 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 4cwD4Z1vxdz1Jg9; Mon, 27 Oct 2025 12:55:10 +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 59RCtAg2072495; Mon, 27 Oct 2025 12:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RCtAsv072492; Mon, 27 Oct 2025 12:55:10 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:55:10 GMT Message-Id: <202510271255.59RCtAsv072492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 498e56142660 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 498e56142660c8dd864c878e820252358c9a15cf Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=498e56142660c8dd864c878e820252358c9a15cf commit 498e56142660c8dd864c878e820252358c9a15cf Author: Ed Maste AuthorDate: 2025-10-25 22:31:38 +0000 Commit: Ed Maste CommitDate: 2025-10-27 12:54:49 +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 --- 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 eed390ba5bec..a2b3e121e5df 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);