]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
erofs: verify metadata accesses for file-backed mounts
authorGao Xiang <hsiangkao@linux.alibaba.com>
Mon, 30 Mar 2026 02:29:29 +0000 (10:29 +0800)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Thu, 2 Apr 2026 08:08:43 +0000 (16:08 +0800)
For file-backed mounts, metadata is fetched via the page cache of
backing inodes to avoid double caching and redundant copy ops out
of RO uptodate folios, which is used by Android APEXes, ComposeFS,
containerd.  However, rw_verify_area() was missing prior to
metadata accesses.

Similar to vfs_iocb_iter_read(), fix this by:
 - Enabling fanotify pre-content hooks on metadata accesses;
 - security_file_permission() for security modules.

Verified that fanotify pre-content hooks now works correctly.

Fixes: fb176750266a ("erofs: add file-backed mount support")
Acked-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Chunhai Guo <guochunhai@vivo.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
fs/erofs/data.c

index f79ee80627d959fd0331c809acf4f85a49ff525d..132a27deb2f3beb1f3ba7ee96c0d13b4c6d9578b 100644 (file)
@@ -30,6 +30,20 @@ void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap)
 {
        pgoff_t index = (buf->off + offset) >> PAGE_SHIFT;
        struct folio *folio = NULL;
+       loff_t fpos;
+       int err;
+
+       /*
+        * Metadata access for file-backed mounts reuses page cache of backing
+        * fs inodes (only folio data will be needed) to prevent double caching.
+        * However, the data access range must be verified here in advance.
+        */
+       if (buf->file) {
+               fpos = index << PAGE_SHIFT;
+               err = rw_verify_area(READ, buf->file, &fpos, PAGE_SIZE);
+               if (err < 0)
+                       return ERR_PTR(err);
+       }
 
        if (buf->page) {
                folio = page_folio(buf->page);