Re: [PATCH] Support running with an unknown current directory (bug 6422)
Sorry, I made a Git error and posted the wrong patch. New patch attached.
Thanks,
Florian
>From dd609baac563e2367b9424f32eead35940f6bc33 Mon Sep 17 00:00:00 2001
From: Florian Weimer
Date: Tue, 6 Feb 2018 14:43:35 +0100
Subject: [PATCH] Support running with an unknown current directory (bug 6422)
If the current directory is needed later, an error is reported.
Delayed error reporting is needed in more cases because after the fix
for CVE-2018-101 in getcwd
https://sourceware.org/bugzilla/show_bug.cgi?id=22679
the glibc implementation will no longer return a made-up relative
pathname (as supplied by the Linux kernel) in case the current
directory has no name. Without this patch, rsync will fail to start in
such cases, but the command line arguments might all use absolute
pathnames, so that the current directory is never actually needed.
---
exclude.c | 23 ++-
flist.c | 35 +++
log.c | 1 +
main.c| 12 +---
util.c| 34 --
5 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/exclude.c b/exclude.c
index 7989fb3e..bbd3b263 100644
--- a/exclude.c
+++ b/exclude.c
@@ -381,6 +381,7 @@ void set_filter_dir(const char *dir, unsigned int dirlen)
{
unsigned int len;
if (*dir != '/') {
+ need_curr_dir(dir);
memcpy(dirbuf, curr_dir, curr_dir_len);
dirbuf[curr_dir_len] = '/';
len = curr_dir_len + 1;
@@ -644,15 +645,19 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
* just match the name portion of the path. */
if ((p = strrchr(name,'/')) != NULL)
name = p+1;
- } else if (ex->rflags & FILTRULE_ABS_PATH && *fname != '/'
- && curr_dir_len > module_dirlen + 1) {
- /* If we're matching against an absolute-path pattern,
- * we need to prepend our full path info. */
- strings[str_cnt++] = curr_dir + module_dirlen + 1;
- strings[str_cnt++] = "/";
- } else if (ex->rflags & FILTRULE_WILD2_PREFIX && *fname != '/') {
- /* Allow "**"+"/" to match at the start of the string. */
- strings[str_cnt++] = "/";
+ } else if (*fname != '/') {
+ need_curr_dir(fname);
+ if (ex->rflags & FILTRULE_ABS_PATH
+ && curr_dir_len > module_dirlen + 1) {
+ /* If we're matching against an absolute-path pattern,
+ * we need to prepend our full path info. */
+ strings[str_cnt++] = curr_dir + module_dirlen + 1;
+ strings[str_cnt++] = "/";
+ } else if (ex->rflags & FILTRULE_WILD2_PREFIX) {
+ /* Allow "**"+"/" to match at the start of the
+ * string. */
+ strings[str_cnt++] = "/";
+ }
}
strings[str_cnt++] = name;
if (name_flags & NAME_IS_DIR) {
diff --git a/flist.c b/flist.c
index 499440cc..0ef6e9a3 100644
--- a/flist.c
+++ b/flist.c
@@ -77,6 +77,7 @@ extern char *filesfrom_host;
extern char *usermap, *groupmap;
extern char curr_dir[MAXPATHLEN];
+extern int curr_dir_error;
extern struct chmod_mode_struct *chmod_modes;
@@ -278,8 +279,31 @@ static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static const char *pathname, *orig_dir;
+static int orig_dir_error;
static int pathname_len;
+/* Save orig_dir and its associated error code. */
+static void
+save_orig_dir(void)
+{
+ if (!orig_dir) {
+ orig_dir = strdup(curr_dir);
+ if (orig_dir == NULL)
+ out_of_memory("save_orig_dir");
+ orig_dir_error = curr_dir_error;
+ }
+}
+
+/* To be called before using orig_dir. */
+static void
+need_orig_dir(void)
+{
+ if (orig_dir_error != 0) {
+ curr_dir_error = orig_dir_error;
+ need_curr_dir(NULL);
+ }
+}
+
/* Make sure flist can hold at least flist->used + extra entries. */
static void flist_expand(struct file_list *flist, int extra)
{
@@ -356,15 +380,19 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
pathname = dir;
pathname_len = dirlen;
- if (!dir)
+ if (!dir) {
+ need_orig_dir();
dir = orig_dir;
+ }
if (!change_dir(dir, CD_NORMAL)) {
chdir_error:
io_error |= IOERR_GENERAL;
rsyserr(FERROR_XFER, errno, "change_dir %s failed", full_fname(dir));
- if (dir != orig_dir)
+ if (dir != orig_dir) {
+ need_orig_dir();
change_dir(orig_dir, CD_NORMAL);
+ }
pathname = NULL;
pathname_len = 0;
return 0;
@@ -2108,8 +2136,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
use_ff_fd = 1;
}
- if (!orig_dir)
- orig_dir = strdup(curr_dir);
+ save_orig_dir();
while (1) {
char fbuf[MAXPATHLEN], *fn, name_type;
diff --git a/log.c b/log.c
index 6143349c..a1f85c3a 100644
--- a/log.c
+++ b/log.c
@@ -602,6 +602,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
} else
n = buf2;
} else if (am_daemon &&am
[PATCH] Support running with an unknown current directory (bug 6422)
This hopefully addresses a glusterfs geo-replication regression after a
recent security update to glibc.
I see that rsync does not assume that fchdir exists, so I didn't make
any attempt to use it.
Thanks,
Florian
>From c17b53751fc7b72816b26959f07eb28f532b52e9 Mon Sep 17 00:00:00 2001
From: Florian Weimer
Date: Tue, 6 Feb 2018 13:48:54 +0100
Subject: [PATCH] Support running with an unknown current directory (bug 6422)
If the current directory is needed later, an error is reported.
Delayed error reporting is needed in more cases because after the fix
for CVE-2018-101 in getcwd
https://sourceware.org/bugzilla/show_bug.cgi?id=22679
the glibc implementation will no longer return a made-up relative
pathname (as supplied by the Linux kernel) in case the current
directory has no name. Without this patch, rsync will fail to start in
such cases, but the command line arguments might all use absolute
pathnames, so that the current directory is never actually needed.
---
exclude.c | 23 ++-
flist.c | 35 +++
log.c | 1 +
main.c| 12 +---
util.c| 34 --
5 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/exclude.c b/exclude.c
index 7989fb3e..bbd3b263 100644
--- a/exclude.c
+++ b/exclude.c
@@ -381,6 +381,7 @@ void set_filter_dir(const char *dir, unsigned int dirlen)
{
unsigned int len;
if (*dir != '/') {
+ need_curr_dir(dir);
memcpy(dirbuf, curr_dir, curr_dir_len);
dirbuf[curr_dir_len] = '/';
len = curr_dir_len + 1;
@@ -644,15 +645,19 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
* just match the name portion of the path. */
if ((p = strrchr(name,'/')) != NULL)
name = p+1;
- } else if (ex->rflags & FILTRULE_ABS_PATH && *fname != '/'
- && curr_dir_len > module_dirlen + 1) {
- /* If we're matching against an absolute-path pattern,
- * we need to prepend our full path info. */
- strings[str_cnt++] = curr_dir + module_dirlen + 1;
- strings[str_cnt++] = "/";
- } else if (ex->rflags & FILTRULE_WILD2_PREFIX && *fname != '/') {
- /* Allow "**"+"/" to match at the start of the string. */
- strings[str_cnt++] = "/";
+ } else if (*fname != '/') {
+ need_curr_dir(fname);
+ if (ex->rflags & FILTRULE_ABS_PATH
+ && curr_dir_len > module_dirlen + 1) {
+ /* If we're matching against an absolute-path pattern,
+ * we need to prepend our full path info. */
+ strings[str_cnt++] = curr_dir + module_dirlen + 1;
+ strings[str_cnt++] = "/";
+ } else if (ex->rflags & FILTRULE_WILD2_PREFIX) {
+ /* Allow "**"+"/" to match at the start of the
+ * string. */
+ strings[str_cnt++] = "/";
+ }
}
strings[str_cnt++] = name;
if (name_flags & NAME_IS_DIR) {
diff --git a/flist.c b/flist.c
index 499440cc..0ef6e9a3 100644
--- a/flist.c
+++ b/flist.c
@@ -77,6 +77,7 @@ extern char *filesfrom_host;
extern char *usermap, *groupmap;
extern char curr_dir[MAXPATHLEN];
+extern int curr_dir_error;
extern struct chmod_mode_struct *chmod_modes;
@@ -278,8 +279,31 @@ static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static const char *pathname, *orig_dir;
+static int orig_dir_error;
static int pathname_len;
+/* Save orig_dir and its associated error code. */
+static void
+save_orig_dir(void)
+{
+ if (!orig_dir) {
+ orig_dir = strdup(curr_dir);
+ if (orig_dir == NULL)
+ out_of_memory("save_orig_dir");
+ orig_dir_error = curr_dir_error;
+ }
+}
+
+/* To be called before using orig_dir. */
+static void
+need_orig_dir(void)
+{
+ if (orig_dir_error != 0) {
+ curr_dir_error = orig_dir_error;
+ need_curr_dir(NULL);
+ }
+}
+
/* Make sure flist can hold at least flist->used + extra entries. */
static void flist_expand(struct file_list *flist, int extra)
{
@@ -356,15 +380,19 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
pathname = dir;
pathname_len = dirlen;
- if (!dir)
+ if (!dir) {
+ need_orig_dir();
dir = orig_dir;
+ }
if (!change_dir(dir, CD_NORMAL)) {
chdir_error:
io_error |= IOERR_GENERAL;
rsyserr(FERROR_XFER, errno, "change_dir %s failed", full_fname(dir));
- if (dir != orig_dir)
+ if (dir != orig_dir) {
+ need_orig_dir();
change_dir(orig_dir, CD_NORMAL);
+ }
pathname = NULL;
pathname_len = 0;
return 0;
@@ -2108,8 +2136,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
use_ff_fd = 1;
}
- if (!orig_dir)
- orig_dir = strdup(curr_dir);
+ save_orig_dir();
while (1) {
char fbuf[MAXPATHLEN], *fn, name_type;
diff --git a/log.c b/log.c
index 6143349c..a1f85c3a 100644
--- a/log.c
+++ b/log.c
@@ -602,6 +602,7 @@ static void l
