xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

Browse Source 
Per pull request, for 3.5.
This commit is contained in:
James Morris
2012-05-22 11:21:06 +10:00
parent cffee16e8b c737f8284c
commit ff2bb047c4
33 changed files with 422 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/smack/smack_lsm.c
View File

@@ -1359,7 +1359,7 @@ static int smack_file_receive(struct file *file)
}
/**
* smack_dentry_open - Smack dentry open processing
* smack_file_open - Smack dentry open processing
* @file: the object
* @cred: unused
*
@@ -1367,7 +1367,7 @@ static int smack_file_receive(struct file *file)
*
* Returns 0
*/
static int smack_dentry_open(struct file *file, const struct cred *cred)
static int smack_file_open(struct file *file, const struct cred *cred)
{
struct inode_smack *isp = file->f_path.dentry->d_inode->i_security;
@@ -3487,7 +3487,7 @@ struct security_operations smack_ops = {
.file_send_sigiotask = smack_file_send_sigiotask,
.file_receive = smack_file_receive,
.dentry_open = smack_dentry_open,
.file_open = smack_file_open,
.cred_alloc_blank = smack_cred_alloc_blank,
.cred_free = smack_cred_free,