diff options
| author | Ondrej Mosnacek <omosnace@redhat.com> | 2022-05-17 14:08:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-25 09:59:02 +0200 |
| commit | ec9fd8d2eed36afff71f04204b63c24311296f12 (patch) | |
| tree | a7da0874fd1474fa48bc5dffc8c4241212bfc8d4 /security | |
| parent | 22fb2974224c9836eeaf0d24fdd481fcdaa0aea8 (diff) | |
| download | linux-stable-ec9fd8d2eed36afff71f04204b63c24311296f12.tar.gz linux-stable-ec9fd8d2eed36afff71f04204b63c24311296f12.tar.bz2 linux-stable-ec9fd8d2eed36afff71f04204b63c24311296f12.zip | |
selinux: fix bad cleanup on error in hashtab_duplicate()
commit 6254bd3db316c9ccb3b05caa8b438be63245466f upstream.
The code attempts to free the 'new' pointer using kmem_cache_free(),
which is wrong because this function isn't responsible of freeing it.
Instead, the function should free new->htable and clear the contents of
*new (to prevent double-free).
Cc: stable@vger.kernel.org
Fixes: c7c556f1e81b ("selinux: refactor changing booleans")
Reported-by: Wander Lairson Costa <wander@redhat.com>
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/ss/hashtab.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c index 0ae4e4e57a40..3fb8f9026e9b 100644 --- a/security/selinux/ss/hashtab.c +++ b/security/selinux/ss/hashtab.c @@ -179,7 +179,8 @@ int hashtab_duplicate(struct hashtab *new, struct hashtab *orig, kmem_cache_free(hashtab_node_cachep, cur); } } - kmem_cache_free(hashtab_node_cachep, new); + kfree(new->htable); + memset(new, 0, sizeof(*new)); return -ENOMEM; } |