PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use O_CLOEXEC at a few places."

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-02 00:04:26 +00:00
committed by Gerrit Code Review
parent 21cfc8b6f4 b549243b27
commit e3857ca43e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/events.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ int ev_init(ev_callback input_cb, bool allow_touch_inputs) {
dirent* de; dirent* de;
while ((de = readdir(dir))) { while ((de = readdir(dir))) {
if (strncmp(de->d_name, "event", 5)) continue; if (strncmp(de->d_name, "event", 5)) continue;
int fd = openat(dirfd(dir), de->d_name, O_RDONLY); int fd = openat(dirfd(dir), de->d_name, O_RDONLY | O_CLOEXEC);
if (fd == -1) continue; if (fd == -1) continue;
// Use unsigned long to match ioctl's parameter type. // Use unsigned long to match ioctl's parameter type.
minui/graphics_adf.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ int MinuiBackendAdf::DeviceInit(adf_device* dev) {
err = adf_device_attach(dev, eng_id, intf_id); err = adf_device_attach(dev, eng_id, intf_id);
if (err < 0 && err != -EALREADY) return err; if (err < 0 && err != -EALREADY) return err;
intf_fd = adf_interface_open(dev, intf_id, O_RDWR); intf_fd = adf_interface_open(dev, intf_id, O_RDWR | O_CLOEXEC);
if (intf_fd < 0) return intf_fd; if (intf_fd < 0) return intf_fd;
err = InterfaceInit(); err = InterfaceInit();
minui/graphics_drm.cpp
+1 -1
View File
@@ -285,7 +285,7 @@ GRSurface* MinuiBackendDrm::Init() {
/* Consider DRM devices in order. */ /* Consider DRM devices in order. */
for (int i = 0; i < DRM_MAX_MINOR; i++) { for (int i = 0; i < DRM_MAX_MINOR; i++) {
auto dev_name = android::base::StringPrintf(DRM_DEV_NAME, DRM_DIR_NAME, i); auto dev_name = android::base::StringPrintf(DRM_DEV_NAME, DRM_DIR_NAME, i);
android::base::unique_fd fd(open(dev_name.c_str(), O_RDWR)); android::base::unique_fd fd(open(dev_name.c_str(), O_RDWR | O_CLOEXEC));
if (fd == -1) continue; if (fd == -1) continue;
/* We need dumb buffers. */ /* We need dumb buffers. */
minui/graphics_fbdev.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ void MinuiBackendFbdev::SetDisplayedFramebuffer(size_t n) {
} }
GRSurface* MinuiBackendFbdev::Init() { GRSurface* MinuiBackendFbdev::Init() {
android::base::unique_fd fd(open("/dev/graphics/fb0", O_RDWR)); android::base::unique_fd fd(open("/dev/graphics/fb0", O_RDWR | O_CLOEXEC));
if (fd == -1) { if (fd == -1) {
perror("cannot open fb0"); perror("cannot open fb0");
return nullptr; return nullptr;