diff options
author | Yannick GICQUEL <yannick.gicquel@iot.bzh> | 2015-10-19 15:57:07 +0200 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.200> | 2015-11-06 15:23:36 +0000 |
commit | ede19ea0c47fb23f3fc779833d1e57cf76f3371e (patch) | |
tree | 47d6fae2283c54def1871aaf2a73828ac68b1b34 /meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch | |
parent | 1cd8ab18abca96e4ee108f80225058d875b28347 (diff) |
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>
Diffstat (limited to 'meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch')
-rw-r--r-- | meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch new file mode 100644 index 0000000..317707f --- /dev/null +++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0045-smack-miscellaneous-small-fixes-in-function-comments.patch @@ -0,0 +1,62 @@ +From 72b47845b28439881d4db37b13eb97dccdc50e0f Mon Sep 17 00:00:00 2001 +From: Lukasz Pawelczyk <l.pawelczyk@samsung.com> +Date: Wed, 26 Nov 2014 15:31:06 +0100 +Subject: [PATCH 45/54] smack: miscellaneous small fixes in function comments + +Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com> +--- + security/smack/smack_lsm.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index b3978ea..eacd7fc 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -202,6 +202,7 @@ static int smk_bu_credfile(const struct cred *cred, struct file *file, + + /** + * smk_fetch - Fetch the smack label from a file. ++ * @name: type of the label (attribute) + * @ip: a pointer to the inode + * @dp: a pointer to the dentry + * +@@ -254,7 +255,9 @@ struct inode_smack *new_inode_smack(struct smack_known *skp) + + /** + * new_task_smack - allocate a task security blob +- * @smack: a pointer to the Smack label to use in the blob ++ * @task: a pointer to the Smack label for the running task ++ * @forked: a pointer to the Smack label for the forked task ++ * @gfp: type of the memory for the allocation + * + * Returns the new blob or NULL if there's no memory available + */ +@@ -277,8 +280,9 @@ static struct task_smack *new_task_smack(struct smack_known *task, + + /** + * smk_copy_rules - copy a rule set +- * @nhead - new rules header pointer +- * @ohead - old rules header pointer ++ * @nhead: new rules header pointer ++ * @ohead: old rules header pointer ++ * @gfp: type of the memory for the allocation + * + * Returns 0 on success, -ENOMEM on error + */ +@@ -3836,11 +3840,11 @@ static void smack_key_free(struct key *key) + key->security = NULL; + } + +-/* ++/** + * smack_key_permission - Smack access on a key + * @key_ref: gets to the object + * @cred: the credentials to use +- * @perm: unused ++ * @perm: requested key permissions + * + * Return 0 if the task has read and write to the object, + * an error code otherwise +-- +2.1.4 + |