diff options
| -rw-r--r-- | security/smack/smack_lsm.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index f1b17a476e12..dcfaddd955d1 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, | |||
| 202 | 202 | ||
| 203 | /** | 203 | /** |
| 204 | * smk_fetch - Fetch the smack label from a file. | 204 | * smk_fetch - Fetch the smack label from a file. |
| 205 | * @name: type of the label (attribute) | ||
| 205 | * @ip: a pointer to the inode | 206 | * @ip: a pointer to the inode |
| 206 | * @dp: a pointer to the dentry | 207 | * @dp: a pointer to the dentry |
| 207 | * | 208 | * |
| @@ -254,7 +255,9 @@ struct inode_smack *new_inode_smack(struct smack_known *skp) | |||
| 254 | 255 | ||
| 255 | /** | 256 | /** |
| 256 | * new_task_smack - allocate a task security blob | 257 | * new_task_smack - allocate a task security blob |
| 257 | * @smack: a pointer to the Smack label to use in the blob | 258 | * @task: a pointer to the Smack label for the running task |
| 259 | * @forked: a pointer to the Smack label for the forked task | ||
| 260 | * @gfp: type of the memory for the allocation | ||
| 258 | * | 261 | * |
| 259 | * Returns the new blob or NULL if there's no memory available | 262 | * Returns the new blob or NULL if there's no memory available |
| 260 | */ | 263 | */ |
| @@ -277,8 +280,9 @@ static struct task_smack *new_task_smack(struct smack_known *task, | |||
| 277 | 280 | ||
| 278 | /** | 281 | /** |
| 279 | * smk_copy_rules - copy a rule set | 282 | * smk_copy_rules - copy a rule set |
| 280 | * @nhead - new rules header pointer | 283 | * @nhead: new rules header pointer |
| 281 | * @ohead - old rules header pointer | 284 | * @ohead: old rules header pointer |
| 285 | * @gfp: type of the memory for the allocation | ||
| 282 | * | 286 | * |
| 283 | * Returns 0 on success, -ENOMEM on error | 287 | * Returns 0 on success, -ENOMEM on error |
| 284 | */ | 288 | */ |
| @@ -3834,11 +3838,11 @@ static void smack_key_free(struct key *key) | |||
| 3834 | key->security = NULL; | 3838 | key->security = NULL; |
| 3835 | } | 3839 | } |
| 3836 | 3840 | ||
| 3837 | /* | 3841 | /** |
| 3838 | * smack_key_permission - Smack access on a key | 3842 | * smack_key_permission - Smack access on a key |
| 3839 | * @key_ref: gets to the object | 3843 | * @key_ref: gets to the object |
| 3840 | * @cred: the credentials to use | 3844 | * @cred: the credentials to use |
| 3841 | * @perm: unused | 3845 | * @perm: requested key permissions |
| 3842 | * | 3846 | * |
| 3843 | * Return 0 if the task has read and write to the object, | 3847 | * Return 0 if the task has read and write to the object, |
| 3844 | * an error code otherwise | 3848 | * an error code otherwise |
