From nobody Wed Oct 22 13:02:00 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 4cs8Sm4Z5dz6FFYD; Wed, 22 Oct 2025 13:02:00 +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 4cs8Sm33lzz3r7N; Wed, 22 Oct 2025 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138120; 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=WPa3/2sT6GY/M92rib61Bo+Of1N4KxF0rlO4OLHBhkk=; b=FZxqdiM+1iglvif6Bx8vBLhoHNso6NgQowJSTRGdpJKjtwVe4ohp8NhZ1LSXxqqf+nxJA8 lLPXZqeuN5W0giDNNeImc0PLwgyb9m2ZEOnCf+1FdXLgKYyQ8C6QmXh8eeQmhbEc9aTMbM //ZiyC9/CBlHuVA6egkmj+lbP00kMZa+CTmY+1BMBXmsXlHnWEEFtkGHLeFw3EPmlK4A1b dbAL/DI+nCUYsKdxJcDL+q8cXr567mnNKRlM8h/y3dzh9VJ2DRYRFzikN4vkstUodYd9ro rXnTaBFaChP1KTRxjcOyyxG3qjs1kZTn6LuZpctFarXY9cYyk01KAKtPP1B4jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138120; 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=WPa3/2sT6GY/M92rib61Bo+Of1N4KxF0rlO4OLHBhkk=; b=EsSi8Ex9uZ6zTYKQ525apOlkStup/O86L1z1ZoAxHGOUbbvxWLVv0xwEEdJ5fKYyt9xHtu aJ6jaX3XBGYNWG7GC5tTLYohtEw9MZHv8+6777baMg2oE0GvyDvTVxu3ogIzERXbNZlfym uiRLphDiNGkD4QJDlX0j21KOSeglCqyZzXU3Rh6yK1RgTVNegIM0o2VYcd6pXDnOBPAoaY CtB9dJvIvFVnl0mQ7xebbFjzqJ4x/snOQ+hU0l2Gmfk/lchZsrFcwP1lQElT7wY2bq7ZQm 5L+yXQM0FmSCmKrYKUDyWWvvfKhQzETLxuPyY/AHI6EAXwT41mqK08J547iZbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138120; a=rsa-sha256; cv=none; b=CMGHa02RSmoYCLpWgRkUTDJp+ULXboO36KV528OJP5GR5dRXH0kHsXqhHfoDdxZyzkpi/E 0cxmCxiBR3koin436E6IC0thx9TG0eWUDXeydWwyr7nWA5Mx0IVMpsfCrrX90QYl3kaXPK mQrXcc9MjttHIcpzmXoMTM0ahFyxt+ikTxFYysM1YUXZ0ias+5crkLeXX4TJ4VPHQbKiJ+ je1UVkxAk7laH784MdZbMLJSL64LPHzgfl/rwQ+/FIlZfZQh5kRkJ+xRhxppj7Im44dU/T LjIa5mDcE/Rbjzvghg0yTfm7FtsgE25nmCydLxG9zWjQnlwfxl/E+VZU1sKHCQ== 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 4cs8Sm2Xq5zVTF; Wed, 22 Oct 2025 13:02:00 +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 59MD20de011290; Wed, 22 Oct 2025 13:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD20Bx011287; Wed, 22 Oct 2025 13:02:00 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:02:00 GMT Message-Id: <202510221302.59MD20Bx011287@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: c839eecec5e2 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c839eecec5e25c7a998a274107ab073444fc5d6a Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c839eecec5e25c7a998a274107ab073444fc5d6a commit c839eecec5e25c7a998a274107ab073444fc5d6a Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:13:03 +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 8920e8d3e713..bd33d73ed013 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