DX-61688: AES_DECRYPT function reliably segfaults the JVM #23

schavan6 · 2023-06-03T02:29:04Z

When aes_decrypt function throws a runtime error, a null pointer was returned which caused the segmentation fault.

Fix - Removed the error-causing null pointer return, replaced with a meaningful error return.

When aes_decrypt function throws a runtime error, a null pointer was returned which caused the segmentation fault. Fix - Only Function error context is set in case of a runtime error, removed the error-causing null pointer return.

When aes_decrypt function throws a runtime error, a null pointer was returned which caused the segmentation fault. Fix - Removed the error-causing null pointer return.

github-actions · 2023-06-03T02:29:26Z

Thanks for opening a pull request!

If this is not a minor PR. Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose

Opening GitHub issues ahead of time contributes to the Openness of the Apache Arrow project.

Then could you also rename the pull request title in the following format?

GH-${GITHUB_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}

or

MINOR: [${COMPONENT}] ${SUMMARY}

In the case of PARQUET issues on JIRA the title also supports:

PARQUET-${JIRA_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}

See also:

Removed whitespace

vvellanki · 2023-06-05T04:37:37Z

cpp/src/gandiva/gdv_function_stubs.cc

@@ -363,8 +363,8 @@ const char* gdv_fn_aes_decrypt(int64_t context, const char* data, int32_t data_l
    *out_len = gandiva::aes_decrypt(data, data_len, key_data,
                                    reinterpret_cast<unsigned char*>(ret));
  } catch (const std::runtime_error& e) {
-    gdv_fn_context_set_error_msg(context, e.what());
-    return nullptr;
+    std::string err_msg = "Error occurred while decrypting ciphertext.";


Please include the original error message as much as possible. For e.g. something like
"Error occurred while decrypting ciphertext: %s", e.what()

Can you also search for this pattern in other functions and ensure that we fix those instances also?

Other functions that catch runtime_error might have similar issues

When aes_decrypt function throws a runtime error, a null pointer was returned which caused the segmentation fault. Fix - Removed the error-causing null pointer return. Amend to the main commit - Rewrote error message and corrected the same case for aes_encrypt as well.

schavan6 · 2023-06-05T14:20:44Z

@vvellanki Thank you for reviewing this. I have accordingly changed the error message and corrected only other case I found where a null pointer was returned on a runtime error.

cpp/src/gandiva/gdv_function_stubs.cc

…n timezone (apache#45051) ### Rationale for this change If the timezone database is present on the system, but does not contain a timezone referenced in a ORC file, the ORC reader will crash with an uncaught C++ exception. This can happen for example on Ubuntu 24.04 where some timezone aliases have been removed from the main `tzdata` package to a `tzdata-legacy` package. If `tzdata-legacy` is not installed, trying to read a ORC file that references e.g. the "US/Pacific" timezone would crash. Here is a backtrace excerpt: ``` dremio#12 0x00007f1a3ce23a55 in std::terminate() () from /lib/x86_64-linux-gnu/libstdc++.so.6 dremio#13 0x00007f1a3ce39391 in __cxa_throw () from /lib/x86_64-linux-gnu/libstdc++.so.6 dremio#14 0x00007f1a3f4accc4 in orc::loadTZDB(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#15 0x00007f1a3f4ad392 in std::call_once<orc::LazyTimezone::getImpl() const::{lambda()dremio#1}>(std::once_flag&, orc::LazyTimezone::getImpl() const::{lambda()dremio#1}&&)::{lambda()dremio#2}::_FUN() () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#16 0x00007f1a4298bec3 in __pthread_once_slow (once_control=0xa5ca7c8, init_routine=0x7f1a3ce69420 <__once_proxy>) at ./nptl/pthread_once.c:116 dremio#17 0x00007f1a3f4a9ad0 in orc::LazyTimezone::getEpoch() const () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#18 0x00007f1a3f4e76b1 in orc::TimestampColumnReader::TimestampColumnReader(orc::Type const&, orc::StripeStreams&, bool) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#19 0x00007f1a3f4e84ad in orc::buildReader(orc::Type const&, orc::StripeStreams&, bool, bool, bool) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#20 0x00007f1a3f4e8dd7 in orc::StructColumnReader::StructColumnReader(orc::Type const&, orc::StripeStreams&, bool, bool) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#21 0x00007f1a3f4e8532 in orc::buildReader(orc::Type const&, orc::StripeStreams&, bool, bool, bool) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#22 0x00007f1a3f4925e9 in orc::RowReaderImpl::startNextStripe() () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#23 0x00007f1a3f492c9d in orc::RowReaderImpl::next(orc::ColumnVectorBatch&) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 dremio#24 0x00007f1a3e6b251f in arrow::adapters::orc::ORCFileReader::Impl::ReadBatch(orc::RowReaderOptions const&, std::shared_ptr<arrow::Schema> const&, long) () from /tmp/arrow-HEAD.ArqTs/venv-wheel-3.12-manylinux_2_17_x86_64.manylinux2014_x86_64/lib/python3.12/site-packages/pyarrow/libarrow.so.1900 ``` ### What changes are included in this PR? Catch C++ exceptions when iterating ORC batches instead of letting them slip through. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: apache#40633 Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: Sutou Kouhei <kou@clear-code.com>

schavan6 added 2 commits June 2, 2023 11:29

DX-61688: AES_DECRYPT function reliably segfaults the JVM

21b2d60

When aes_decrypt function throws a runtime error, a null pointer was returned which caused the segmentation fault. Fix - Removed the error-causing null pointer return.

github-actions bot added Component: C++ Component: C++ - Gandiva awaiting review labels Jun 3, 2023

Update encrypt_utils_test.cc

8940358

Removed whitespace

vvellanki reviewed Jun 5, 2023

View reviewed changes

lriggs reviewed Jun 5, 2023

View reviewed changes

cpp/src/gandiva/gdv_function_stubs.cc Show resolved Hide resolved

schavan6 closed this Jun 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DX-61688: AES_DECRYPT function reliably segfaults the JVM #23

DX-61688: AES_DECRYPT function reliably segfaults the JVM #23

schavan6 commented Jun 3, 2023 •

edited

Loading

github-actions bot commented Jun 3, 2023

vvellanki Jun 5, 2023

vvellanki Jun 5, 2023

schavan6 commented Jun 5, 2023

DX-61688: AES_DECRYPT function reliably segfaults the JVM #23

DX-61688: AES_DECRYPT function reliably segfaults the JVM #23

Conversation

schavan6 commented Jun 3, 2023 • edited Loading

github-actions bot commented Jun 3, 2023

vvellanki Jun 5, 2023

Choose a reason for hiding this comment

vvellanki Jun 5, 2023

Choose a reason for hiding this comment

schavan6 commented Jun 5, 2023

schavan6 commented Jun 3, 2023 •

edited

Loading