From: AZero13 <redacted>
Otherwise, fcntl can be called with invalid fd_flags.
Signed-off-by: Greg Funni <redacted>
---
open: check fd_flags value before calling fcntl
Otherwise, fcntl can be called with invalid fd_flags.
Signed-off-by:Greg Funni gfunni234@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2131%2FAZero13%2Ffixopen-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2131/AZero13/fixopen-v1
Pull-Request: https://github.com/git/git/pull/2131
compat/open.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat/open.c b/compat/open.c
index 37ae2b1aeb..b313bcd364 100644
--- a/compat/open.c
+++ b/compat/open.c
@@ -44,8 +44,8 @@ int git_open_cloexec(const char *name, int flags)
if (!o_cloexec && 0 <= fd && fd_cloexec) {
/* Opened w/o O_CLOEXEC? try with fcntl(2) to add it */
- int flags = fcntl(fd, F_GETFD);
- if (fcntl(fd, F_SETFD, flags | fd_cloexec))
+ int fd_flags = fcntl(fd, F_GETFD);
+ if (fd_flags < 0 || fcntl(fd, F_SETFD, fd_flags | fd_cloexec))
fd_cloexec = 0;
}
}
base-commit: c4a0c8845e2426375ad257b6c221a3a7d92ecfda
--
gitgitgadget