openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "liblog: O_CLOEXEC flag on opens" into nyc-dev

This commit is contained in:
Mark Salyzyn 2016-04-29 16:15:01 +00:00 committed by Android (Google) Code Review
parent 358cf8a919 2b409c9bc7
commit 787b4b8ed2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liblog/event_tag_map.c
View File

@ -73,7 +73,7 @@ LIBLOG_ABI_PUBLIC EventTagMap* android_openEventTagMap(const char* fileName)
if (newTagMap == NULL)
return NULL;
fd = open(fileName, O_RDONLY);
fd = open(fileName, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
fprintf(stderr, "%s: unable to open map '%s': %s\n",
OUT_TAG, fileName, strerror(errno));

2
liblog/logprint.c
View File

@ -1042,7 +1042,7 @@ static void convertMonotonic(struct timespec *result,
* Anything in the Android Logger before the dmesg logging span will
* be highly suspect regarding the monotonic time calculations.
*/
FILE *p = popen("/system/bin/dmesg", "r");
FILE *p = popen("/system/bin/dmesg", "re");
if (p) {
char *line = NULL;
size_t len = 0;

4
liblog/pmsg_reader.c
View File

@ -151,13 +151,13 @@ static int pmsgRead(struct android_log_logger_list *logger_list,
memset(log_msg, 0, sizeof(*log_msg));
if (transp->context.fd <= 0) {
int fd = open("/sys/fs/pstore/pmsg-ramoops-0", O_RDONLY);
int fd = open("/sys/fs/pstore/pmsg-ramoops-0", O_RDONLY | O_CLOEXEC);
if (fd < 0) {
return -errno;
}
if (fd == 0) { /* Argggg */
fd = open("/sys/fs/pstore/pmsg-ramoops-0", O_RDONLY);
fd = open("/sys/fs/pstore/pmsg-ramoops-0", O_RDONLY | O_CLOEXEC);
close(0);
if (fd < 0) {
return -errno;

2
liblog/pmsg_writer.c
View File

@ -54,7 +54,7 @@ LIBLOG_HIDDEN struct android_log_transport_write pmsgLoggerWrite = {
static int pmsgOpen()
{
if (pmsgLoggerWrite.context.fd < 0) {
pmsgLoggerWrite.context.fd = TEMP_FAILURE_RETRY(open("/dev/pmsg0", O_WRONLY));
pmsgLoggerWrite.context.fd = TEMP_FAILURE_RETRY(open("/dev/pmsg0", O_WRONLY | O_CLOEXEC));
}
return pmsgLoggerWrite.context.fd;