From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 26 Feb 2018 13:38:14 +0000 (-0500)
Subject: Add documentation for the safe_open() and safe_open_ex() functions.
X-Git-Tag: v0.1.0~13
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=f0970d1193ebddbfcd2ba9523a0f956aed2bd4cc;p=apply-default-acl.git

Add documentation for the safe_open() and safe_open_ex() functions.
---

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index 188c1f2..3cf3060 100644
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -42,6 +42,21 @@
 #define SNPRINTF_ERROR -1
 #define STAT_ERROR -1
 
+
+/**
+ * @brief The recursive portion of the @c safe_open function, used to
+ *   open a file descriptor in a symlink-safe way when combined with
+ *   the @c O_NOFOLLOW flag.
+ *
+ * @param at_fd
+ *   A file descriptor relative to which @c pathname will be opened.
+ *
+ * @param pathname
+ *   The path to the file/directory/whatever whose descriptor you want.
+ *
+ * @return a file descriptor for @c pathname if everything goes well,
+ *   and @c OPEN_ERROR if not.
+ */
 int safe_open_ex(int at_fd, char* pathname, int flags) {
   if (pathname != NULL && strlen(pathname) == 0) {
     /* Oops, went one level to deep with nothing to do. */
@@ -79,6 +94,29 @@ int safe_open_ex(int at_fd, char* pathname, int flags) {
 }
 
 
+/**
+ * @brief A version of @c open that is completely symlink-safe when
+ *   used with the @c O_NOFOLLOW flag.
+ *
+ * The @c openat function exists to ensure that you can anchor one
+ * path to a particular directory while opening it; however, if you
+ * open "b/c/d" relative to "/a", then even the @c openat function will
+ * still follow symlinks in the "b" component. This can be exploited
+ * by an attacker to make you open the wrong path.
+ *
+ * To avoid that problem, this function uses a recursive
+ * implementation that opens every path from the root, one level at a
+ * time. So "a" is opened relative to "/", and then "b" is opened
+ * relative to "/a", and then "c" is opened relative to "/a/b",
+ * etc. When the @c O_NOFOLLOW flag is used, this approach ensures
+ * that no symlinks in any component are followed.
+ *
+ * @param pathname
+ *   The path to the file/directory/whatever whose descriptor you want.
+ *
+ * @return a file descriptor for @c pathname if everything goes well,
+ *   and @c OPEN_ERROR if not.
+ */
 int safe_open(const char* pathname, int flags) {
   if (pathname == NULL || strlen(pathname) == 0 || pathname[0] == '\0') {
     /* error? */