Skip to content

Commit fb5bb2c

Browse files
dhowellsszmi
authored andcommitted
ovl: Warn on copy up if a process has a R/O fd open to the lower file
Print a warning when overlayfs copies up a file if the process that triggered the copy up has a R/O fd open to the lower file being copied up. This can help catch applications that do things like the following: fd1 = open("foo", O_RDONLY); fd2 = open("foo", O_RDWR); where they expect fd1 and fd2 to refer to the same file - which will no longer be the case post-copy up. With this patch, the following commands: bash 5</mnt/a/foo128 6<>/mnt/a/foo128 assuming /mnt/a/foo128 to be an un-copied up file on an overlay will produce the following warning in the kernel log: overlayfs: Copying up foo129, but open R/O on fd 5 which will cease to be coherent [pid=3818 bash] This is enabled by setting: /sys/module/overlay/parameters/check_copy_up to 1. The warnings are ratelimited and are also limited to one warning per file - assuming the copy up completes in each case. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
1 parent 07f2af7 commit fb5bb2c

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

fs/overlayfs/copy_up.c

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* the Free Software Foundation.
88
*/
99

10+
#include <linux/module.h>
1011
#include <linux/fs.h>
1112
#include <linux/slab.h>
1213
#include <linux/file.h>
@@ -16,10 +17,41 @@
1617
#include <linux/uaccess.h>
1718
#include <linux/sched.h>
1819
#include <linux/namei.h>
20+
#include <linux/fdtable.h>
21+
#include <linux/ratelimit.h>
1922
#include "overlayfs.h"
2023

2124
#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
2225

26+
static bool __read_mostly ovl_check_copy_up;
27+
module_param_named(check_copy_up, ovl_check_copy_up, bool,
28+
S_IWUSR | S_IRUGO);
29+
MODULE_PARM_DESC(ovl_check_copy_up,
30+
"Warn on copy-up when causing process also has a R/O fd open");
31+
32+
static int ovl_check_fd(const void *data, struct file *f, unsigned int fd)
33+
{
34+
const struct dentry *dentry = data;
35+
36+
if (f->f_inode == d_inode(dentry))
37+
pr_warn_ratelimited("overlayfs: Warning: Copying up %pD, but open R/O on fd %u which will cease to be coherent [pid=%d %s]\n",
38+
f, fd, current->pid, current->comm);
39+
return 0;
40+
}
41+
42+
/*
43+
* Check the fds open by this process and warn if something like the following
44+
* scenario is about to occur:
45+
*
46+
* fd1 = open("foo", O_RDONLY);
47+
* fd2 = open("foo", O_RDWR);
48+
*/
49+
static void ovl_do_check_copy_up(struct dentry *dentry)
50+
{
51+
if (ovl_check_copy_up)
52+
iterate_fd(current->files, 0, ovl_check_fd, dentry);
53+
}
54+
2355
int ovl_copy_xattr(struct dentry *old, struct dentry *new)
2456
{
2557
ssize_t list_size, size, value_size = 0;
@@ -309,6 +341,8 @@ int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
309341
if (WARN_ON(!workdir))
310342
return -EROFS;
311343

344+
ovl_do_check_copy_up(lowerpath->dentry);
345+
312346
ovl_path_upper(parent, &parentpath);
313347
upperdir = parentpath.dentry;
314348

0 commit comments

Comments
 (0)