Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main

2023-07-20 16:23:08 +00:00 · 2023-07-20 16:23:08 +00:00 · 89d22239d2
commit 89d22239d2
parent 998c3b4fbe e1132a9c2f
1 changed files with 1 additions and 1 deletions
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
@ -305,7 +305,7 @@ bool ReadWorker::ReadAlignedSector(sector_t sector, size_t sz) {
                    return false;
                }

-                ret = BLOCK_SZ;
+                ret = std::min(BLOCK_SZ, read_size);
            }

            read_size -= ret;