bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-14 05:42:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'ovl-fixes-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs

Browse Source 
Pull overlayfs fixes from Amir Goldstein:
 "Only minor fixes:

   - Fix uncalled for WARN_ON from v6.8-rc1

   - Fix the overlayfs MAINTAINERS entry"

* tag 'ovl-fixes-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs:
  ovl: relax WARN_ON in ovl_verify_area()
  MAINTAINERS: update overlayfs git tree
This commit is contained in:
Linus Torvalds
2024-03-18 11:15:58 -07:00
parent 0a7b0acece 77a28aa476
commit 0d7ca657df
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -16588,7 +16588,7 @@ M: Miklos Szeredi <miklos@szeredi.hu>
M: Amir Goldstein <amir73il@gmail.com>
L: linux-unionfs@vger.kernel.org
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
F: Documentation/filesystems/overlayfs.rst
F: fs/overlayfs/

6
fs/overlayfs/copy_up.c
View File

@@ -234,11 +234,11 @@ static int ovl_verify_area(loff_t pos, loff_t pos2, loff_t len, loff_t totlen)
{
loff_t tmp;
if (WARN_ON_ONCE(pos != pos2))
if (pos != pos2)
return -EIO;
if (WARN_ON_ONCE(pos < 0 || len < 0 || totlen < 0))
if (pos < 0 || len < 0 || totlen < 0)
return -EIO;
if (WARN_ON_ONCE(check_add_overflow(pos, len, &tmp)))
if (check_add_overflow(pos, len, &tmp))
return -EIO;
return 0;
}