archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8197780: Null pointer dereference in Klass::is_instance_klass of klass.hpp:532

Browse source 
Make generate_class_cast_message able to deal with NULL klass from the constant pool.

Reviewed-by: hseigel, lfoltan
This commit is contained in:
Coleen Phillimore 2018-02-23 07:47:29 -05:00
parent 2fb89326ba
commit 809315bdd1
6 changed files with 100 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/share/oops/constantPool.cpp
View file

@ -547,12 +547,6 @@ Klass* ConstantPool::klass_at_if_loaded(const constantPoolHandle& this_cp, int w
}
}
Klass* ConstantPool::klass_ref_at_if_loaded(const constantPoolHandle& this_cp, int which) {
return klass_at_if_loaded(this_cp, this_cp->klass_ref_index_at(which));
}
Method* ConstantPool::method_at_if_loaded(const constantPoolHandle& cpool,
int which) {
if (cpool->cache() == NULL) return NULL; // nothing to load yet

3
src/hotspot/share/oops/constantPool.hpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, 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
@ -824,7 +824,6 @@ class ConstantPool : public Metadata {
static bool has_method_type_at_if_loaded (const constantPoolHandle& this_cp, int which);
static oop method_type_at_if_loaded (const constantPoolHandle& this_cp, int which);
static Klass* klass_at_if_loaded (const constantPoolHandle& this_cp, int which);
static Klass* klass_ref_at_if_loaded (const constantPoolHandle& this_cp, int which);
// Routines currently used for annotations (only called by jvm.cpp) but which might be used in the
// future by other Java code. These take constant pool indices rather than

82
src/hotspot/share/oops/klass.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, 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
@ -737,4 +737,82 @@ bool Klass::verify_itable_index(int i) {
return true;
}
#endif
#endif // PRODUCT
// The caller of class_loader_and_module_name() (or one of its callers)
// must use a ResourceMark in order to correctly free the result.
const char* Klass::class_loader_and_module_name() const {
const char* delim = "/";
size_t delim_len = strlen(delim);
const char* fqn = external_name();
// Length of message to return; always include FQN
size_t msglen = strlen(fqn) + 1;
bool has_cl_name = false;
bool has_mod_name = false;
bool has_version = false;
// Use class loader name, if exists and not builtin
const char* class_loader_name = "";
ClassLoaderData* cld = class_loader_data();
assert(cld != NULL, "class_loader_data should not be NULL");
if (!cld->is_builtin_class_loader_data()) {
// If not builtin, look for name
oop loader = class_loader();
if (loader != NULL) {
oop class_loader_name_oop = java_lang_ClassLoader::name(loader);
if (class_loader_name_oop != NULL) {
class_loader_name = java_lang_String::as_utf8_string(class_loader_name_oop);
if (class_loader_name != NULL && class_loader_name[0] != '\0') {
has_cl_name = true;
msglen += strlen(class_loader_name) + delim_len;
}
}
}
}
const char* module_name = "";
const char* version = "";
const Klass* bottom_klass = is_objArray_klass() ?
ObjArrayKlass::cast(this)->bottom_klass() : this;
if (bottom_klass->is_instance_klass()) {
ModuleEntry* module = InstanceKlass::cast(bottom_klass)->module();
// Use module name, if exists
if (module->is_named()) {
has_mod_name = true;
module_name = module->name()->as_C_string();
msglen += strlen(module_name);
// Use version if exists and is not a jdk module
if (module->is_non_jdk_module() && module->version() != NULL) {
has_version = true;
version = module->version()->as_C_string();
msglen += strlen("@") + strlen(version);
}
}
} else {
// klass is an array of primitives, so its module is java.base
module_name = JAVA_BASE_NAME;
}
if (has_cl_name || has_mod_name) {
msglen += delim_len;
}
char* message = NEW_RESOURCE_ARRAY_RETURN_NULL(char, msglen);
// Just return the FQN if error in allocating string
if (message == NULL) {
return fqn;
}
jio_snprintf(message, msglen, "%s%s%s%s%s%s%s",
class_loader_name,
(has_cl_name) ? delim : "",
(has_mod_name) ? module_name : "",
(has_version) ? "@" : "",
(has_version) ? version : "",
(has_cl_name || has_mod_name) ? delim : "",
fqn);
return message;
}

4
src/hotspot/share/oops/klass.hpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, 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
@ -506,6 +506,8 @@ protected:
// and the package separators as '/'.
virtual const char* signature_name() const;
const char* class_loader_and_module_name() const;
// type testing operations
#ifdef ASSERT
protected:

98
src/hotspot/share/runtime/sharedRuntime.cpp
View file

@ -1922,95 +1922,27 @@ char* SharedRuntime::generate_class_cast_message(
vframeStream vfst(thread, true);
assert(!vfst.at_end(), "Java frame must exist");
Bytecode_checkcast cc(vfst.method(), vfst.method()->bcp_from(vfst.bci()));
Klass* target_klass = vfst.method()->constants()->klass_at(
cc.index(), thread);
return generate_class_cast_message(caster_klass, target_klass);
constantPoolHandle cpool(thread, vfst.method()->constants());
Klass* target_klass = ConstantPool::klass_at_if_loaded(cpool, cc.index());
Symbol* target_klass_name = NULL;
if (target_klass == NULL) {
// This klass should be resolved, but just in case, get the name in the klass slot.
target_klass_name = cpool->klass_name_at(cc.index());
}
return generate_class_cast_message(caster_klass, target_klass, target_klass_name);
}
// The caller of class_loader_and_module_name() (or one of its callers)
// The caller of generate_class_cast_message() (or one of its callers)
// must use a ResourceMark in order to correctly free the result.
const char* class_loader_and_module_name(Klass* klass) {
const char* delim = "/";
size_t delim_len = strlen(delim);
const char* fqn = klass->external_name();
// Length of message to return; always include FQN
size_t msglen = strlen(fqn) + 1;
bool has_cl_name = false;
bool has_mod_name = false;
bool has_version = false;
// Use class loader name, if exists and not builtin
const char* class_loader_name = "";
ClassLoaderData* cld = klass->class_loader_data();
assert(cld != NULL, "class_loader_data should not be NULL");
if (!cld->is_builtin_class_loader_data()) {
// If not builtin, look for name
oop loader = klass->class_loader();
if (loader != NULL) {
oop class_loader_name_oop = java_lang_ClassLoader::name(loader);
if (class_loader_name_oop != NULL) {
class_loader_name = java_lang_String::as_utf8_string(class_loader_name_oop);
if (class_loader_name != NULL && class_loader_name[0] != '\0') {
has_cl_name = true;
msglen += strlen(class_loader_name) + delim_len;
}
}
}
}
const char* module_name = "";
const char* version = "";
Klass* bottom_klass = klass->is_objArray_klass() ?
ObjArrayKlass::cast(klass)->bottom_klass() : klass;
if (bottom_klass->is_instance_klass()) {
ModuleEntry* module = InstanceKlass::cast(bottom_klass)->module();
// Use module name, if exists
if (module->is_named()) {
has_mod_name = true;
module_name = module->name()->as_C_string();
msglen += strlen(module_name);
// Use version if exists and is not a jdk module
if (module->is_non_jdk_module() && module->version() != NULL) {
has_version = true;
version = module->version()->as_C_string();
msglen += strlen("@") + strlen(version);
}
}
} else {
// klass is an array of primitives, so its module is java.base
module_name = JAVA_BASE_NAME;
}
if (has_cl_name || has_mod_name) {
msglen += delim_len;
}
char* message = NEW_RESOURCE_ARRAY_RETURN_NULL(char, msglen);
// Just return the FQN if error in allocating string
if (message == NULL) {
return fqn;
}
jio_snprintf(message, msglen, "%s%s%s%s%s%s%s",
class_loader_name,
(has_cl_name) ? delim : "",
(has_mod_name) ? module_name : "",
(has_version) ? "@" : "",
(has_version) ? version : "",
(has_cl_name || has_mod_name) ? delim : "",
fqn);
return message;
}
char* SharedRuntime::generate_class_cast_message(
Klass* caster_klass, Klass* target_klass) {
Klass* caster_klass, Klass* target_klass, Symbol* target_klass_name) {
const char* caster_name = class_loader_and_module_name(caster_klass);
const char* caster_name = caster_klass->class_loader_and_module_name();
const char* target_name = class_loader_and_module_name(target_klass);
assert(target_klass != NULL || target_klass_name != NULL, "one must be provided");
const char* target_name = target_klass == NULL ? target_klass_name->as_C_string() :
target_klass->class_loader_and_module_name();
size_t msglen = strlen(caster_name) + strlen(" cannot be cast to ") + strlen(target_name) + 1;

2
src/hotspot/share/runtime/sharedRuntime.hpp
View file

@ -318,7 +318,7 @@ class SharedRuntime: AllStatic {
// The caller (or one of it's callers) must use a ResourceMark
// in order to correctly free the result.
//
static char* generate_class_cast_message(Klass* caster_klass, Klass* target_klass);
static char* generate_class_cast_message(Klass* caster_klass, Klass* target_klass, Symbol* target_klass_name = NULL);
// Resolves a call site- may patch in the destination of the call into the
// compiled code.