commit dfe67d266c9c5dfaedc2036d9d58e459169c77f0
author Elliott Hughes <enh@google.com> Thu Feb 17 12:55:42 2022 -0800
committer Elliott Hughes <enh@google.com> Wed Nov 30 20:19:22 2022 +0000
tree 920abc049a0301fd4062f22afb40a890cc5ad002
parent c88467704f8e40a83a9030a18804aaf8f2bcf4a5

Tell people when they've messed up with fcntl(FD_SETFD).

This is a subtle bug that even experts struggle with.

Test: treehugger
Change-Id: If9cf16a1c32c836f5688bb3374cfd21d55125b17

libc/bionic/fcntl.cpp

diff --git a/libc/bionic/fcntl.cpp b/libc/bionic/fcntl.cpp
index c508131..35af78b 100644
--- a/libc/bionic/fcntl.cpp
+++ b/libc/bionic/fcntl.cpp
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 
 #include "private/bionic_fdtrack.h"
+#include "private/bionic_fortify.h"
 
 #if defined(__LP64__)
 
@@ -44,6 +45,10 @@
   void* arg = va_arg(args, void*);
   va_end(args);
 
+  if (cmd == F_SETFD && (reinterpret_cast<uintptr_t>(arg) & ~FD_CLOEXEC) != 0) {
+    __fortify_fatal("fcntl(F_SETFD) passed non-FD_CLOEXEC flag: %p", arg);
+  }
+
   int rc = __fcntl(fd, cmd, arg);
   if (cmd == F_DUPFD) {
     return FDTRACK_CREATE_NAME("F_DUPFD", rc);