From nobody Wed Oct 22 13:01:15 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 4cs8Rv3J9lz6FFXt; Wed, 22 Oct 2025 13:01:15 +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 4cs8Rv1Zn0z3phk; Wed, 22 Oct 2025 13:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138075; 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=seOPkIW8JICEHkXShF6BLopBVC0up58gXJ5NHh8NeaY=; b=Z+wwP+LiK80UNe4i4PPsVPmgiWvya5pbISrJtNIw8ir48v0BrwFFMQfbEQTgTrrxOdklqG sqQ95cXIg70CoFfa0qtekktIn+gH97s6giA74dv8O0FrkPuwApAfeKJXc3lA1Xd3IH6rXE UZb+xpdBp1cwBx8dWxdI0GxU+hmD/8b1B0jJF6cTxckoNSEbKg7ovVfFroqT4J0Na9oDmZ a7pmgBblaE4RYWVcIypEvN/hnjaAYFfMHdhKPfR97Eaqgl3p9V3HXm2iSBgqLsp8S/MuAR 8lHZLtCM7nhKD28WfK0ukBTAL6fp7CqqDb72L14XEXJdyNQ7HZhsEdN7Jffo9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138075; 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=seOPkIW8JICEHkXShF6BLopBVC0up58gXJ5NHh8NeaY=; b=qbOd0qFjCgs9u3BzfBs3Cx9Gp3JeoLD0jiL1Hhx7dWrFp79UQAVveYgrI1pQwiVkjG2yvf Pzn8oetOfolHUjD4wkrS/QJuwIeajf24qFLGwSgB/Tj4Rk1vJNo8tT74sv2+TZNob6L/iJ MvUw5rJapkEbsUOi6boJS+XQgK71rJtmPUcMwSwXv3w5OGK2qXTLi/EFKLKW9pJTQRNTjk 6pdQDhLWhil4HX08kDb8vuPNJhpJFu5DDi+70gE5WX5NwT4GY4jUTP8o2fTqaPuS9N70V0 YYbcYBkwswPhCTyvWuvyKH49tenfx27gj1ABqffQJ6GpC/PkVI3xrjDjStKlyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138075; a=rsa-sha256; cv=none; b=mpC/06hlQoZIT6OQtAMGQqG8/AkaMrUxI74AzCQ3Lb17uAPco+G3w6kOEcySJKTDtwcVFO LoW8iOXBPQ4Q/jl53xN9IRGciBEXrL41XMxmxUezLwVqXTHmf1eIk7o7VWEjHoAUBZHGqo ydMxZyTELvgvRbUggzOtOz4kwTiNNgJ2T8eQyWEfKsfs4tKysO1ajrlJAqBRoPHFLMEqiD 3oCLf81qcu3hq48oPzXuSvk9gbXa2EcpyGZE6nUj3a4/Epc8/3rVa4MF8vcHJg3W7XiBcq 9uxRBFsGVoaI4MZRegV/SnneLv0X2yVBMtv83gtiPaMlKIUsbxGSyQl+0Ff+Ig== 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 4cs8Rv10vxzTbL; Wed, 22 Oct 2025 13:01:15 +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 59MD1Fdk009764; Wed, 22 Oct 2025 13:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1Flf009761; Wed, 22 Oct 2025 13:01:15 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:15 GMT Message-Id: <202510221301.59MD1Flf009761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6dfca589ea75 - stable/14 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6dfca589ea75b9350af783c0b58eb632b0c752b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6dfca589ea75b9350af783c0b58eb632b0c752b5 commit 6dfca589ea75b9350af783c0b58eb632b0c752b5 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:12:57 +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 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) --- 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 4c83c91cf918..c97bf4bf80a9 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -1000,9 +1000,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); @@ -1105,7 +1107,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; @@ -1135,9 +1137,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