Skip to content

8335237: ubsan: vtableStubs.hpp is_vtable_stub exclude from ubsan checks #19925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8335237: ubsan: vtableStubs.hpp is_vtable_stub exclude from ubsan checks #19925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3538a47
JDK-8335237
MBaesken Jun 27, 2024
dc4fa30
add comment
MBaesken Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/hotspot/share/code/vtableStubs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -28,6 +28,7 @@
#include "asm/macroAssembler.hpp"
#include "code/vmreg.hpp"
#include "memory/allStatic.hpp"
#include "sanitizers/ub.hpp"
#include "utilities/checkedCast.hpp"

// A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables
Expand Down Expand Up @@ -173,6 +174,9 @@ class VtableStub {
public:
// Query
bool is_itable_stub() { return !_is_vtable_stub; }
// We reinterpret arbitrary memory as VtableStub. This does not cause failures because the lookup/equality
// check will reject false objects. Disabling UBSan is a temporary workaround until JDK-8331725 is fixed.
ATTRIBUTE_NO_UBSAN
bool is_vtable_stub() { return _is_vtable_stub; }
bool is_abstract_method_error(address epc) { return epc == code_begin()+_ame_offset; }
bool is_null_pointer_exception(address epc) { return epc == code_begin()+_npe_offset; }
Expand Down