From 6e3e387f49e251ac4d656c0cb04df0e53482145c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Aug 2024 12:06:04 +0200 Subject: [PATCH] drop queue-4.19/selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch --- ...e-failure-of-avc_add_xperms_decision.patch | 39 ------------------- queue-4.19/series | 1 - 2 files changed, 40 deletions(-) delete mode 100644 queue-4.19/selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch diff --git a/queue-4.19/selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch b/queue-4.19/selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch deleted file mode 100644 index 9571b860b30..00000000000 --- a/queue-4.19/selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001 -From: Zhen Lei -Date: Wed, 7 Aug 2024 17:00:56 +0800 -Subject: selinux: add the processing of the failure of avc_add_xperms_decision() - -From: Zhen Lei - -commit 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 upstream. - -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. - -Cc: stable@vger.kernel.org -Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls") -Suggested-by: Stephen Smalley -Signed-off-by: Zhen Lei -Acked-by: Stephen Smalley -Signed-off-by: Paul Moore -Signed-off-by: Greg Kroah-Hartman ---- - security/selinux/avc.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/security/selinux/avc.c -+++ b/security/selinux/avc.c -@@ -925,7 +925,11 @@ static int avc_update_node(struct selinu - 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(avc, node, orig); diff --git a/queue-4.19/series b/queue-4.19/series index b654037f682..bf55ae43171 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -7,6 +7,5 @@ dm-persistent-data-fix-memory-allocation-failure.patch bitmap-introduce-generic-optimized-bitmap_size.patch fix-bitmap-corruption-on-close_range-with-close_range_unshare.patch selinux-fix-potential-counting-error-in-avc_add_xperms_decision.patch -selinux-add-the-processing-of-the-failure-of-avc_add_xperms_decision.patch drm-amdgpu-actually-check-flags-for-all-context-ops.patch memcg_write_event_control-fix-a-user-triggerable-oops.patch -- 2.47.3