4.19-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Gao Xiang <gaoxian...@huawei.com>

[ Upstream commit 37ec35a6cc2b99eb7fd6b85b7d7b75dff46bc353 ]

This patch fixes a missing endian conversion in
vle_get_logical_extent_head.

Reviewed-by: Chao Yu <yuch...@huawei.com>
Signed-off-by: Gao Xiang <gaoxian...@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/erofs/unzip_vle.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -1490,6 +1490,7 @@ static erofs_off_t vle_get_logical_exten
        unsigned long long ofs;
        const unsigned int clusterbits = EROFS_SB(inode->i_sb)->clusterbits;
        const unsigned int clustersize = 1 << clusterbits;
+       unsigned int delta0;
 
        if (page->index != blkaddr) {
                kunmap_atomic(*kaddr_iter);
@@ -1504,12 +1505,13 @@ static erofs_off_t vle_get_logical_exten
        di = *kaddr_iter + vle_extent_blkoff(inode, lcn);
        switch (vle_cluster_type(di)) {
        case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD:
-               BUG_ON(!di->di_u.delta[0]);
-               BUG_ON(lcn < di->di_u.delta[0]);
+               delta0 = le16_to_cpu(di->di_u.delta[0]);
+               DBG_BUGON(!delta0);
+               DBG_BUGON(lcn < delta0);
 
                ofs = vle_get_logical_extent_head(inode,
                        page_iter, kaddr_iter,
-                       lcn - di->di_u.delta[0], pcn, flags);
+                       lcn - delta0, pcn, flags);
                break;
        case Z_EROFS_VLE_CLUSTER_TYPE_PLAIN:
                *flags ^= EROFS_MAP_ZIPPED;


Reply via email to