[bugfix] workaround if some SegmentMapping refers to end of tar

Currently it could happen on EROFS meta indexes. Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
containerd · Oct 24, 2024 · dc073b2 · dc073b2
1 parent 62e5e66
commit dc073b2
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/overlaybd/lsmt/file.cpp b/src/overlaybd/lsmt/file.cpp
@@ -573,9 +573,19 @@ class LSMTReadOnlyFile : public IFileRW {
                 // LOG_DEBUG("offset: `, length: `", m.moffset, size);
                 ssize_t ret = m_files[m.tag]->pread(buf, size, m.moffset * ALIGNMENT);
                 if (ret < size) {
-                    LOG_ERRNO_RETURN(0, (int)ret,
-                                     "failed to read from `-th file ( ` pread return: ` < size: `)",
-                                     m.tag, m_files[m.tag], ret, size);
+                    if (ret < 0) {
+                        LOG_ERRNO_RETURN(0, -1,
+                                         "failed to read from `-th file ( ` pread return: ` < size: `)",
+                                         m.tag, m_files[m.tag], ret, size);
+                    }
+                    size_t ret2 = m_files[m.tag]->pread((char *)buf + ret, size - ret, m.moffset * ALIGNMENT + ret);
+                    if (ret2) {
+                        LOG_ERRNO_RETURN(0, (int)ret,
+                                         "failed to read from `-th file ( ` pread return: ` < size: `)",
+                                         m.tag, m_files[m.tag], ret, size);
+                    } else {
+                        memset((char *)buf + ret, 0, size - ret);
+                    }
                 }
                 lsmt_io_size += ret;
                 lsmt_io_cnt++;