1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8743: fopen mode e (glibc only) to prevent galera SST scripts accessing server files

Browse Source 
For RemoteDatafile::read_link_file and buffer poool dumps

Note: STR_O_CLOEXEC needs to be at the end of the fopen otherwise
fopen will return EINVAL.
This commit is contained in:
Daniel Black 2018-03-02 10:16:46 +11:00
parent 5cf0662d76
commit 0a63c91ab0
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/my_global.h
View File

@ -591,6 +591,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#ifndef O_CLOEXEC #ifndef O_CLOEXEC
#define O_CLOEXEC 0 #define O_CLOEXEC 0
#endif #endif
#ifdef __GLIBC__
#define STR_O_CLOEXEC "e"
#else
#define STR_O_CLOEXEC ""
#endif
#ifndef SOCK_CLOEXEC #ifndef SOCK_CLOEXEC
#define SOCK_CLOEXEC 0 #define SOCK_CLOEXEC 0
#endif #endif

4
storage/innobase/buf/buf0dump.cc
View File

@ -275,7 +275,7 @@ buf_dump(
buf_dump_status(STATUS_INFO, "Dumping buffer pool(s) to %s", buf_dump_status(STATUS_INFO, "Dumping buffer pool(s) to %s",
full_filename); full_filename);
f = fopen(tmp_filename, "w"); f = fopen(tmp_filename, "w" STR_O_CLOEXEC);
if (f == NULL) { if (f == NULL) {
buf_dump_status(STATUS_ERR, buf_dump_status(STATUS_ERR,
"Cannot open '%s' for writing: %s", "Cannot open '%s' for writing: %s",
@ -516,7 +516,7 @@ buf_load()
buf_load_status(STATUS_INFO, buf_load_status(STATUS_INFO,
"Loading buffer pool(s) from %s", full_filename); "Loading buffer pool(s) from %s", full_filename);
f = fopen(full_filename, "r"); f = fopen(full_filename, "r" STR_O_CLOEXEC);
if (f == NULL) { if (f == NULL) {
buf_load_status(STATUS_INFO, buf_load_status(STATUS_INFO,
"Cannot open '%s' for reading: %s", "Cannot open '%s' for reading: %s",

2
storage/innobase/fsp/fsp0file.cc
View File

@ -1043,7 +1043,7 @@ char*
RemoteDatafile::read_link_file( RemoteDatafile::read_link_file(
const char* link_filepath) const char* link_filepath)
{ {
FILE* file = fopen(link_filepath, "r+b"); FILE* file = fopen(link_filepath, "r+b" STR_O_CLOEXEC);
if (file == NULL) { if (file == NULL) {
return(NULL); return(NULL);
} }