BACKPORT: SMACK: Fix the memory leak in smack_cred_prepare() hook

Memory leak in smack_cred_prepare()function.
smack_cred_prepare() hook returns error if there is error in allocating
memory in smk_copy_rules() or smk_copy_relabel() function.
If smack_cred_prepare() function returns error then the calling
function should call smack_cred_free() function for cleanup.
In smack_cred_free() function first credential is  extracted and
then all rules are deleted. In smack_cred_prepare() function security
field is assigned in the end when all function return success. But this
function may return before and memory will not be freed.

Signed-off-by: Himanshu Shukla <himanshu.sh@samsung.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry-picked from upstream b437aba85b5c4689543409d8407c016749231aae)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 68ba4250ad2d78a2a0e1ff71146dd19fbf7b21be..fb59e8f41cf942242e7089234416f838df332353 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2001,6 +2001,8 @@ static int smack_cred_prepare(struct cred *new, const struct cred *old,
        if (new_tsp == NULL)
                return -ENOMEM;
 
+       new->security = new_tsp;
+
        rc = smk_copy_rules(&new_tsp->smk_rules, &old_tsp->smk_rules, gfp);
        if (rc != 0)
                return rc;
@@ -2010,7 +2012,6 @@ static int smack_cred_prepare(struct cred *new, const struct cred *old,
        if (rc != 0)
                return rc;
 
-       new->security = new_tsp;
        return 0;
 }