smack: fix memleak in smk_write_rules_list()

The smack_parsed_rule structure is allocated.  If a rule is successfully
installed then the last reference to the object is lost.  This patch fixes this
leak. Moreover smack_parsed_rule is allocated on stack because it no longer
needed ofter smk_write_rules_list() is finished.

Change-Id: Icd5120bc398af14d9d198e799afcf131d50c0200
Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com>

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 84e0bfc..ba60872 100644 (file)
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -445,7 +445,7 @@ static ssize_t smk_write_rules_list(struct file *file, const char __user *buf,
                                        struct mutex *rule_lock, int format)
 {
        struct smack_known *skp;
-       struct smack_parsed_rule *rule;
+       struct smack_parsed_rule rule;
        char *data;
        int datalen;
        int rc = -EINVAL;
@@ -477,49 +477,38 @@ static ssize_t smk_write_rules_list(struct file *file, const char __user *buf,
                goto out;
        }
 
-       rule = kzalloc(sizeof(*rule), GFP_KERNEL);
-       if (rule == NULL) {
-               rc = -ENOMEM;
-               goto out;
-       }
-
        if (format == SMK_LONG_FMT) {
                /*
                 * Be sure the data string is terminated.
                 */
                data[count] = '\0';
-               if (smk_parse_long_rule(data, rule, 1, 0))
-                       goto out_free_rule;
+               if (smk_parse_long_rule(data, &rule, 1, 0))
+                       goto out;
        } else if (format == SMK_CHANGE_FMT) {
                data[count] = '\0';
-               if (smk_parse_long_rule(data, rule, 1, 1))
-                       goto out_free_rule;
+               if (smk_parse_long_rule(data, &rule, 1, 1))
+                       goto out;
        } else {
                /*
                 * More on the minor hack for backward compatibility
                 */
                if (count == (SMK_OLOADLEN))
                        data[SMK_OLOADLEN] = '-';
-               if (smk_parse_rule(data, rule, 1))
-                       goto out_free_rule;
+               if (smk_parse_rule(data, &rule, 1))
+                       goto out;
        }
 
 
        if (rule_list == NULL) {
                load = 1;
-               skp = smk_find_entry(rule->smk_subject);
+               skp = smk_find_entry(rule.smk_subject);
                rule_list = &skp->smk_rules;
                rule_lock = &skp->smk_rules_lock;
        }
 
-       rc = smk_set_access(rule, rule_list, rule_lock, load);
-       if (rc == 0) {
+       rc = smk_set_access(&rule, rule_list, rule_lock, load);
+       if (rc == 0)
                rc = count;
-               goto out;
-       }
-
-out_free_rule:
-       kfree(rule);
 out:
        kfree(data);
        return rc;