selinux: fix another double free
PATCH v3 1/1 selinux: fix another double free
From: Tom Rix <[email protected]>
Clang static analysis reports this double free error
security/selinux/ss/conditional.c:139:2: warning: Attempt to free released memory [unix.Malloc]
kfree(node->expr.nodes);
^~~~~~~~~~~~~~~~~~~~~~~When cond_read_node fails, it calls cond_node_destroy which frees the node but does not poison the entry in the node list. So when it returns to its caller cond_read_list, cond_read_list deletes the partial list. The latest entry in the list will be deleted twice.
So instead of freeing the node in cond_read_node, let list freeing in code_read_list handle the freeing the problem node along with all of the earlier nodes.
Because cond_read_node no longer does any error handling, the goto's the error case are redundant. Instead just return the error code.
---
v3: simplify returns
security/selinux/ss/conditional.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
security/selinux/ss/conditional.c +5 -13
@@ -392,27 +392,19 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) rc =next_entry (buf, fp,sizeof (u32) *2 );if (rc) - goto err; +return rc; expr->expr_type =le32_to_cpu (buf[0 ]); expr->bool =le32_to_cpu (buf[1 ]); -if (!expr_node_isvalid (p, expr)) { - rc = -EINVAL ; - goto err; - } +if (!expr_node_isvalid (p, expr)) +return -EINVAL ; } rc =cond_read_av_list (p, fp, &node->true_list,NULL );if (rc) - goto err; - rc =cond_read_av_list (p, fp, &node->false_list, &node->true_list); -if (rc) - goto err; -return 0 ; -err: -cond_node_destroy (node); -return rc; +return rc; +return cond_read_av_list (p, fp, &node->false_list, &node->true_list); }int cond_read_list (struct policydb *p,void *fp)
Signature · 1 line
2.18.1
Quoted 17 lines · On Mon, Jun 15, 2020 at 10:46 PM <[email protected]> wrote:
From: Tom Rix <[email protected]>
Clang static analysis reports this double free error
security/selinux/ss/conditional.c:139:2: warning: Attempt to free released memory [unix.Malloc]kfree(node->expr.nodes); ^~~~~~~~~~~~~~~~~~~~~~~When
cond_read_nodefails, it callscond_node_destroywhich frees the node but does not poison the entry in the node list. So when it returns to its callercond_read_list,cond_read_listdeletes the partial list. The latest entry in the list will be deleted twice.So instead of freeing the node in
cond_read_node, let list freeing incode_read_listhandle the freeing the problem node along with all of the earlier nodes.
Quoted 6 lines
Because
cond_read_nodeno longer does any error handling, the goto's the error case are redundant. Instead just return the error code.Fixes 60abd3181db2 ("selinux: convert cond_list to array")Signed-off-by Tom Rix <[email protected]>
Thanks!
Signature · 3 lines
Ondrej Mosnacek Software Engineer, Platform Security - SELinux kernel Red Hat, Inc.
Quoted 20 lines · On Mon, Jun 15, 2020 at 4:45 PM <[email protected]> wrote:
From: Tom Rix <[email protected]>
Clang static analysis reports this double free error
security/selinux/ss/conditional.c:139:2: warning: Attempt to free released memory [unix.Malloc]kfree(node->expr.nodes); ^~~~~~~~~~~~~~~~~~~~~~~When
cond_read_nodefails, it callscond_node_destroywhich frees the node but does not poison the entry in the node list. So when it returns to its callercond_read_list,cond_read_listdeletes the partial list. The latest entry in the list will be deleted twice.So instead of freeing the node in
cond_read_node, let list freeing incode_read_listhandle the freeing the problem node along with all of the earlier nodes.Because
cond_read_nodeno longer does any error handling, the goto's the error case are redundant. Instead just return the error code.
Quoted 8 lines
Fixes 60abd3181db2 ("selinux: convert cond_list to array")Signed-off-by Tom Rix <[email protected]>---
v3: simplify returnssecurity/selinux/ss/conditional.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
Merged into selinux/stable-5.8 with a better subject line. Thanks for catching this and submitting the fix. Assuming everything goes well I'll send this up to Linus later this week.
It might be nice to do a follow-up patch for selinux/next which folds cond_node_destroy() into cond_list_destroy() as there is no longer a need for that code to be in a separate function.
Signature · 2 lines
paul moore www.paul-moore.com