From: vbendel@redhat.com
To: paul@paul-moore.com, stephen.smalley.work@gmail.com,
eparis@parisplace.org
Cc: omosnace@redhat.com, selinux@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vratislav Bendel <vbendel@redhat.com>
Subject: [PATCH 2/3] selinux: fix double free of cond_list on error paths
Date: Fri, 28 Jan 2022 21:28:57 +0100 [thread overview]
Message-ID: <20220128202858.96935-3-vbendel@redhat.com> (raw)
In-Reply-To: <20220128202858.96935-1-vbendel@redhat.com>
From: Vratislav Bendel <vbendel@redhat.com>
On error path from cond_read_list() and duplicate_policydb_cond_list()
the cond_list_destroy() gets called a second time in caller functions,
resulting in NULL pointer deref.
Fix this by resetting the cond_list_len to 0 in cond_list_destroy(),
making subsequent calls a noop.
Signed-off-by: Vratislav Bendel <vbendel@redhat.com>
---
security/selinux/ss/conditional.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index 1d0e5f326b62..8bc16ad3af9e 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -151,6 +151,8 @@ static void cond_list_destroy(struct policydb *p)
for (i = 0; i < p->cond_list_len; i++)
cond_node_destroy(&p->cond_list[i]);
+ p->cond_list_len = 0;
+
kfree(p->cond_list);
p->cond_list = NULL;
}
--
2.26.3
next prev parent reply other threads:[~2022-01-28 20:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 20:28 [PATCH 0/3] selinux: Fix and clean policydb->cond_list " vbendel
2022-01-28 20:28 ` [PATCH 1/3] selinux: consistently clear cond_list on " vbendel
2022-02-01 17:38 ` Paul Moore
2022-02-01 20:09 ` Paul Moore
2022-02-02 11:15 ` Vratislav Bendel
2022-01-28 20:28 ` vbendel [this message]
2022-01-28 20:28 ` [PATCH 3/3] selinux: remove duplicate cond_list clean up calls vbendel
2022-02-01 20:09 ` Paul Moore
2022-01-31 12:06 ` [PATCH 0/3] selinux: Fix and clean policydb->cond_list error paths Ondrej Mosnacek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220128202858.96935-3-vbendel@redhat.com \
--to=vbendel@redhat.com \
--cc=eparis@parisplace.org \
--cc=linux-kernel@vger.kernel.org \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome