backport_1151865.patch 1.0 KB

1234567891011121314151617181920212223
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Andrey Belenko <[email protected]>
  3. Date: Thu, 10 Dec 2020 22:16:52 +0100
  4. Subject: Chromium backport: crbug.com/1151865
  5. M87-1
  6. Reject mojom::DataElement serialization if array size read failed
  7. https://chromium-review.googlesource.com/c/chromium/src/+/2567130
  8. CVE-2020-16041
  9. diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
  10. index 022fdd9ee17e64b9819ed4fb1c1af80a02566360..f3edb5f1a0ff0492800de551483a7720955d7f55 100644
  11. --- a/services/network/public/cpp/url_request_mojom_traits.cc
  12. +++ b/services/network/public/cpp/url_request_mojom_traits.cc
  13. @@ -255,6 +255,8 @@ bool StructTraits<network::mojom::DataElementDataView, network::DataElement>::
  14. if (data.type() == network::mojom::DataElementType::kBytes) {
  15. if (!data.ReadBuf(&out->buf_))
  16. return false;
  17. + if (data.length() != out->buf_.size())
  18. + return false;
  19. }
  20. out->type_ = data.type();
  21. out->data_pipe_getter_ = data.TakeDataPipeGetter<