From: Cyrill Gorcunov <gorcunov@openvz.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Pavel Emelyanov <xemul@parallels.com>,
Kees Cook <keescook@chromium.org>, Tejun Heo <tj@kernel.org>
Subject: Re: [RFC] c/r: prctl: Add ability to set new mm_struct::exe_file
Date: Sun, 4 Mar 2012 02:33:33 +0400 [thread overview]
Message-ID: <20120303223333.GB26846@moon> (raw)
In-Reply-To: <20120302161247.GO8681@moon>
On Fri, Mar 02, 2012 at 08:12:47PM +0400, Cyrill Gorcunov wrote:
...
>
> Yes, Oleg, you're right of course! The set_mm_exe_file confused
> me a bit (I didn't reply to your previous emails simply because
> you were asking me to prove what exactly is broken when num_exe_file_vmas
> greater 2 and we reassign new exe_file, and I didn't know what to reply
> since I knew I was wrong in first assumption).
>
> As a conclusion -- sure I need to check for num_exe_file_vmas to
> not break current logic, thanks!
>
Hi Oleg,
i suppose the below one should do the trick. I mostly concerned
at moment if I added all permission tests needed.
Cyrill
---
c/r: prctl: Add ability to set new mm_struct::exe_file v2
From: Cyrill Gorcunov <gorcunov@openvz.org>
When we do restore we would like to have a way to setup
a former mm_struct::exe_file so that /proc/pid/exe would
point to the original executable file a process had at
checkpoint time.
For this the PR_SET_MM_EXE_FILE code is introduced.
This feature is available iif CONFIG_CHECKPOINT_RESTORE is set.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Oleg Nesterov <oleg@redhat.com>
CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Pavel Emelyanov <xemul@parallels.com>
CC: Kees Cook <keescook@chromium.org>
CC: Tejun Heo <tj@kernel.org>
---
include/linux/prctl.h | 1
kernel/sys.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
Index: linux-2.6.git/include/linux/prctl.h
===================================================================
--- linux-2.6.git.orig/include/linux/prctl.h
+++ linux-2.6.git/include/linux/prctl.h
@@ -118,5 +118,6 @@
# define PR_SET_MM_ENV_START 10
# define PR_SET_MM_ENV_END 11
# define PR_SET_MM_AUXV 12
+# define PR_SET_MM_EXE_FILE 13
#endif /* _LINUX_PRCTL_H */
Index: linux-2.6.git/kernel/sys.c
===================================================================
--- linux-2.6.git.orig/kernel/sys.c
+++ linux-2.6.git/kernel/sys.c
@@ -36,6 +36,8 @@
#include <linux/personality.h>
#include <linux/ptrace.h>
#include <linux/fs_struct.h>
+#include <linux/file.h>
+#include <linux/mount.h>
#include <linux/gfp.h>
#include <linux/syscore_ops.h>
#include <linux/version.h>
@@ -1701,6 +1703,56 @@ static bool vma_flags_mismatch(struct vm
(vma->vm_flags & banned);
}
+static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
+{
+ struct file *exe_file;
+ struct dentry *dentry;
+ int err;
+
+ exe_file = fget(fd);
+ if (!exe_file)
+ return -EBADF;
+
+ dentry = exe_file->f_path.dentry;
+
+ /*
+ * Permissions should be the same as if the
+ * file has being opened by the kernel for
+ * execution.
+ */
+ err = -EACCES;
+ if (!S_ISREG(dentry->d_inode->i_mode) ||
+ exe_file->f_path.mnt->mnt_flags & MNT_NOEXEC)
+ goto exit;
+
+ if ((exe_file->f_flags & O_ACCMODE) != O_RDONLY)
+ goto exit;
+
+ err = inode_permission(dentry->d_inode, MAY_EXEC);
+ if (err)
+ goto exit;
+
+ down_write(&mm->mmap_sem);
+ if (mm->num_exe_file_vmas) {
+
+ err = deny_write_access(exe_file);
+ if (err) {
+ up_write(&mm->mmap_sem);
+ goto exit;
+ }
+
+ fput(mm->exe_file);
+ mm->exe_file = exe_file;
+ } else {
+ fput(exe_file);
+ err = -ENXIO;
+ }
+ up_write(&mm->mmap_sem);
+
+exit:
+ return err;
+}
+
static int prctl_set_mm(int opt, unsigned long addr,
unsigned long arg4, unsigned long arg5)
{
@@ -1715,6 +1767,9 @@ static int prctl_set_mm(int opt, unsigne
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
+ if (opt == PR_SET_MM_EXE_FILE)
+ return prctl_set_mm_exe_file(mm, (unsigned int)addr);
+
if (addr >= TASK_SIZE)
return -EINVAL;
@@ -1837,6 +1892,7 @@ static int prctl_set_mm(int opt, unsigne
return 0;
}
+
default:
error = -EINVAL;
goto out;
next prev parent reply other threads:[~2012-03-03 22:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 15:16 [RFC] c/r: prctl: Add ability to set new mm_struct::exe_file Cyrill Gorcunov
2012-02-29 15:23 ` Pavel Emelyanov
2012-02-29 15:31 ` Cyrill Gorcunov
2012-02-29 19:24 ` Oleg Nesterov
2012-02-29 20:01 ` Cyrill Gorcunov
2012-03-01 18:06 ` Oleg Nesterov
2012-03-01 19:17 ` Cyrill Gorcunov
2012-03-01 19:41 ` Oleg Nesterov
2012-03-01 20:00 ` Cyrill Gorcunov
2012-03-02 15:03 ` Oleg Nesterov
2012-03-02 14:26 ` Cyrill Gorcunov
2012-03-02 15:26 ` Oleg Nesterov
2012-03-02 16:12 ` Cyrill Gorcunov
2012-03-03 22:33 ` Cyrill Gorcunov [this message]
2012-03-05 14:21 ` Oleg Nesterov
2012-03-05 14:26 ` Oleg Nesterov
2012-03-05 14:46 ` Cyrill Gorcunov
2012-03-05 15:40 ` Oleg Nesterov
2012-03-05 16:01 ` Cyrill Gorcunov
2012-03-05 16:31 ` Oleg Nesterov
2012-03-05 16:45 ` Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120303223333.GB26846@moon \
--to=gorcunov@openvz.org \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=tj@kernel.org \
--cc=xemul@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.