|
@@ -1788,7 +1788,6 @@ SYSCALL_DEFINE1(umask, int, mask)
|
|
|
#ifdef CONFIG_CHECKPOINT_RESTORE
|
|
|
static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
|
|
|
{
|
|
|
- struct vm_area_struct *vma;
|
|
|
struct file *exe_file;
|
|
|
struct dentry *dentry;
|
|
|
int err;
|
|
@@ -1816,13 +1815,17 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
|
|
|
down_write(&mm->mmap_sem);
|
|
|
|
|
|
/*
|
|
|
- * Forbid mm->exe_file change if there are mapped other files.
|
|
|
+ * Forbid mm->exe_file change if old file still mapped.
|
|
|
*/
|
|
|
err = -EBUSY;
|
|
|
- for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
|
|
- if (vma->vm_file && !path_equal(&vma->vm_file->f_path,
|
|
|
- &exe_file->f_path))
|
|
|
- goto exit_unlock;
|
|
|
+ if (mm->exe_file) {
|
|
|
+ struct vm_area_struct *vma;
|
|
|
+
|
|
|
+ for (vma = mm->mmap; vma; vma = vma->vm_next)
|
|
|
+ if (vma->vm_file &&
|
|
|
+ path_equal(&vma->vm_file->f_path,
|
|
|
+ &mm->exe_file->f_path))
|
|
|
+ goto exit_unlock;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1835,6 +1838,7 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
|
|
|
if (test_and_set_bit(MMF_EXE_FILE_CHANGED, &mm->flags))
|
|
|
goto exit_unlock;
|
|
|
|
|
|
+ err = 0;
|
|
|
set_mm_exe_file(mm, exe_file);
|
|
|
exit_unlock:
|
|
|
up_write(&mm->mmap_sem);
|