kernel: smack security backport from kernel 4

Here is the backport of all patches relating to smack support
on kernel side. For more details, see file:

  meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/README

Please note that patches are applied only if "smack" is in the
ditro features. Here are the 2 lines to add in the local.conf

OVERRIDES .= ":smack"
DISTRO_FEATURES_append = " smack"

Change-Id: I147a3532aec531f977d6ec34c576261835711f1e
Signed-off-by: Yannick GICQUEL <yannick.gicquel@iot.bzh>
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

1 files changed, 89 insertions, 0 deletions

diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0008-security-smack-fix-memleak-in-smk_write_rules_list.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0008-security-smack-fix-memleak-in-smk_write_rules_list.patch
new file mode 100644
index 0000000..85e2c6f
--- /dev/null
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0008-security-smack-fix-memleak-in-smk_write_rules_list.patch
@@ -0,0 +1,89 @@
+From ebd488438bac4d71d95ed21281fce2b429804662 Mon Sep 17 00:00:00 2001
+From: Tomasz Stanislawski <t.stanislaws@samsung.com>
+Date: Thu, 6 Jun 2013 09:30:50 +0200
+Subject: [PATCH 08/54] security: 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.
+
+Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
+---
+ security/smack/smackfs.c | 33 +++++++++++----------------------
+ 1 file changed, 11 insertions(+), 22 deletions(-)
+
+diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
+index ab16703..269b270 100644
+--- a/security/smack/smackfs.c
++++ b/security/smack/smackfs.c
+@@ -447,7 +447,7 @@ static ssize_t smk_write_rules_list(struct file *file, const char __user *buf,
+ 					struct list_head *rule_list,
+ 					struct mutex *rule_lock, int format)
+ {
+-	struct smack_parsed_rule *rule;
++	struct smack_parsed_rule rule;
+ 	char *data;
+ 	int datalen;
+ 	int rc = -EINVAL;
+@@ -479,47 +479,36 @@ 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;
+-		rule_list = &rule->smk_subject->smk_rules;
+-		rule_lock = &rule->smk_subject->smk_rules_lock;
++		rule_list = &rule.smk_subject->smk_rules;
++		rule_lock = &rule.smk_subject->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;
+-- 
+2.1.4
+