projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: exynos: prepare for sparse IRQ
[firefly-linux-kernel-4.4.55.git]
/
fs
/
exec.c
diff --git
a/fs/exec.c
b/fs/exec.c
index 20df02c1cc70190b04802493d5a25b802e0adcba..a96a4885bbbfa130750caa70b9b3f504ea10b244 100644
(file)
--- a/
fs/exec.c
+++ b/
fs/exec.c
@@
-123,7
+123,7
@@
SYSCALL_DEFINE1(uselib, const char __user *, library)
goto out;
error = -EINVAL;
goto out;
error = -EINVAL;
- if (!S_ISREG(file
->f_path.dentry->d_inode
->i_mode))
+ if (!S_ISREG(file
_inode(file)
->i_mode))
goto exit;
error = -EACCES;
goto exit;
error = -EACCES;
@@
-355,7
+355,7
@@
static bool valid_arg_len(struct linux_binprm *bprm, long len)
* flags, permissions, and offset, so we use temporary values. We'll update
* them later in setup_arg_pages().
*/
* flags, permissions, and offset, so we use temporary values. We'll update
* them later in setup_arg_pages().
*/
-int bprm_mm_init(struct linux_binprm *bprm)
+
static
int bprm_mm_init(struct linux_binprm *bprm)
{
int err;
struct mm_struct *mm = NULL;
{
int err;
struct mm_struct *mm = NULL;
@@
-764,7
+764,7
@@
struct file *open_exec(const char *name)
goto out;
err = -EACCES;
goto out;
err = -EACCES;
- if (!S_ISREG(file
->f_path.dentry->d_inode
->i_mode))
+ if (!S_ISREG(file
_inode(file)
->i_mode))
goto exit;
if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
goto exit;
if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
@@
-1098,7
+1098,7
@@
EXPORT_SYMBOL(flush_old_exec);
void would_dump(struct linux_binprm *bprm, struct file *file)
{
void would_dump(struct linux_binprm *bprm, struct file *file)
{
- if (inode_permission(file
->f_path.dentry->d_inode
, MAY_READ) < 0)
+ if (inode_permission(file
_inode(file)
, MAY_READ) < 0)
bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
}
EXPORT_SYMBOL(would_dump);
bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
}
EXPORT_SYMBOL(would_dump);
@@
-1111,7
+1111,7
@@
void setup_new_exec(struct linux_binprm * bprm)
current->sas_ss_sp = current->sas_ss_size = 0;
if (uid_eq(current_euid(), current_uid()) && gid_eq(current_egid(), current_gid()))
current->sas_ss_sp = current->sas_ss_size = 0;
if (uid_eq(current_euid(), current_uid()) && gid_eq(current_egid(), current_gid()))
- set_dumpable(current->mm, SUID_DUMP
ABLE_ENABLED
);
+ set_dumpable(current->mm, SUID_DUMP
_USER
);
else
set_dumpable(current->mm, suid_dumpable);
else
set_dumpable(current->mm, suid_dumpable);
@@
-1270,7
+1270,7
@@
static int check_unsafe_exec(struct linux_binprm *bprm)
int prepare_binprm(struct linux_binprm *bprm)
{
umode_t mode;
int prepare_binprm(struct linux_binprm *bprm)
{
umode_t mode;
- struct inode * inode =
bprm->file->f_path.dentry->d_inode
;
+ struct inode * inode =
file_inode(bprm->file)
;
int retval;
mode = inode->i_mode;
int retval;
mode = inode->i_mode;
@@
-1639,17
+1639,17
@@
EXPORT_SYMBOL(set_binfmt);
void set_dumpable(struct mm_struct *mm, int value)
{
switch (value) {
void set_dumpable(struct mm_struct *mm, int value)
{
switch (value) {
- case SUID_DUMP
ABLE_DISABLED
:
+ case SUID_DUMP
_DISABLE
:
clear_bit(MMF_DUMPABLE, &mm->flags);
smp_wmb();
clear_bit(MMF_DUMP_SECURELY, &mm->flags);
break;
clear_bit(MMF_DUMPABLE, &mm->flags);
smp_wmb();
clear_bit(MMF_DUMP_SECURELY, &mm->flags);
break;
- case SUID_DUMP
ABLE_ENABLED
:
+ case SUID_DUMP
_USER
:
set_bit(MMF_DUMPABLE, &mm->flags);
smp_wmb();
clear_bit(MMF_DUMP_SECURELY, &mm->flags);
break;
set_bit(MMF_DUMPABLE, &mm->flags);
smp_wmb();
clear_bit(MMF_DUMP_SECURELY, &mm->flags);
break;
- case SUID_DUMP
ABLE_SAFE
:
+ case SUID_DUMP
_ROOT
:
set_bit(MMF_DUMP_SECURELY, &mm->flags);
smp_wmb();
set_bit(MMF_DUMPABLE, &mm->flags);
set_bit(MMF_DUMP_SECURELY, &mm->flags);
smp_wmb();
set_bit(MMF_DUMPABLE, &mm->flags);
@@
-1662,7
+1662,7
@@
int __get_dumpable(unsigned long mm_flags)
int ret;
ret = mm_flags & MMF_DUMPABLE_MASK;
int ret;
ret = mm_flags & MMF_DUMPABLE_MASK;
- return (ret > SUID_DUMP
ABLE_ENABLED) ? SUID_DUMPABLE_SAFE
: ret;
+ return (ret > SUID_DUMP
_USER) ? SUID_DUMP_ROOT
: ret;
}
int get_dumpable(struct mm_struct *mm)
}
int get_dumpable(struct mm_struct *mm)