Add samsung specific changes
This commit is contained in:
19
fs/exec.c
19
fs/exec.c
@@ -63,7 +63,6 @@
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/io_uring.h>
|
||||
#include <linux/syscall_user_dispatch.h>
|
||||
#include <linux/task_integrity.h>
|
||||
#include <linux/coredump.h>
|
||||
#include <linux/time_namespace.h>
|
||||
#include <linux/user_events.h>
|
||||
@@ -79,10 +78,6 @@
|
||||
#include <trace/events/sched.h>
|
||||
#include <trace/hooks/sched.h>
|
||||
|
||||
#ifdef CONFIG_SECURITY_DEFEX
|
||||
#include <linux/defex.h>
|
||||
#endif
|
||||
|
||||
static int bprm_creds_from_file(struct linux_binprm *bprm);
|
||||
|
||||
int suid_dumpable = 0;
|
||||
@@ -1794,8 +1789,6 @@ static int exec_binprm(struct linux_binprm *bprm)
|
||||
if (depth > 5)
|
||||
return -ELOOP;
|
||||
|
||||
five_bprm_check(bprm, depth);
|
||||
|
||||
ret = search_binary_handler(bprm);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
@@ -1851,14 +1844,6 @@ static int bprm_execve(struct linux_binprm *bprm,
|
||||
if (IS_ERR(file))
|
||||
goto out_unmark;
|
||||
|
||||
#ifdef CONFIG_SECURITY_DEFEX
|
||||
retval = task_defex_enforce(current, file, -__NR_execve, bprm);
|
||||
if (retval < 0) {
|
||||
bprm->file = file;
|
||||
retval = -EPERM;
|
||||
goto out_unmark;
|
||||
}
|
||||
#endif
|
||||
sched_exec();
|
||||
|
||||
bprm->file = file;
|
||||
@@ -1880,10 +1865,8 @@ static int bprm_execve(struct linux_binprm *bprm,
|
||||
goto out;
|
||||
|
||||
retval = exec_binprm(bprm);
|
||||
if (retval < 0) {
|
||||
task_integrity_delayed_reset(current, CAUSE_EXEC, bprm->file);
|
||||
if (retval < 0)
|
||||
goto out;
|
||||
}
|
||||
|
||||
sched_mm_cid_after_execve(current);
|
||||
/* execve succeeded */
|
||||
|
Reference in New Issue
Block a user