diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2014-04-23 16:54:47 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:14:04 +0200 |
commit | 7cd32eefe1af40682a6b3e632be116a12c403665 (patch) | |
tree | 6a9b2d98e3055a73f588c00da73f2d434bea7abf /chromium/sandbox/linux/services/libc_urandom_override.cc | |
parent | 4cc2665926faa1ec627da1985def3c62b93e1973 (diff) | |
download | qtwebengine-chromium-7cd32eefe1af40682a6b3e632be116a12c403665.tar.gz |
<chromium> Do not directly override libc symbols from the library.
Instead we export _override symbols and add the symbol
renaming directly into the QtWebEngineProcess source.
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Change-Id: I15049609dd77be6de2a2398f25a37fff1b6f5519
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/sandbox/linux/services/libc_urandom_override.cc')
-rw-r--r-- | chromium/sandbox/linux/services/libc_urandom_override.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/chromium/sandbox/linux/services/libc_urandom_override.cc b/chromium/sandbox/linux/services/libc_urandom_override.cc index c5c49bac8ca..6e8e12995a4 100644 --- a/chromium/sandbox/linux/services/libc_urandom_override.cc +++ b/chromium/sandbox/linux/services/libc_urandom_override.cc @@ -121,8 +121,6 @@ static void InitLibcFileIOFunctions() { // the code below defines fopen_override() function with asm name // "fopen", so that all references to fopen() will resolve to this // function. -__attribute__ ((__visibility__("default"))) -FILE* fopen_override(const char* path, const char* mode) __asm__ ("fopen"); __attribute__ ((__visibility__("default"))) FILE* fopen_override(const char* path, const char* mode) { @@ -141,7 +139,7 @@ FILE* fopen_override(const char* path, const char* mode) { } __attribute__ ((__visibility__("default"))) -FILE* fopen64(const char* path, const char* mode) { +FILE* fopen64_override(const char* path, const char* mode) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int fd = HANDLE_EINTR(dup(base::GetUrandomFD())); if (fd < 0) { @@ -162,11 +160,6 @@ FILE* fopen64(const char* path, const char* mode) { #if HAVE_XSTAT __attribute__ ((__visibility__("default"))) -int xstat_override(int version, - const char *path, - struct stat *buf) __asm__ ("__xstat"); - -__attribute__ ((__visibility__("default"))) int xstat_override(int version, const char *path, struct stat *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = __fxstat(version, base::GetUrandomFD(), buf); @@ -179,11 +172,6 @@ int xstat_override(int version, const char *path, struct stat *buf) { } __attribute__ ((__visibility__("default"))) -int xstat64_override(int version, - const char *path, - struct stat64 *buf) __asm__ ("__xstat64"); - -__attribute__ ((__visibility__("default"))) int xstat64_override(int version, const char *path, struct stat64 *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = __fxstat64(version, base::GetUrandomFD(), buf); @@ -198,10 +186,6 @@ int xstat64_override(int version, const char *path, struct stat64 *buf) { #else __attribute__ ((__visibility__("default"))) -int stat_override(const char *path, - struct stat *buf) __asm__ ("stat"); - -__attribute__ ((__visibility__("default"))) int stat_override(const char *path, struct stat *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = fstat(base::GetUrandomFD(), buf); @@ -214,10 +198,6 @@ int stat_override(const char *path, struct stat *buf) { } __attribute__ ((__visibility__("default"))) -int stat64_override(const char *path, - struct stat64 *buf) __asm__ ("stat64"); - -__attribute__ ((__visibility__("default"))) int stat64_override(const char *path, struct stat64 *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = fstat64(base::GetUrandomFD(), buf); |