diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-18 11:15:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-18 11:15:58 -0700 |
| commit | 0d7ca657df77a3d97698d6ec392894362d2ad334 (patch) | |
| tree | c67c720649e865ac9836c585411504c661ce9e3b | |
| parent | Merge tag 'vfs-6.9-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs (diff) | |
| parent | ovl: relax WARN_ON in ovl_verify_area() (diff) | |
| download | wireguard-linux-0d7ca657df77a3d97698d6ec392894362d2ad334.tar.xz wireguard-linux-0d7ca657df77a3d97698d6ec392894362d2ad334.zip | |
Merge tag 'ovl-fixes-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | fs/overlayfs/copy_up.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d4300cab7062..0f9dd24acc43 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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/ diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index 8586e2f5d243..0762575a1e70 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -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; } |