remove the code-lines that checking the {ofs,len} bounderies; and modifies them if necessary(invalid read)

galsalomon66 · galsalomon66 · commit 2f81b4d618ed · 2024-10-21T22:12:26.000+03:00
Signed-off-by: Gal Salomon &lt;gal.salomon@gmail.com&gt;
diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc
@@ -806,11 +806,6 @@ int RGWSelectObj_ObjStore_S3::parquet_processing(bufferlist& bl, off_t ofs, off_
       }
       append_in_callback += it.length();
       ldout(s->cct, 10) << "S3select: part " << part_no++ << " it.length() = " << it.length() << dendl;
-      if ((ofs + len) > it.length()){
-	ldpp_dout(this, 10) << "s3select: offset and length may cause invalid read: ofs = " << ofs << " len = " << len << " it.length() = " << it.length() << dendl;
-	ofs = 0;
-	len = it.length();
-      }
       requested_buffer.append(&(it)[0]+ofs, len);
     }
     ldout(s->cct, 10) << "S3select:append_in_callback = " << append_in_callback << dendl;

Original file line number	Diff line number	Diff line change
`@@ -806,11 +806,6 @@ int RGWSelectObj_ObjStore_S3::parquet_processing(bufferlist& bl, off_t ofs, off_`
`806`	`806`	`}`
`807`	`807`	`append_in_callback += it.length();`
`808`	`808`	`ldout(s->cct, 10) << "S3select: part " << part_no++ << " it.length() = " << it.length() << dendl;`
`809`		`- if ((ofs + len) > it.length()){`
`810`		`- ldpp_dout(this, 10) << "s3select: offset and length may cause invalid read: ofs = " << ofs << " len = " << len << " it.length() = " << it.length() << dendl;`
`811`		`- ofs = 0;`
`812`		`- len = it.length();`
`813`		`- }`
`814`	`809`	`requested_buffer.append(&(it)[0]+ofs, len);`
`815`	`810`	`}`
`816`	`811`	`ldout(s->cct, 10) << "S3select:append_in_callback = " << append_in_callback << dendl;`