stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8133249: Occasional SIGSEGV: non thread-safe use of strerr in getLastErrorString

Browse Source 
Reviewed-by: igerasim, rriggs, christos
This commit is contained in:
Rob McKenna 2015-10-01 00:13:09 +01:00
parent ddf365ac99
commit 7127fab647
10 changed files with 68 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/make/lib/CoreLibraries.gmk
View File

@ -160,6 +160,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
-framework Security -framework SystemConfiguration, \
LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
-export:getLastErrorString \
-export:getErrorString \
jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
advapi32.lib version.lib, \

3
jdk/make/mapfiles/libjava/mapfile-vers
View File

@ -282,8 +282,9 @@ SUNWprivate_1.1 {
# ZipFile.c needs this one
throwFileNotFoundException;
# zip_util.c needs this one
# zip_util.c needs these
getLastErrorString;
getErrorString;
# Outcalls from libjvm done using dlsym().

1
jdk/src/java.base/share/native/libjava/jni_util.h
View File

@ -388,6 +388,7 @@ void buildJniFunctionName(const char *sym, const char *cname,
char *jniEntryName);
extern size_t getLastErrorString(char *buf, size_t len);
extern int getErrorString(int err, char *buf, size_t len);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */

15
jdk/src/java.base/share/native/libzip/zip_util.c
View File

@ -1438,6 +1438,7 @@ jboolean JNICALL
ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entryname)
{
char *msg;
char tmpbuf[1024];
strcpy(entryname, entry->name);
if (entry->csize == 0) {
@ -1456,8 +1457,11 @@ ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entryname)
msg = zip->msg;
ZIP_Unlock(zip);
if (n == -1) {
jio_fprintf(stderr, "%s: %s\n", zip->name,
msg != 0 ? msg : strerror(errno));
if (msg == 0) {
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
msg = tmpbuf;
}
jio_fprintf(stderr, "%s: %s\n", zip->name, msg);
return JNI_FALSE;
}
buf += n;
@ -1470,8 +1474,11 @@ ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entryname)
if ((msg == NULL) || (*msg == 0)) {
msg = zip->msg;
}
jio_fprintf(stderr, "%s: %s\n", zip->name,
msg != 0 ? msg : strerror(errno));
if (msg == 0) {
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
msg = tmpbuf;
}
jio_fprintf(stderr, "%s: %s\n", zip->name, msg);
return JNI_FALSE;
}
}

7
jdk/src/java.base/unix/native/libjava/ProcessImpl_md.c
View File

@ -248,12 +248,13 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail)
const char *detail = defaultDetail;
char *errmsg;
size_t fmtsize;
char tmpbuf[1024];
jstring s;
if (errnum != 0) {
const char *s = strerror(errnum);
if (strcmp(s, "Unknown error") != 0)
detail = s;
int ret = getErrorString(errnum, tmpbuf, sizeof(tmpbuf));
if (ret != EINVAL)
detail = tmpbuf;
}
/* ASCII Decimal representation uses 2.4 times as many bits as binary. */
fmtsize = sizeof(IOE_FORMAT) + strlen(detail) + 3 * sizeof(errnum);

27
jdk/src/java.base/unix/native/libjava/jni_util_md.c
View File

@ -30,6 +30,13 @@
#include "jni_util.h"
#include "dlfcn.h"
#if defined(LINUX) && (defined(_GNU_SOURCE) || \
(defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE < 200112L \
&& defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 600))
extern int __xpg_strerror_r(int, char *, size_t);
#define strerror_r(a, b, c) __xpg_strerror_r((a), (b), (c))
#endif
void* getProcessHandle() {
static void *procHandle = NULL;
if (procHandle != NULL) {
@ -55,16 +62,14 @@ void buildJniFunctionName(const char *sym, const char *cname,
size_t
getLastErrorString(char *buf, size_t len)
{
char *err;
size_t n;
if (errno == 0 || len < 1) return 0;
err = strerror(errno);
n = strlen(err);
if (n >= len)
n = len - 1;
strncpy(buf, err, n);
buf[n] = '\0';
return n;
getErrorString(errno, buf, len);
return strlen(buf);
}
int
getErrorString(int err, char *buf, size_t len)
{
if (err == 0 || len < 1) return 0;
return strerror_r(err, buf, len);
}

22
jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c
View File

@ -918,6 +918,7 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
jobject this) {
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
int arg, fd, t = 1;
char tmpbuf[1024];
#ifdef AF_INET6
int domain = ipv6_available() ? AF_INET6 : AF_INET;
#else
@ -953,22 +954,23 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
arg = 65507;
if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
(char *)&arg, sizeof(arg)) < 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
strerror(errno));
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf);
close(fd);
return;
}
if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
(char *)&arg, sizeof(arg)) < 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
strerror(errno));
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf);
close(fd);
return;
}
#endif /* __APPLE__ */
if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof (int)) < 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", strerror(errno));
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf);
close(fd);
return;
}
@ -977,9 +979,10 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
arg = 0;
int level = (domain == AF_INET6) ? IPPROTO_IPV6 : IPPROTO_IP;
if ((setsockopt(fd, level, IP_MULTICAST_ALL, (char*)&arg, sizeof(arg)) < 0) &&
(errno != ENOPROTOOPT)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
strerror(errno));
(errno != ENOPROTOOPT))
{
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf);
close(fd);
return;
}
@ -994,7 +997,8 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
int ttl = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &ttl,
sizeof (ttl)) < 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", strerror(errno));
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf);
close(fd);
return;
}

14
jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
View File

@ -315,21 +315,15 @@ Java_sun_nio_fs_UnixNativeDispatcher_getcwd(JNIEnv* env, jclass this) {
JNIEXPORT jbyteArray
Java_sun_nio_fs_UnixNativeDispatcher_strerror(JNIEnv* env, jclass this, jint error)
{
char* msg;
char tmpbuf[1024];
jsize len;
jbyteArray bytes;
#ifdef _AIX
/* strerror() is not thread-safe on AIX so we have to use strerror_r() */
char buffer[256];
msg = (strerror_r((int)error, buffer, 256) == 0) ? buffer : "Error while calling strerror_r";
#else
msg = strerror((int)error);
#endif
len = strlen(msg);
getErrorString((int)errno, tmpbuf, sizeof(tmpbuf));
len = strlen(tmpbuf);
bytes = (*env)->NewByteArray(env, len);
if (bytes != NULL) {
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)msg);
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)tmpbuf);
}
return bytes;
}

17
jdk/src/java.base/windows/native/libjava/jni_util_md.c
View File

@ -108,13 +108,9 @@ getLastErrorString(char *utf8_jvmErrorMsg, size_t cbErrorMsg)
}
} else if (errno != 0) {
// C runtime error that has no corresponding WIN32 error code
const WCHAR *rtError = _wcserror(errno);
if (rtError != NULL) {
wcsncpy(utf16_osErrorMsg, rtError, cbErrorMsg);
// truncate if too long
utf16_osErrorMsg[cbErrorMsg - 1] = L'\0';
int ret = _wcserror_s(utf16_osErrorMsg, cbErrorMsg, errno);
if (ret == 0)
n = wcslen(utf16_osErrorMsg);
}
} else
noError = TRUE; //OS has no error to report
@ -147,3 +143,12 @@ getLastErrorString(char *utf8_jvmErrorMsg, size_t cbErrorMsg)
}
return n;
}
int
getErrorString(int err, char *buf, size_t len)
{
int ret = 0;
if (err == 0 || len < 1) return 0;
ret = strerror_s(buf, len, err);
return ret;
}

7
jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c
View File

@ -2211,8 +2211,11 @@ Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobj
optlen = sizeof(optval.i);
if (NET_GetSockOpt(fd, level, optname, (void *)&optval, &optlen) < 0) {
char errmsg[255];
sprintf(errmsg, "error getting socket option: %s\n", strerror(errno));
char tmpbuf[255];
int size = 0;
char errmsg[255 + 31];
getErrorString(errno, tmpbuf, sizeof(tmpbuf));
sprintf(errmsg, "error getting socket option: %s", tmpbuf);
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", errmsg);
return NULL;
}