From nobody Thu Oct 31 13:46:52 2024 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 4XfQJr3DtDz5bk6D; Thu, 31 Oct 2024 13:46:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfQJr2l1dz4vcM; Thu, 31 Oct 2024 13:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730382412; 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=nvMOXogRGE3PuIYLdCHxc/n0PvTL/1PG0tlDbYjatvg=; b=sbglna9SVdV2cdXYPZg7cVx+Xy6tJrQvNkgclZQOrKk+/fVEUbtIfbFMuufp1lNACBk9YB LZu52iC4JBgKJOVXsSwf0yWIC3o80OYm00WRt2Syf3dPQ9E9Sn63oNmgANIDcO9VgvocKp CT0sOijlqE6hnSGN2pYsRkXUNEMcmkrY2jg89hmdfzHthTsZ3C3Zvgyy2iirBIagzGKbvE qYsi1aQHA2arHvO1WwJRUpQH/6s+dMtnNTEXc2J+CTmgxyIPEh5hC/36dgv32NL5GFdp6O RjRljOxusZ2a2HI0ErTkpGRD+LvBRErMsSGYMnraGI95LYJbrOwzVjy9blUJAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730382412; 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=nvMOXogRGE3PuIYLdCHxc/n0PvTL/1PG0tlDbYjatvg=; b=DWEyVQAV0AfO9gcTi2YSv2bcdBspN7sD3kfwYVM0bp++RNpJvlkFqFU33MsXbLgxibVwrT 0owC7sI8/EMUM80zFMkjzYJvAbTJCZEb7M/Sr4UDWG4V2QWzMKFQ5g8aVQnUeXRudqAYHf uLCOLr3R5gKgv7j8hptd2ABY0B+I0uWW4UC6BvCgNS0HdRoU2lkgcyhMbaPoun2w7+uV5+ 29IRktMQZX4rrC1lVMbg4L+Hx53hqP+jgupIEphYtb73SllXCr1sLKa3MMvWV/ZETT3FjH fx3Uo9fNapn6QSxzy0q277JjgqU1yCEtlD+QVRpe2V0oP0XelFdA42I7eA7waA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730382412; a=rsa-sha256; cv=none; b=Rk2mibIm7AvjYz623sD4F+2DbkWhpN1jZjXgJwb21j9eTwrs0NreQEEQa6BHhygL3EI/Iw 0o44onWKmmPbJv7hSOlQtzVZ+Hb5bMNwhO1aE9JSrVmYzgpWTCzp0dZ+tFQbUhTB5y00xd fvMgCkQachoFcg5hHfr2i4YuI3kOljZR/tFaHQMUD7CF84m+f2exqUVqfS1cYzwL916iFi Ik6rh+xYsaYEdDoH3++0LQgmwyOHDYOZ9GiUYooZ+41ZDlO5fAEBu6vSHNjO5Y7rmIsV7X D15lH+GkSXFFLkDhidqzwHM57iTW2tP0bkTQ5i84PJBwqnLhT7C4KEnOpjWJ2g== 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 4XfQJr2Cymzf49; Thu, 31 Oct 2024 13:46:52 +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 49VDkqoQ010797; Thu, 31 Oct 2024 13:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VDkqgG010794; Thu, 31 Oct 2024 13:46:52 GMT (envelope-from git) Date: Thu, 31 Oct 2024 13:46:52 GMT Message-Id: <202410311346.49VDkqgG010794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 406d75a5816e - stable/14 - MAC: improve consistency in error handling 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 406d75a5816eb45bc16197b0eff9360461541ad7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=406d75a5816eb45bc16197b0eff9360461541ad7 commit 406d75a5816eb45bc16197b0eff9360461541ad7 Author: Michael Tuexen AuthorDate: 2024-09-26 06:02:06 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 11:24:34 +0000 MAC: improve consistency in error handling Whenever mac_syncache_init() returns an error, ensure that *label = NULL. This simplifies the error handling by the caller. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46701 (cherry picked from commit 3f2792166aeed4baf07d351bcb12a9d196c443eb) --- sys/security/mac/mac_inet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c index 29a355071065..9770fa840f95 100644 --- a/sys/security/mac/mac_inet.c +++ b/sys/security/mac/mac_inet.c @@ -485,6 +485,7 @@ mac_syncache_init(struct label **label) MAC_POLICY_PERFORM_NOSLEEP(syncache_destroy_label, *label); mac_labelzone_free(*label); + *label = NULL; } return (error); } else