A mirror of https://github.com/libressl/openbsd.git https://git.lua4.win/openbsd/atom?h=libressl-v3.5.0 2022-02-21T00:22:03+00:00 2022-02-21T00:22:03+00:00 jsg 2022-02-21T00:22:03+00:00 urn:sha1:932ea6b3c7444557aea0d561efe9ae3fad6aaeba 2022-02-20T19:16:34+00:00 tb 2022-02-20T19:16:34+00:00 urn:sha1:7628b3cbf8e092fc94951499208d3a7c349c590c This only occurs on very small payloads and tightly allocated buffers that don't usually occur in practice. This is OpenSSL f61c6804 ok inoguchi jsing 2022-02-19T16:00:14+00:00 jsing 2022-02-19T16:00:14+00:00 urn:sha1:e842aa909fe02d891a253eacf804384bbfa396a0 ok inoguchi@ tb@ 2022-02-19T15:59:12+00:00 jsing 2022-02-19T15:59:12+00:00 urn:sha1:ecfbd0cd7a34e8b04af5f08a69bc02929f863d11 Currently, a read/write memory BIO pulls up the data via memmove() on each read. This becomes very expensive when a lot of small reads are performed, especially if there is a reasonable amount of data stored in the memory BIO. Instead, store a read offset into the buffer and only perform a memmove() to pull up the data on a write, if we have read more than 4096 bytes. This way we only perform memmove() when the space saving will potentially be of benefit, while avoiding frequent memmove() in the case of small interleaved reads and writes. Should address oss-fuzz #19881. ok inoguchi@ tb@ 2022-02-19T13:09:36+00:00 jsg 2022-02-19T13:09:36+00:00 urn:sha1:c65c3cdf53ef02b91dc926fc65376098c26a1ae0 2022-02-19T08:11:16+00:00 jsing 2022-02-19T08:11:16+00:00 urn:sha1:5504d19c6403ab7e219eaf0b32151f79998f1d0d In order to fix and improve the memory BIO, we need to be able to track more than just a single BUF_MEM *. Provide a struct bio_mem (which currently only contains a BUF_MEM *) and rework the internals to use this struct. ok inoguchi@ tb@ 2022-02-18T17:30:13+00:00 jsing 2022-02-18T17:30:13+00:00 urn:sha1:e7ff7e9be98905e4e791056a5d6ec18f71fc52ff This is a first pass that uses sensible and consistent names for variables. Call the BIO 'bio' (instead of 'a', 'b', 'bp', or 'h'), drop a bunch of unnecessary casts, simplify some logic and add additional error checking. With input from and ok tb@ 2022-02-18T10:24:32+00:00 jsg 2022-02-18T10:24:32+00:00 urn:sha1:303b9a6be2b1c82c6b6e7c9d259745149c6210de ok gnezdo@ miod@ jmc@ 2022-02-18T01:41:17+00:00 jsg 2022-02-18T01:41:17+00:00 urn:sha1:6c9ab8d34e7550f79c184f5c0b49f2e566abc030 ok jmc@ 2022-02-12T03:07:24+00:00 jsing 2022-02-12T03:07:24+00:00 urn:sha1:4f6b3f124aaba62ebcf7e04e6536475e0aa3d1d2 A fix for this was previously commited in r1.32, however while this added a bounds check the logic means we still fall through and perform the overread. Fix the logic such that we only log the error if the bounds check fails. While here, flip the test around such that we check for validity then print (which is more readable and matches earlier code). ok inoguchi@ tb@