Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9c6cd3b39048c8bbb83c5cd936f4dffc847321c6

Authored by Yann Droneaud
Committed by Greg Kroah-Hartman
1 parent 45acea5733
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

android/sync: use get_unused_fd_flags(O_CLOEXEC) instead of get_unused_fd() 

Macro get_unused_fd() is used to allocate a file descriptor with
default flags. Those default flags (0) can be "unsafe":
O_CLOEXEC must be used by default to not leak file descriptor
across exec().

Instead of macro get_unused_fd(), functions anon_inode_getfd()
or get_unused_fd_flags() should be used with flags given by userspace.
If not possible, flags should be set to O_CLOEXEC to provide userspace
with a default safe behavor.

In a further patch, get_unused_fd() will be removed so that
new code start using anon_inode_getfd() or get_unused_fd_flags()
with correct flags.

This patch replaces calls to get_unused_fd() with call to
get_unused_fd_flags(O_CLOEXEC) following advice from Erik Gilling.

Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Colin Cross <ccross@google.com>
Link: http://lkml.kernel.org/r/CACSP8SjXGMk2_kX_+RgzqqQwqKernvF1Wt3K5tw991W5dfAnCA@mail.gmail.com
Link: http://lkml.kernel.org/r/cover.1376327678.git.ydroneaud@opteya.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/staging/android/sync.c
Diff comments   View file @ 9c6cd3b
... ... @@ -697,7 +697,7 @@
697 697  
698 698 static long sync_fence_ioctl_merge(struct sync_fence *fence, unsigned long arg)
699 699 {
700   - int fd = get_unused_fd();
  700 + int fd = get_unused_fd_flags(O_CLOEXEC);
701 701 int err;
702 702 struct sync_fence *fence2, *fence3;
703 703 struct sync_merge_data data;