public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@openvz.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>,
	KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
	Pavel Emelyanov <xemul@parallels.com>,
	Kees Cook <keescook@chromium.org>, Tejun Heo <tj@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [RFC] c/r: prctl: Add ability to set new mm_struct::exe_file v3
Date: Tue, 13 Mar 2012 20:04:20 +0400	[thread overview]
Message-ID: <20120313160420.GA18307@moon> (raw)
In-Reply-To: <20120313160044.GF1912@moon>

On Tue, Mar 13, 2012 at 08:00:44PM +0400, Cyrill Gorcunov wrote:
> > 
> > This means that the num_exe_file_vmas check at the start is not needed.
> > If you want it as a "fast-path" check, please fix the comment. Or just
> > remove it. Otherwise the code looks as if we have to check them both.
> 
> Yes, I wanted a fast test first, while the second test will give
> one-shot condition and the second attempt to setup new exe_file
> will fail. OK, I'll update the comment block.
> 

Something like below?

	Cyrill
---
From: Cyrill Gorcunov <gorcunov@openvz.org>
Subject: c/r: prctl: Add ability to set new mm_struct::exe_file

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 option takes a file descriptor which will be
set as a source for new /proc/$pid/exe symlink.

Note it allows to change /proc/$pid/exe iif there
are no VM_EXECUTABLE vmas present for current process,
simply because this feature is a special to C/R
and mm::num_exe_file_vmas become meaningless after
that.

Also this action is one-shot only. For secutiry reason
we don't allow to chanage the symlink several times.

This feature is available iif CONFIG_CHECKPOINT_RESTORE is set.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Reviewed-by: 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>
CC: Matt Helsley <matthltc@us.ibm.com>
---
 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,57 @@ 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;
+
+	/*
+	 * Setting new mm::exe_file is only allowed
+	 * when no VM_EXECUTABLE vma's left. So make
+	 * a fast test first.
+	 */
+	if (mm->num_exe_file_vmas)
+		return -EBUSY;
+
+	exe_file = fget(fd);
+	if (!exe_file)
+		return -EBADF;
+
+	dentry = exe_file->f_path.dentry;
+
+	/*
+	 * Because the original mm->exe_file
+	 * points to executable file, make sure
+	 * this one is executable as well to not
+	 * break an overall picture.
+	 */
+	err = -EACCES;
+	if (!S_ISREG(dentry->d_inode->i_mode)	||
+	    exe_file->f_path.mnt->mnt_flags & MNT_NOEXEC)
+		goto exit;
+
+	err = inode_permission(dentry->d_inode, MAY_EXEC);
+	if (err)
+		goto exit;
+
+	/*
+	 * For security reason changing mm->exe_file
+	 * is one-shot action.
+	 */
+	down_write(&mm->mmap_sem);
+	if (likely(!mm->exe_file))
+		set_mm_exe_file(mm, exe_file);
+	else
+		err = -EBUSY;
+	up_write(&mm->mmap_sem);
+
+exit:
+	fput(exe_file);
+	return err;
+}
+
 static int prctl_set_mm(int opt, unsigned long addr,
 			unsigned long arg4, unsigned long arg5)
 {
@@ -1715,6 +1768,9 @@ static int prctl_set_mm(int opt, unsigne
 	if (!capable(CAP_SYS_RESOURCE))
 		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;
 

  reply	other threads:[~2012-03-13 16:04 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-08 16:51 [RFC] c/r: prctl: Add ability to set new mm_struct::exe_file v3 Cyrill Gorcunov
2012-03-08 18:26 ` Oleg Nesterov
2012-03-08 19:03   ` Cyrill Gorcunov
2012-03-08 19:05     ` Oleg Nesterov
2012-03-08 19:25       ` Cyrill Gorcunov
2012-03-08 19:25         ` Oleg Nesterov
2012-03-08 19:36           ` Cyrill Gorcunov
2012-03-08 21:48           ` Cyrill Gorcunov
2012-03-09 12:48             ` Oleg Nesterov
2012-03-09 12:57               ` Cyrill Gorcunov
2012-03-09 13:35                 ` Cyrill Gorcunov
2012-03-09 13:47                   ` Oleg Nesterov
2012-03-09 14:13                     ` Cyrill Gorcunov
2012-03-09 14:26                       ` Oleg Nesterov
2012-03-09 14:42                         ` Cyrill Gorcunov
2012-03-09 15:21                           ` Oleg Nesterov
2012-03-09 15:42                             ` Cyrill Gorcunov
2012-03-09 22:02                               ` Matt Helsley
2012-03-09 22:39                                 ` Cyrill Gorcunov
2012-03-09 23:59                                   ` Matt Helsley
2012-03-10  7:48                                     ` Cyrill Gorcunov
2012-03-13  2:45                                       ` Matt Helsley
2012-03-13  6:26                                         ` Cyrill Gorcunov
2012-03-13  7:18                                           ` Cyrill Gorcunov
2012-03-13 15:43                                             ` Oleg Nesterov
2012-03-13 16:00                                               ` Cyrill Gorcunov
2012-03-13 16:04                                                 ` Cyrill Gorcunov [this message]
2012-03-13 16:44                                                   ` Oleg Nesterov
2012-03-14  1:41                                                   ` Matt Helsley
2012-03-14  5:47                                                     ` Cyrill Gorcunov
2012-03-14 22:21                                                       ` Matt Helsley
2012-03-14 22:48                                                         ` Cyrill Gorcunov
2012-03-14  0:36                                               ` Matt Helsley
2012-03-09 21:46     ` Matt Helsley
2012-03-09 21:52       ` Cyrill Gorcunov
2012-03-08 19:31 ` Kees Cook
2012-03-08 19:40   ` Cyrill Gorcunov
2012-03-08 20:02     ` Andy Lutomirski
2012-03-08 20:06       ` Kees Cook
2012-03-08 20:07       ` Cyrill Gorcunov
2012-03-08 20:15         ` Andy Lutomirski
2012-03-08 20:21           ` Cyrill Gorcunov
2012-03-08 20:24             ` Andy Lutomirski
2012-03-08 20:28               ` Cyrill Gorcunov
2012-03-08 21:57               ` Cyrill Gorcunov
2012-03-08 22:03                 ` Kees Cook
2012-03-08 22:12                   ` Cyrill Gorcunov
2012-03-08 22:14                     ` Kees Cook

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=20120313160420.GA18307@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=matthltc@us.ibm.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox