Merge pull request #6 from cavearr/fix/bitread-dangling-span

bitread: keep the bitstream bytes alive until they are parsed

fuzzers/036-iob-ologic/generate.py

@@ -42,7 +42,7 @@ def no_oserdes(segmk, site):
             widths = [2, 3, 4, 5, 6, 7, 8]
         else:
             assert mode == 'DDR'
-            widths = [4, 6, 8]
+            widths = [4, 6, 8, 10, 14]
 
         for opt in widths:
             segmk.add_site_tag(

fuzzers/036-iob-ologic/generate.tcl

@@ -94,6 +94,8 @@ proc run {} {
     set_property BITSTREAM.GENERAL.PERFRAMECRC YES [current_design]
     set_property IS_ENABLED 0 [get_drc_checks {REQP-79}]
     set_property IS_ENABLED 0 [get_drc_checks {REQP-144}]
+    set_property IS_ENABLED 0 [get_drc_checks {REQP-150}]
+    set_property IS_ENABLED 0 [get_drc_checks {REQP-152}]
 
     write_checkpoint -force design_pre_place.dcp
 

fuzzers/036-iob-ologic/top.py

@@ -64,7 +64,7 @@ def use_oserdese2(p, luts, connects):
     if verilog.unquote(p['DATA_RATE_OQ']) == 'SDR':
         data_widths = [2, 3, 4, 5, 6, 7, 8]
     else:
-        data_widths = [4, 6, 8]
+        data_widths = [4, 6, 8, 10, 14]
 
     p['DATA_WIDTH'] = random.choice(data_widths)
 

tools/bitread.cc

@@ -319,11 +319,18 @@ int main(int argc, char** argv) {
 		frame_range_end = strtol(p.second.c_str(), nullptr, 0) + 1;
 	}
 
+	// The owners of the bytes the span views: they must outlive the
+	// absl::visit below.  fcd561fb turned in_bytes from a copying
+	// std::vector into a Span but left both owners scoped to their
+	// if/else blocks -- the mapping was unmapped (and the stdin vector
+	// freed) before the bitstream was parsed, and every invocation
+	// crashed in the sync-word search (use-after-free).
+	std::unique_ptr<prjxray::MemoryMappedFile> in_file;
+	std::vector<uint8_t> stdin_bytes;
 	absl::Span<uint8_t> in_bytes;
 	if (argc == 2) {
 		auto in_file_name = argv[1];
-		auto in_file =
+		in_file = prjxray::MemoryMappedFile::InitWithFile(in_file_name);
-		    prjxray::MemoryMappedFile::InitWithFile(in_file_name);
 		if (!in_file) {
 			std::cerr << "Can't open input file '" << in_file_name
 			          << "' for reading!" << std::endl;
@@ -336,15 +343,15 @@ int main(int argc, char** argv) {
 		in_bytes = absl::Span<uint8_t>(
 		    static_cast<uint8_t*>(in_file->data()), in_file->size());
 	} else {
-		std::vector<uint8_t> t;
 		while (1) {
 			int c = getchar();
 			if (c == EOF)
 				break;
-			t.push_back(c);
+			stdin_bytes.push_back(c);
 		}
 		in_bytes = absl::Span<uint8_t>(
-			static_cast<uint8_t*>(t.data()), t.size());
+			static_cast<uint8_t*>(stdin_bytes.data()),
+			stdin_bytes.size());
 
 		std::cout << "Bitstream size: " << in_bytes.size() << " bytes"
 		          << std::endl;