From 90eb06e8c7da2c10eeccc4915bca577304785664 Mon Sep 17 00:00:00 2001

From: Michal Schmidt <mschmidt@redhat.com>

Date: Fri, 2 Mar 2012 10:39:10 +0100

Subject: [PATCH] util: never follow symlinks in rm_rf_children()

The function checks if the entry is a directory before recursing, but

there is a window between the check and the open, during which the

directory could be replaced with a symlink.

CVE-2012-1174

https://bugzilla.redhat.com/show_bug.cgi?id=803358

(cherry picked from commit 5ebff5337594d690b322078c512eb222d34aaa82)

---

 src/util.c |    3 ++-

 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/util.c b/src/util.c

index a488289..6a2c61f 100644

--- a/src/util.c

+++ b/src/util.c

@@ -3483,7 +3483,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {

                 if (is_dir) {

                         int subdir_fd;

-                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {

+                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);

+                        if (subdir_fd < 0) {

                                 if (ret == 0 && errno != ENOENT)

                                         ret = -errno;

                                 continue;