From nobody Thu Oct 31 16:46:45 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 4XfVJP3gWDz5c1dq; Thu, 31 Oct 2024 16:46:45 +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 4XfVJP2vRJz4jMZ; Thu, 31 Oct 2024 16:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730393205; 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=EzifCIJAIO+ynPN6dUDTTICBMZfTEMKkYX5P5tTAbQg=; b=hvAdQkqmhEzAWxUAZmSzPo65KgRW9eHm2NI4XG+vabIOI+pYBtGEEVk9hjvq+55wA/LF4u s9JGkVTrnVuEMdxBP8HYc+NXCepaP/jg+h4a0Jje347vgwMl5Oo63dbiWMQQvuqmQ1r28J k+W1p6JTZ1KqehLLCFCYYS0i9S3CXTFVjn9n2aT5GdiTlKVT/yCagsRAYUhQs2Ax0nfciA CQ62bHLCZUcXRz6b4bZhM0M2bAyZAzHKMl6YG1AThfuR58P9SKZP1CHrOYdynAmEBsN9Lw HMaHnpil2+9WfESJ4t6jwZfuVZFF+vTkA3npumMJo31IeEtHbf34h9jjxhnqGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730393205; 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=EzifCIJAIO+ynPN6dUDTTICBMZfTEMKkYX5P5tTAbQg=; b=RNpQLoxsiELEkSvTPflyMtsNHn8s9qr3MrCZst4xSkZyuaihJeWBVOQD1M53IBFz16j3KQ ggM60118741IaAfmVzJ3NER+wZX1gsFoxdI/VPmxdUOFe9v/Uic18+jqbNe/6nWMSSjgVk rKVRF3ag9UZftgCJ1kJeSaI1GHB5vw6HcjBthphO/taxYh/ooBsSmm/rOxIu7NhfJa/APa ivo3zJBRMl1cT+jzAe9lOVJn+Slhjp16N3FPAIxtRyzCXcfNhjauAZpCKLDjApl2MStDOT BB2ss7Z0tdLH4uxyJygtVkevgTBVO0NQWmVjNBl5MxqV4Cbt698NzEIDG/7p1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730393205; a=rsa-sha256; cv=none; b=uZQZm/I5XjGU1HT+kVBHdkrWEfEV7UY2qa9Lj8R/OxaNFqnoQTFXS43BgGMxeCh3HeoBE+ 1D/GpYvTaExLq13NgXANDKo1mXc93PLPkwQrANFTAKTFc52Gr0ntX/cZVCH9fPxkvTLHJ9 yxGh7TjQhsb86s9BTzgPnHy/u09L7P95r009D5v0J8RnCds0n4lH3xgI3zCHauC2k9y9gq /9cy5VR2msJs5Ypjz3/Py13kpdPI1ByJJYFVyAbQqmPzomGV976adjMDv/YvDOsXidDwEm E9Cgn/VPC1RjJjwzYyD7I61tce40FRvpB77WPqGtA5fz7nBXXgWlOLq0Avk7nw== 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 4XfVJP2VhQzkrt; Thu, 31 Oct 2024 16:46:45 +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 49VGkjNH051479; Thu, 31 Oct 2024 16:46:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VGkjX2051476; Thu, 31 Oct 2024 16:46:45 GMT (envelope-from git) Date: Thu, 31 Oct 2024 16:46:45 GMT Message-Id: <202410311646.49VGkjX2051476@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: c7e7794e9546 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c7e7794e954604048ecfe9468237b2bb3d95bd1c Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e7794e954604048ecfe9468237b2bb3d95bd1c commit c7e7794e954604048ecfe9468237b2bb3d95bd1c Author: Michael Tuexen AuthorDate: 2024-09-26 06:02:06 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 16:45:49 +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 231887e4e73c..c88d573719a6 100644 --- a/sys/security/mac/mac_inet.c +++ b/sys/security/mac/mac_inet.c @@ -474,6 +474,7 @@ mac_syncache_init(struct label **label) MAC_POLICY_PERFORM_NOSLEEP(syncache_destroy_label, *label); mac_labelzone_free(*label); + *label = NULL; } return (error); } else