linux-kernel - [PATCH 1/1] selinux: add the processing of the failure of avc_add_xperms

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240807090057.1334-1-thunder.leizhen@huaweicloud.com>
Date: Wed,  7 Aug 2024 17:00:56 +0800
From: thunder.leizhen@...weicloud.com
To: Paul Moore <paul@...l-moore.com>,
	Stephen Smalley <stephen.smalley.work@...il.com>,
	Ondrej Mosnacek <omosnace@...hat.com>,
	selinux@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: Zhen Lei <thunder.leizhen@...wei.com>,
	Nick Kralevich <nnk@...gle.com>,
	Jeff Vander Stoep <jeffv@...gle.com>
Subject: [PATCH 1/1] selinux: add the processing of the failure of avc_add_xperms_decision()

From: Zhen Lei <thunder.leizhen@...wei.com>

When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.

Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work@...il.com>
Signed-off-by: Zhen Lei <thunder.leizhen@...wei.com>
---
 security/selinux/avc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d8d8..b49c44869dc4627 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
 		node->ae.avd.auditdeny &= ~perms;
 		break;
 	case AVC_CALLBACK_ADD_XPERMS:
-		avc_add_xperms_decision(node, xpd);
+		rc = avc_add_xperms_decision(node, xpd);
+		if (rc) {
+			avc_node_kill(node);
+			goto out_unlock;
+		}
 		break;
 	}
 	avc_node_replace(node, orig);
-- 
2.34.1