ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: O_CLOEXEC flag on opens"

Browse source 
am: fc80b22752

* commit 'fc80b227529d357b2d6b06b47299679f65aee23d':
  liblog: O_CLOEXEC flag on opens

Change-Id: I4a03deba6de62868163349210c8be8dc40a6bbe9
This commit is contained in:
Mark Salyzyn 2016-04-29 15:41:38 +00:00 • committed by android-build-merger
commit a0afba8a87
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) if (newTagMap == NULL)
return NULL; return NULL;
fd = open(fileName, O_RDONLY); fd = open(fileName, O_RDONLY | O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "%s: unable to open map '%s': %s\n", fprintf(stderr, "%s: unable to open map '%s': %s\n",
OUT_TAG, fileName, strerror(errno)); OUT_TAG, fileName, strerror(errno));

2
liblog/logprint.c
View file

@ -1043,7 +1043,7 @@ static void convertMonotonic(struct timespec *result,
* Anything in the Android Logger before the dmesg logging span will * Anything in the Android Logger before the dmesg logging span will
* be highly suspect regarding the monotonic time calculations. * be highly suspect regarding the monotonic time calculations.
*/ */
FILE *p = popen("/system/bin/dmesg", "r"); FILE *p = popen("/system/bin/dmesg", "re");
if (p) { if (p) {
char *line = NULL; char *line = NULL;
size_t len = 0; 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)); memset(log_msg, 0, sizeof(*log_msg));
if (transp->context.fd <= 0) { 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) { if (fd < 0) {
return -errno; return -errno;
} }
if (fd == 0) { /* Argggg */ 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); close(0);
if (fd < 0) { if (fd < 0) {
return -errno; return -errno;

2
liblog/pmsg_writer.c
View file

@ -54,7 +54,7 @@ LIBLOG_HIDDEN struct android_log_transport_write pmsgLoggerWrite = {
static int pmsgOpen() static int pmsgOpen()
{ {
if (pmsgLoggerWrite.context.fd < 0) { 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; return pmsgLoggerWrite.context.fd;