Abhishek Chennaka has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/22373 )
Change subject: [thirdparty] Upgrade protobuf to 3.21.9 ...................................................................... [thirdparty] Upgrade protobuf to 3.21.9 protobuf upgrade to 3.21.9 to address the CVE [1] The function error_message() is changed to message() in the commit [2] in the file [3]. Hence renamed the call sites in Kudu repo accordingly. Replacing function calls ExtractSubrange() with UnsafeArenaExtractSubrange() as per [4]. Refer [5] for more information of the commit in the file, repeated_field.h. We also add the needed mappings for IWYU which stem due to [6]. [1] https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-8gq9-2x98-w8hf [2] https://github.com/protocolbuffers/protobuf/commit/0894e07536af88065d462cdc9d8e807c0723ef4d#diff-26f14c21bd27b6500347fdacdeea49b8bccde636aab2ecae545515e76a5a48bd [3] src/google/protobuf/stubs/status.h [4] https://github.com/protocolbuffers/protobuf/blob/2798a968c330de223b711e4fe504800280f333fb/src/google/protobuf/repeated_ptr_field.h#L1069-L1073 [5] https://github.com/protocolbuffers/protobuf/commit/6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e#diff-5cc9e8e347380b7bbc8fac8c06dc98100f3b5c076fcffa177e8ce11e753d4f7c [6] https://github.com/protocolbuffers/protobuf/blob/2798a968c330de223b711e4fe504800280f333fb/src/google/protobuf/repeated_ptr_field.h#L44 Note: There will be followup patches to introduce abseil and upgrade protobuf to atleast v25.5 References: https://gerrit.cloudera.org/#/c/22205/ https://gerrit.cloudera.org/#/c/22206/ Change-Id: I5274c5f4c681a864d126c51960fa3b41d4f568d7 Reviewed-on: http://gerrit.cloudera.org:8080/22373 Reviewed-by: Alexey Serbin <[email protected]> Tested-by: Abhishek Chennaka <[email protected]> --- A build-support/iwyu/mappings/protobuf.imp M src/kudu/consensus/consensus_peers.cc M src/kudu/consensus/consensus_queue-test.cc M src/kudu/consensus/consensus_queue.cc M src/kudu/consensus/consensus_queue.h M src/kudu/consensus/log.cc M src/kudu/consensus/log_util.cc M src/kudu/subprocess/subprocess_protocol.cc M src/kudu/tools/tool_action_pbc.cc M src/kudu/tools/tool_action_table.cc M src/kudu/tools/tool_action_test.cc M thirdparty/vars.sh 12 files changed, 42 insertions(+), 22 deletions(-) Approvals: Alexey Serbin: Looks good to me, approved Abhishek Chennaka: Verified -- To view, visit http://gerrit.cloudera.org:8080/22373 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: kudu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5274c5f4c681a864d126c51960fa3b41d4f568d7 Gerrit-Change-Number: 22373 Gerrit-PatchSet: 16 Gerrit-Owner: Abhishek Chennaka <[email protected]> Gerrit-Reviewer: Abhishek Chennaka <[email protected]> Gerrit-Reviewer: Alexey Serbin <[email protected]> Gerrit-Reviewer: Kudu Jenkins (120)
