Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1529161

[PATCH 3/7] mm: ovl: copy-up on MAP_SHARED

Show all headers | View raw

A corner case of a corner case is when

 - file opened for O_RDONLY
 - which is then memory mapped SHARED
 - file opened for O_WRONLY
 - contents modified
 - contents read back though the shared mapping

Unfortunately it looks very difficult to do anything about the established
shared map after the file is copied up.  Instead when a read-only file is
mapped shared overlayfs copies up the file before actually doing the map.
This may result in unnecessary copy-ups (but so may copy-up on open(O_RDWR)
for exampe).

We can revisit this later if it turns out to be a performance problem in
real life.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
 mm/util.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mm/util.c b/mm/util.c
index 1a41553db866..09a179f92d18 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -300,6 +300,28 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
 
 	ret = security_mmap_file(file, prot, flag);
 	if (!ret) {
+		/*
+		 * Special treatment for overlayfs:
+		 *
+		 * Take MAP_SHARED/PROT_READ as hint about future writes to the
+		 * file (through another file descriptor).  Caller might not
+		 * have had such an intent, but we hope MAP_PRIVATE will be used
+		 * in most such cases.
+		 *
+		 * If we don't copy up now and the file is modified, it becomes
+		 * really difficult to change the mapping to match that of the
+		 * file's content later.
+		 *
+		 * Copy up needs to be done without mmap_sem since it takes vfs
+		 * locks which would potentially deadlock under mmap_sem.
+		 */
+		if ((flag & MAP_SHARED) && !(prot & PROT_WRITE)) {
+			void *p = d_real(file->f_path.dentry, NULL, O_WRONLY);
+
+			if (IS_ERR(p))
+				return PTR_ERR(p);
+		}
+
 		if (down_write_killable(&mm->mmap_sem))
 			return -EINTR;
 		ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff,
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] overlayfs: fix ro/rw fd data inconsistecies Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
  [PATCH 0/7] overlayfs: fix ro/rw fd data inconsistecies Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
    Re: [PATCH 0/7] overlayfs: fix ro/rw fd data inconsistecies Miklos Szeredi <miklos@szeredi.hu> - 2016-11-24 15:20 +0100
      Re: [PATCH 0/7] overlayfs: fix ro/rw fd data inconsistecies Amir Goldstein <amir73il@gmail.com> - 2016-11-24 22:00 +0100
  [PATCH 3/7] mm: ovl: copy-up on MAP_SHARED Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
  [PATCH 4/7] ovl: add infrastructure for intercepting file ops Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
    Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Amir Goldstein <amir73il@gmail.com> - 2016-11-24 13:00 +0100
      Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Miklos Szeredi <miklos@szeredi.hu> - 2016-11-24 13:10 +0100
        Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Amir Goldstein <amir73il@gmail.com> - 2016-11-24 14:20 +0100
          Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Miklos Szeredi <miklos@szeredi.hu> - 2016-11-24 15:00 +0100
            Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Amir Goldstein <amir73il@gmail.com> - 2016-11-24 15:10 +0100
              Re: [PATCH 4/7] ovl: add infrastructure for intercepting file ops Amir Goldstein <amir73il@gmail.com> - 2016-11-25 06:30 +0100
  [PATCH 5/7] ovl: intercept read_iter Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
  [PATCH 1/7] vfs: allow overlayfs to intercept file ops Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:00 +0100
  [PATCH 6/7] ovl: intercept mmap Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:10 +0100
    Re: [PATCH 6/7] ovl: intercept mmap Amir Goldstein <amir73il@gmail.com> - 2016-11-24 14:30 +0100
      Re: [PATCH 6/7] ovl: intercept mmap Amir Goldstein <amir73il@gmail.com> - 2016-11-24 19:10 +0100
        Re: [PATCH 6/7] ovl: intercept mmap Amir Goldstein <amir73il@gmail.com> - 2016-11-24 20:10 +0100
  [PATCH 2/7] vfs: export filp_clone_open() Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:10 +0100
  [PATCH 7/7] ovl: intercept fsync Miklos Szeredi <mszeredi@redhat.com> - 2016-11-24 12:10 +0100

csiph-web