Mercurial > hg > release > icedtea7-forest-2.6 > hotspot
changeset 6695:62d0139577ca
8076475, PR3702: Misuses of strncpy/strncat
Summary: Various small fixes around strncpy and strncat
Reviewed-by: dsamersoff, coleenp
author | stuefe |
---|---|
date | Wed, 20 Feb 2019 14:15:55 +0000 |
parents | 0553e00f9404 |
children | b1fe72ea0fdd |
files | agent/src/os/bsd/libproc_impl.c agent/src/os/linux/libproc_impl.c src/os/bsd/dtrace/libjvm_db.c src/os/bsd/vm/decoder_machO.cpp src/os/solaris/dtrace/libjvm_db.c src/share/tools/hsdis/hsdis.c src/share/vm/compiler/compileBroker.hpp src/share/vm/compiler/compilerOracle.cpp src/share/vm/compiler/disassembler.cpp src/share/vm/runtime/arguments.cpp src/share/vm/utilities/ostream.cpp src/share/vm/utilities/vmError.cpp |
diffstat | 12 files changed, 53 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/os/bsd/libproc_impl.c Wed Feb 20 02:15:29 2019 +0000 +++ b/agent/src/os/bsd/libproc_impl.c Wed Feb 20 14:15:55 2019 +0000 @@ -161,7 +161,12 @@ return NULL; } - strncpy(newlib->name, libname, sizeof(newlib->name)); + if (strlen(libname) >= sizeof(newlib->name)) { + print_debug("libname %s too long\n", libname); + return NULL; + } + strcpy(newlib->name, libname); + newlib->base = base; if (fd == -1) {
--- a/agent/src/os/linux/libproc_impl.c Wed Feb 20 02:15:29 2019 +0000 +++ b/agent/src/os/linux/libproc_impl.c Wed Feb 20 14:15:55 2019 +0000 @@ -162,7 +162,12 @@ return NULL; } - strncpy(newlib->name, libname, sizeof(newlib->name)); + if (strlen(libname) >= sizeof(newlib->name)) { + print_debug("libname %s too long\n", libname); + return NULL; + } + strcpy(newlib->name, libname); + newlib->base = base; if (fd == -1) {
--- a/src/os/bsd/dtrace/libjvm_db.c Wed Feb 20 02:15:29 2019 +0000 +++ b/src/os/bsd/dtrace/libjvm_db.c Wed Feb 20 14:15:55 2019 +0000 @@ -559,13 +559,14 @@ CHECK_FAIL(err); result[0] = '\0'; - strncat(result, klassString, size); - size -= strlen(klassString); - strncat(result, ".", size); - size -= 1; - strncat(result, nameString, size); - size -= strlen(nameString); - strncat(result, signatureString, size); + if (snprintf(result, size, + "%s.%s%s", + klassString, + nameString, + signatureString) >= size) { + // truncation + goto fail; + } if (nameString != NULL) free(nameString); if (klassString != NULL) free(klassString); @@ -1072,9 +1073,9 @@ CHECK_FAIL(err); } if (deoptimized) { - strncat(result + 1, " [deoptimized frame]; ", size-1); + strncat(result, " [deoptimized frame]; ", size - strlen(result) - 1); } else { - strncat(result + 1, " [compiled] ", size-1); + strncat(result, " [compiled] ", size - strlen(result) - 1); } if (debug) fprintf(stderr, "name_for_nmethod: END: method name: %s, vf_cnt: %d\n\n",
--- a/src/os/bsd/vm/decoder_machO.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/os/bsd/vm/decoder_machO.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -97,6 +97,7 @@ char * symname = mach_find_in_stringtable((char*) ((uintptr_t)mach_base + stroff), strsize, found_strx); if (symname) { strncpy(buf, symname, buflen); + buf[buflen - 1] = '\0'; return true; } DEBUG_ONLY(tty->print_cr("no string or null string found."));
--- a/src/os/solaris/dtrace/libjvm_db.c Wed Feb 20 02:15:29 2019 +0000 +++ b/src/os/solaris/dtrace/libjvm_db.c Wed Feb 20 14:15:55 2019 +0000 @@ -559,13 +559,14 @@ CHECK_FAIL(err); result[0] = '\0'; - strncat(result, klassString, size); - size -= strlen(klassString); - strncat(result, ".", size); - size -= 1; - strncat(result, nameString, size); - size -= strlen(nameString); - strncat(result, signatureString, size); + if (snprintf(result, size, + "%s.%s%s", + klassString, + nameString, + signatureString) >= size) { + // truncation + goto fail; + } if (nameString != NULL) free(nameString); if (klassString != NULL) free(klassString); @@ -1072,9 +1073,9 @@ CHECK_FAIL(err); } if (deoptimized) { - strncat(result + 1, " [deoptimized frame]; ", size-1); + strncat(result, " [deoptimized frame]; ", size - strlen(result) - 1); } else { - strncat(result + 1, " [compiled] ", size-1); + strncat(result, " [compiled] ", size - strlen(result) - 1); } if (debug) fprintf(stderr, "name_for_nmethod: END: method name: %s, vf_cnt: %d\n\n",
--- a/src/share/tools/hsdis/hsdis.c Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/tools/hsdis/hsdis.c Wed Feb 20 14:15:55 2019 +0000 @@ -370,6 +370,7 @@ } p = q; } + *iop = '\0'; } static void print_help(struct hsdis_app_data* app_data,
--- a/src/share/vm/compiler/compileBroker.hpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/compiler/compileBroker.hpp Wed Feb 20 14:15:55 2019 +0000 @@ -155,7 +155,8 @@ // these methods should be called in a thread safe context void set_current_method(const char* method) { - strncpy(_current_method, method, (size_t)cmname_buffer_length); + strncpy(_current_method, method, (size_t)cmname_buffer_length-1); + _current_method[cmname_buffer_length-1] = '\0'; if (UsePerfData) _perf_current_method->set_value(method); }
--- a/src/share/vm/compiler/compilerOracle.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/compiler/compilerOracle.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -654,9 +654,7 @@ // so read integer and fraction part of double value separately. if (sscanf(line, "%*[ \t]%255[0-9]%*[ /\t]%255[0-9]%n", buffer[0], buffer[1], &bytes_read) == 2) { char value[512] = ""; - strncat(value, buffer[0], 255); - strcat(value, "."); - strncat(value, buffer[1], 255); + jio_snprintf(value, sizeof(value), "%s.%s", buffer[0], buffer[1]); total_bytes_read += bytes_read; return add_option_string(c_name, c_match, m_name, m_match, signature, flag, atof(value)); } else {
--- a/src/share/vm/compiler/disassembler.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/compiler/disassembler.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -284,6 +284,7 @@ strlen((const char*)arg) > sizeof(buffer) - 1) { // Only print this when the mach changes strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = '\0'; output()->print_cr("[Disassembling for mach='%s']", arg); } } else if (match(event, "format bytes-per-line")) {
--- a/src/share/vm/runtime/arguments.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/runtime/arguments.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -3374,20 +3374,14 @@ if (end != NULL) *end = '\0'; size_t jvm_path_len = strlen(jvm_path); size_t file_sep_len = strlen(os::file_separator()); - shared_archive_path = NEW_C_HEAP_ARRAY(char, jvm_path_len + - file_sep_len + 20, mtInternal); + const size_t len = jvm_path_len + file_sep_len + 20; + shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtInternal); if (shared_archive_path != NULL) { - strncpy(shared_archive_path, jvm_path, jvm_path_len + 1); - strncat(shared_archive_path, os::file_separator(), file_sep_len); - strncat(shared_archive_path, "classes", 7); - DEBUG_ONLY(strncat(shared_archive_path, "_g", 2);) - strncat(shared_archive_path, ".jsa", 4); + jio_snprintf(shared_archive_path, len, "%s%sclasses%s.jsa", + jvm_path, os::file_separator(), DEBUG_ONLY("_g") NOT_DEBUG("")); } } else { - shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(SharedArchiveFile) + 1, mtInternal); - if (shared_archive_path != NULL) { - strncpy(shared_archive_path, SharedArchiveFile, strlen(SharedArchiveFile) + 1); - } + shared_archive_path = os::strdup_check_oom(SharedArchiveFile, mtInternal); } return shared_archive_path; }
--- a/src/share/vm/utilities/ostream.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/utilities/ostream.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -111,7 +111,7 @@ } if (add_cr) { if (result != buffer) { - strncpy(buffer, result, buflen); + memcpy(buffer, result, result_len); result = buffer; } buffer[result_len++] = '\n'; @@ -325,15 +325,19 @@ } char* oldbuf = buffer; buffer = NEW_RESOURCE_ARRAY(char, end); - strncpy(buffer, oldbuf, buffer_pos); + if (buffer_pos > 0) { + memcpy(buffer, oldbuf, buffer_pos); + } buffer_length = end; } } // invariant: buffer is always null-terminated guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob"); - buffer[buffer_pos + write_len] = 0; - strncpy(buffer + buffer_pos, s, write_len); - buffer_pos += write_len; + if (write_len > 0) { + buffer[buffer_pos + write_len] = 0; + memcpy(buffer + buffer_pos, s, write_len); + buffer_pos += write_len; + } // Note that the following does not depend on write_len. // This means that position and count get updated
--- a/src/share/vm/utilities/vmError.cpp Wed Feb 20 02:15:29 2019 +0000 +++ b/src/share/vm/utilities/vmError.cpp Wed Feb 20 14:15:55 2019 +0000 @@ -434,14 +434,7 @@ #else const char *file = _filename; #endif - size_t len = strlen(file); - size_t buflen = sizeof(buf); - - strncpy(buf, file, buflen); - if (len + 10 < buflen) { - sprintf(buf + len, ":%d", _lineno); - } - st->print(" (%s)", buf); + st->print(" (%s:%d)", file, _lineno); } else { st->print(" (0x%x)", _id); }