From d50580de27331f11da5508e193d4e873e63d16a8 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 11 Jun 2021 15:13:23 +0800 Subject: [PATCH] iomap: Make sure iomap_end is called after iomap_begin mainline inclusion from mainline-5.9-rc1 commit 856473cd5d17dbbf3055710857c67a4af6d9fcc0 category: bugfix bugzilla: 40769 CVE: NA --------------------------- Make sure iomap_end is always called when iomap_begin succeeds. Without this fix, iomap_end won't be called when a filesystem's iomap_begin operation returns an invalid mapping, bypassing any unlocking done in iomap_end. With this fix, the unlocking will still happen. This bug was found by Bob Peterson during code review. It's unlikely that such iomap_begin bugs will survive to affect users, so backporting this fix seems unnecessary. Fixes: ae259a9c8593 ("fs: introduce iomap infrastructure") Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong [fs/iomap/apply.c not exist, instead fs/iomap.c] Signed-off-by: yangerkun Reviewed-by: Zhang Yi Signed-off-by: Yang Yingliang --- fs/iomap.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index bb2f966798d3..fd3439997d29 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -67,10 +67,14 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, ret = ops->iomap_begin(inode, pos, length, flags, &iomap); if (ret) return ret; - if (WARN_ON(iomap.offset > pos)) - return -EIO; - if (WARN_ON(iomap.length == 0)) - return -EIO; + if (WARN_ON(iomap.offset > pos)) { + written = -EIO; + goto out; + } + if (WARN_ON(iomap.length == 0)) { + written = -EIO; + goto out; + } /* * Cut down the length to the one actually provided by the filesystem, @@ -86,6 +90,7 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, */ written = actor(inode, pos, length, data, &iomap); +out: /* * Now the data has been copied, commit the range we've copied. This * should not fail unless the filesystem has had a fatal error. -- GitLab