diff options
| author | Jaihind Yadav <jaihindyadav@codeaurora.org> | 2019-12-17 17:25:47 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-28 16:36:09 +0100 |
| commit | ee15cd14fa26e84607b735c6cf15648209081b02 (patch) | |
| tree | f72c613a15af25e7966592205a250972d64b1ba2 /security | |
| parent | bc99bd6e85e1a08a1c75cd25e6175223083fe54a (diff) | |
| download | linux-stable-ee15cd14fa26e84607b735c6cf15648209081b02.tar.gz linux-stable-ee15cd14fa26e84607b735c6cf15648209081b02.tar.bz2 linux-stable-ee15cd14fa26e84607b735c6cf15648209081b02.zip | |
selinux: ensure we cleanup the internal AVC counters on error in avc_update()
[ Upstream commit 030b995ad9ece9fa2d218af4429c1c78c2342096 ]
In AVC update we don't call avc_node_kill() when avc_xperms_populate()
fails, resulting in the avc->avc_cache.active_nodes counter having a
false value. In last patch this changes was missed , so correcting it.
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Signed-off-by: Jaihind Yadav <jaihindyadav@codeaurora.org>
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
[PM: merge fuzz, minor description cleanup]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/avc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 2380b8d72cec..23f387b30ece 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -863,7 +863,7 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid, if (orig->ae.xp_node) { rc = avc_xperms_populate(node, orig->ae.xp_node); if (rc) { - kmem_cache_free(avc_node_cachep, node); + avc_node_kill(node); goto out_unlock; } } |