From 29fcd96277b8ec3356e421c6267c532c0c2dcc68 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 13 May 2021 13:11:57 +0200 Subject: [PATCH] librbd/cache/pwl/ssd: stronger assert in aio_read_data_blocks() Signed-off-by: Ilya Dryomov (cherry picked from commit ab05cc4a8f4709db649ad51d32141e429d9dc2b3) --- src/librbd/cache/pwl/ssd/WriteLog.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc index 962bfd9fabfdc..89ed6c3958b26 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.cc +++ b/src/librbd/cache/pwl/ssd/WriteLog.cc @@ -965,8 +965,9 @@ void WriteLog::aio_read_data_blocks( ldout(cct, 20) << "entry i=" << i << " " << log_entry->write_data_pos << "~" << len << dendl; - ceph_assert(log_entry->write_data_pos <= pool_root.pool_size); - ceph_assert(align_len != 0); + ceph_assert(log_entry->write_data_pos >= DATA_RING_BUFFER_OFFSET && + log_entry->write_data_pos < pool_root.pool_size); + ceph_assert(align_len); if (log_entry->write_data_pos + align_len > pool_root.pool_size) { // spans boundary, need to split uint64_t len1 = pool_root.pool_size - log_entry->write_data_pos; -- 2.39.5