| From 45385237f65aeee73641f1ef737d7273905a233f Mon Sep 17 00:00:00 2001 |
| From: Ondrej Mosnacek <omosnace@redhat.com> |
| Date: Thu, 25 Jul 2019 12:52:43 +0200 |
| Subject: selinux: fix memory leak in policydb_init() |
| |
| From: Ondrej Mosnacek <omosnace@redhat.com> |
| |
| commit 45385237f65aeee73641f1ef737d7273905a233f upstream. |
| |
| Since roles_init() adds some entries to the role hash table, we need to |
| destroy also its keys/values on error, otherwise we get a memory leak in |
| the error path. |
| |
| Cc: <stable@vger.kernel.org> |
| Reported-by: syzbot+fee3a14d4cdf92646287@syzkaller.appspotmail.com |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> |
| Signed-off-by: Paul Moore <paul@paul-moore.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| security/selinux/ss/policydb.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/security/selinux/ss/policydb.c |
| +++ b/security/selinux/ss/policydb.c |
| @@ -266,6 +266,8 @@ static int rangetr_cmp(struct hashtab *h |
| return v; |
| } |
| |
| +static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap); |
| + |
| /* |
| * Initialize a policy database structure. |
| */ |
| @@ -313,8 +315,10 @@ static int policydb_init(struct policydb |
| out: |
| hashtab_destroy(p->filename_trans); |
| hashtab_destroy(p->range_tr); |
| - for (i = 0; i < SYM_NUM; i++) |
| + for (i = 0; i < SYM_NUM; i++) { |
| + hashtab_map(p->symtab[i].table, destroy_f[i], NULL); |
| hashtab_destroy(p->symtab[i].table); |
| + } |
| return rc; |
| } |
| |