Skip to content

Commit 0d7ca65

Browse files
committed
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
2 parents 0a7b0ac + 77a28aa commit 0d7ca65

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16588,7 +16588,7 @@ M: Miklos Szeredi <[email protected]>
1658816588
M: Amir Goldstein <[email protected]>
1658916589
1659016590
S: Supported
16591-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
16591+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
1659216592
F: Documentation/filesystems/overlayfs.rst
1659316593
F: fs/overlayfs/
1659416594

fs/overlayfs/copy_up.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ static int ovl_verify_area(loff_t pos, loff_t pos2, loff_t len, loff_t totlen)
234234
{
235235
loff_t tmp;
236236

237-
if (WARN_ON_ONCE(pos != pos2))
237+
if (pos != pos2)
238238
return -EIO;
239-
if (WARN_ON_ONCE(pos < 0 || len < 0 || totlen < 0))
239+
if (pos < 0 || len < 0 || totlen < 0)
240240
return -EIO;
241-
if (WARN_ON_ONCE(check_add_overflow(pos, len, &tmp)))
241+
if (check_add_overflow(pos, len, &tmp))
242242
return -EIO;
243243
return 0;
244244
}

0 commit comments

Comments
 (0)