From nobody Wed Oct 22 12:52:37 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 4cs8Fx5Jmqz6FF9G; Wed, 22 Oct 2025 12:52:37 +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 4cs8Fx4cPrz3mWR; Wed, 22 Oct 2025 12:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137557; 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=bV8UONL7KChXBoUYt6hvtZU5LzZO5RNNaLkGyHO9HOk=; b=bXTrN0jr/LAvXU0y+RhUEC2ss2qIhSrPUBbYdojzgxVnF5bWghFMH5+2BVKn1Y0BTmoNHg OjwTAXLFA/rETTvyWHctEVqx5xqfR2Y0qlmBIpg9HiauhSuXCyqd14Os0feX3cbVdkPyk3 rCnIAmujh8z1IP2AcRTcmKS/KpldpFps9E/DjATdQmm55zmdtMfYDgPmARsRIG8CT5AiN7 WbwHlP/r9GwZtWmzhC2fK9BQasSAzZ9j/2ohOkEGdyn1mca6MfTdcbjPDZY4sPVglCJCpW JvY19t3Yc6W7XNd5L3PL4u9H7z88f5o/1N10LXThWkcPpwb2ftwSuj1rRSMrJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137557; 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=bV8UONL7KChXBoUYt6hvtZU5LzZO5RNNaLkGyHO9HOk=; b=mb9No9hVX/v9Ak5H94OnDdFIn0Uxwdk0+YsyX3GOkdlb85Z+Y1Oci93f4YXVQ+AzzzDvGQ 3YThiCzjo6mOqMprZvFmU55wU2Xz1zd9eb8ZlqtHzTwLamQUdSV4v2GhcoiGl1Kt6bASUj bABqGUDxrfgpYoN10seUZcceryI3Ey2jYzPmJSSsy3uGycwHZzgJ03plkQ0074cBS96LGz lDfvTmQrTi5fFc1xTzQSELZrxUP5L5qN/o1B3GSZEFavNAhh6f9jhc88+qoIUNdvTMR0vC XCNM5NrD+EOZpWUMLR97Quy79zUXQicsbLQpJOZRko9NfZeCMrUp/EVXlsIS8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137557; a=rsa-sha256; cv=none; b=uX3oXWQQxJEmykqGAal5Da/542P5aOWVM9gi8AZX1e2TMcL6hzuG8nA85dBOsXTFRO/axS tncWwY8HCgMyn4mZ6ZAO6kqd8VFnGsbpQ/cbokE2va8PlekBGad6PAYwYFCKD3gHj5YzWl zYzHavuWOjH2IqGNbn/2kfl09YP/0MBhn5WIyV6PXRcV3dCaMxTW7kOQfiFeqHRDN8Tnb+ 5w1o3O8EYLn8SHbTLyZC9xcE9Isw9mp5hHwCPN3o+TqWGg+a5pmOqzvzs0nGAysDw+jpTl 1hRH6XHfgtOGj07qhIupM4FSJUHnfgpULt/JaIhMPGDXieezDOqVSFMxaPo9tg== 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 4cs8Fx48HYzTb8; Wed, 22 Oct 2025 12:52:37 +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 59MCqb92096136; Wed, 22 Oct 2025 12:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqbBu096133; Wed, 22 Oct 2025 12:52:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:37 GMT Message-Id: <202510221252.59MCqbBu096133@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: 302c4c540e44 - stable/15 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 302c4c540e449e3fec02e27742f7572039347f66 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=302c4c540e449e3fec02e27742f7572039347f66 commit 302c4c540e449e3fec02e27742f7572039347f66 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +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 1e2ff1bca290..19393d5b8444 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