[openssl/openssl] 84a07a: Merge event masks for duplicate fds in the RIO pol...

  Branch: refs/heads/openssl-3.6
  Home:   https://github.com/openssl/openssl
  Commit: 84a07a7d63da63d8ea5c3a1ea3f8f1c06ce67c91
      https://github.com/openssl/openssl/commit/84a07a7d63da63d8ea5c3a1ea3f8f1c06ce67c91
  Author: Mounir IDRASSI <[email protected]>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M ssl/rio/poll_builder.c

  Log Message:
  -----------
  Merge event masks for duplicate fds in the RIO poll builder

ossl_rio_poll_builder_add_fd() documents duplicate registrations as
equivalent to one registration with the logical OR of the requested
directions. The poll(2) backend instead cleared an existing entry,
making duplicate registrations last-writer-wins. The select(2)
backend only adds bits to its fd_sets and already merges them.

Clear the mask only when populating a new or reusable slot so an
existing fd retains its previously requested events.

Fixes https://github.com/openssl/openssl/issues/32116

Assisted-by: Codex:gpt-5.6-sol

Reviewed-by: Paul Yang <[email protected]>
Reviewed-by: Jakub Zelenka <[email protected]>
MergeDate: Tue Aug 11 07:12:57 2026
(Merged from https://github.com/openssl/openssl/pull/32117)

(cherry picked from commit 363b604bffc131e2ccda48b89d2d3ebf5eb285ad)


  Commit: 7bc0551947e5ec01a78715371338a1e7130203aa
      https://github.com/openssl/openssl/commit/7bc0551947e5ec01a78715371338a1e7130203aa
  Author: Mounir IDRASSI <[email protected]>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M test/build.info
    A test/recipes/70-test_rio_poll_builder.t
    A test/rio_poll_builder_test.c

  Log Message:
  -----------
  test: cover duplicate fd event merging in RIO poll builder

Add a poll-backend unit test which registers the same fd first for
reading and then for writing. Verify that the builder retains one
pollfd with both POLLIN and POLLOUT set.

Without the preceding fix, the test observes POLLOUT only. Wire the
test into the QUIC-gated test build and skip it on non-poll backends.

Assisted-by: Codex:gpt-5.6-sol

Reviewed-by: Paul Yang <[email protected]>
Reviewed-by: Jakub Zelenka <[email protected]>
MergeDate: Tue Aug 11 07:12:58 2026
(Merged from https://github.com/openssl/openssl/pull/32117)

(cherry picked from commit 258f06b1ef57ce147ff2b1da5977d9e9adc55be7)


Compare: https://github.com/openssl/openssl/compare/3a95a436ee52...7bc0551947e5

To unsubscribe from these emails, change your notification settings at https://github.com/openssl/openssl/settings/notifications

-- 
You received this message because you are subscribed to the Google Groups "openssl-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/a/openssl.org/d/msgid/openssl-commits/openssl/openssl/push/refs/heads/openssl-3.6/3a95a4-7bc055%40github.com.