From nobody Wed Oct 22 20:15:24 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 4csL4s2dNPz6DJ1F; Wed, 22 Oct 2025 20:15: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 4csL4s08Tkz4JM5; Wed, 22 Oct 2025 20:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164125; 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=MHO9g3jL64D+Q38LMVnj+CD+9EEonm6f/dvEocG4ZDg=; b=vGJkT36/+8TcUPJ18NMAyTXllMQ87pmiKNujp9Zp4mSasUlXWF83Rsvsp6KM6WkpUqH4RY VRbnkfCGseCXG6lMU2maFzhg4rd76DZTZQRyuB1mqQniPP7mEFohc66efxrVq69SwlXcZa BULKl9UcFktj18r0FQtw9A4wyKgjSiHGK8A6OeNwWFTrJOkIoa0eIDL9A4aBvrXAXF67Ld vX6vL+DYzGLlFq18xh1yHy/Bf3on+BoQIwvDiO3188ivuFFBZ07Ce1ZvQfQ1CtN6kpG2gY 4+wO4Pk7ydScNNRJaz/iC9bjRfKQzrKNHJ8KttE3NOcOhxqLzIbUd+63YcJjfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164125; 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=MHO9g3jL64D+Q38LMVnj+CD+9EEonm6f/dvEocG4ZDg=; b=X13cJeBr7pTQtKc+3Cbs3kFgF4bhyMB82S7KaPwBz9ALxsNcLR0SQQa/GyuwStgvoOH2+N rJFpGaTwuqxFsC1scjmTENKj/bmQGNu4DIjEkTovytOji4oc4JL3ax7p4nvNYIujTorvbV ygMzcG++6A5NcH2vIrVWmWyq5SkfKOdBBtx0nOG4Zh5Uzsx8oo3qJLisHF3h0gGmNb+eTM H2vjzVAiUAlORJsSzYV4AMtu9mB9CCiP8LrO50z8oUohJeFUwputVndi0pF6nXpOLhhg2s MCr6jSrLHeaL0BHpg5JnV2Z3tSRkuUGd83J5Rmdk13fNsoNb/UMJq6Hkt9sKAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164125; a=rsa-sha256; cv=none; b=nV0m//keFtCfBSYN6fovkAw/bysxxSCTcOBlm3viOKycdlspj7MCyOoCYAp+UYipQQ9zs0 AHY08Ya3pos6ay8EcxxSyzxUcmFEpg6bwQOvNVEiR+BdmXKaepl9+l9Hywa7MTtJlLo9wB 8zqHMrFJW+4D0QKg761VUFIbOQt5D/hZyO2u8TAOSedSPlyPK8G+yiAPHljC1jbhxPStp8 ZnUmdeakJwK7+mq2kBM7khQvG+8QhMOpFi4595tQTTNcv5u2hrZbuEBSo7+BjJoORh5FAH ZAFAPghX0M3Ex/Op7InVsQDuqFoVbvKG9Roaa0+tLgdgjm0BFVDT8yf/mgHptA== 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 4csL4r6qx5zl28; Wed, 22 Oct 2025 20:15:24 +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 59MKFO36033048; Wed, 22 Oct 2025 20:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFONJ033045; Wed, 22 Oct 2025 20:15:24 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:24 GMT Message-Id: <202510222015.59MKFONJ033045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eaafcf841ce8 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: eaafcf841ce87f68756fabfa86e0abdaf0863e0a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eaafcf841ce87f68756fabfa86e0abdaf0863e0a commit eaafcf841ce87f68756fabfa86e0abdaf0863e0a Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:21 +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. Approved by: re (cperciva) Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) (cherry picked from commit 302c4c540e449e3fec02e27742f7572039347f66) --- 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