Add samsung specific changes
This commit is contained in:
@@ -29,7 +29,6 @@
|
||||
#include <linux/backing-dev.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/msg.h>
|
||||
#include <linux/task_integrity.h>
|
||||
#include <net/flow.h>
|
||||
|
||||
/* How many LSMs were built into the kernel? */
|
||||
@@ -2196,9 +2195,6 @@ int security_inode_setxattr(struct mnt_idmap *idmap,
|
||||
|
||||
if (ret == 1)
|
||||
ret = cap_inode_setxattr(dentry, name, value, size, flags);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = five_inode_setxattr(dentry, name, value, size);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = ima_inode_setxattr(dentry, name, value, size);
|
||||
@@ -2360,9 +2356,6 @@ int security_inode_removexattr(struct mnt_idmap *idmap,
|
||||
ret = call_int_hook(inode_removexattr, 1, idmap, dentry, name);
|
||||
if (ret == 1)
|
||||
ret = cap_inode_removexattr(idmap, dentry, name);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = five_inode_removexattr(dentry, name);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = ima_inode_removexattr(dentry, name);
|
||||
@@ -2736,9 +2729,6 @@ int security_mmap_file(struct file *file, unsigned long prot,
|
||||
int ret;
|
||||
|
||||
ret = call_int_hook(mmap_file, 0, file, prot, prot_adj, flags);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = five_file_mmap(file, prot);
|
||||
if (ret)
|
||||
return ret;
|
||||
return ima_file_mmap(file, prot, prot_adj, flags);
|
||||
@@ -2877,11 +2867,7 @@ int security_file_open(struct file *file)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = fsnotify_perm(file, MAY_OPEN);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return five_file_open(file);
|
||||
return fsnotify_perm(file, MAY_OPEN);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2930,7 +2916,6 @@ int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
|
||||
void security_task_free(struct task_struct *task)
|
||||
{
|
||||
call_void_hook(task_free, task);
|
||||
five_task_free(task);
|
||||
|
||||
kfree(task->security);
|
||||
task->security = NULL;
|
||||
|
Reference in New Issue
Block a user