From nobody Tue Oct 14 13:51:25 2025 X-Original-To: dev-commits-src-main@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 4cmFxT3LMgz6CT3k; Tue, 14 Oct 2025 13:51:25 +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 4cmFxT1JDyz3Stw; Tue, 14 Oct 2025 13:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760449885; 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=btTAF2xBJwI4HTTmO1jUS+IXDsAtZHGhFo6fU8bpYt8=; b=h+vBGcU/GUK+AYrlfWntjf/Wz2dV5MmVAN7kpd3j8mEhQCQ/MzNSxR/cxCUKOlxq4Grfvj 6toebCb6q1Mh9fDVuasZcokRCxXYZSkw7vX3MXuHxbWYTnpU2WzTXNiBIFght44i8Fi9EJ aHX9aKanod9acjSbjp/ugyjwQfbs22WAWsuxley6G1NxLz1ew4iDk0uWLtF85CNLuerfRs ARybrCEidqClNahDzLNMXQK/Q1lHYua3pT0QSVg3NAFuis4pasl6it+HaZu3LX2GbyBblV 6njUCb/TpZS9SOYFDzB+pigAoNH/L++r9o+kR7lrs+QO2Ra4F8uVohZ3g3DTbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760449885; 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=btTAF2xBJwI4HTTmO1jUS+IXDsAtZHGhFo6fU8bpYt8=; b=fpA954sv6533JmrsUjbLV6CiHuv032l5t6UvdOUbFzXkr0cVbUrrhakMq291GmUsO0qElf pF9sV35KMoss5I/MnCYGn6ryq+8kKuVO0RH7i36yEoWg0y+TlQWN7MFuDoPze1tQcf1Pqq ki5XU1Jh/VrBJjxAVAPU96cTJSSApt/p0j8BE57FQZNC2X2OLInP+HE/FkV4AyoBughEsy /pil64SguZbg1hBOYmu8j28DkCPg9QH7W+Ub6Q/Wg0jQokoliQ4u0VHhHyATe2N0aa/5Gt 2F8r/NoAz3J7NCSB+eT6GWdncyMDvPsJ9d+yloiZzL4gpOGibEmV0WG0qlgYKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760449885; a=rsa-sha256; cv=none; b=OZj9E62gz2Hmy0bPXo2tlBtReIMaLiBdT3CI470rJOjxCtlyd8cF35++3WNqmPtGaYNFQl UMoM7yOCCymGomOESvRyZCyy/jwz7qd/06s+hHMlIMXZIXifVpLzWsy623ao+M9SQLRh9k PquUNdoGekT4EZHeiu/P6ZKU3SmPriIPD4prH0A0Ev9JUg2WQ0YmapDsfFHM+vBM3O1DBi d3E7HZVJsI1XJJlzCk/DX8n31uqeECCoimdCYWLO95LSiEj/3JcmZDmnuOQqQsmEwS8nea qXIuGtWIN+aAbWejZ1UNvqvZHPcvQ0dEh+8k6pcDdCiXZzleFzsnFbA05pL7/Q== 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 4cmFxT0t6kzvsN; Tue, 14 Oct 2025 13:51:25 +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 59EDpP6K083199; Tue, 14 Oct 2025 13:51:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59EDpPaW083196; Tue, 14 Oct 2025 13:51:25 GMT (envelope-from git) Date: Tue, 14 Oct 2025 13:51:25 GMT Message-Id: <202510141351.59EDpPaW083196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2df39ce5d4a8 - main - ipfw: Check for errors from sooptcopyin() and sooptcopyout() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2df39ce5d4a8836ef5fd3c2666f48041042eff42 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2df39ce5d4a8836ef5fd3c2666f48041042eff42 commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-14 13:41:20 +0000 ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 --- sys/netpfil/ipfw/ip_fw_nat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 1cee7873de31..8bd27f6885ab 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -999,9 +999,11 @@ ipfw_nat_del(struct sockopt *sopt) { struct cfg_nat *ptr; struct ip_fw_chain *chain = &V_layer3_chain; - int i; + int error, i; - sooptcopyin(sopt, &i, sizeof i, sizeof i); + error = sooptcopyin(sopt, &i, sizeof i, sizeof i); + if (error != 0) + return (error); /* XXX validate i */ IPFW_UH_WLOCK(chain); ptr = lookup_nat(&chain->nat, i); @@ -1104,7 +1106,7 @@ ipfw_nat_get_log(struct sockopt *sopt) { uint8_t *data; struct cfg_nat *ptr; - int i, size; + int error, i, size; struct ip_fw_chain *chain; IPFW_RLOCK_TRACKER; @@ -1134,9 +1136,9 @@ ipfw_nat_get_log(struct sockopt *sopt) i += LIBALIAS_BUF_SIZE; } IPFW_RUNLOCK(chain); - sooptcopyout(sopt, data, size); + error = sooptcopyout(sopt, data, size); free(data, M_IPFW); - return(0); + return (error); } static int