diff options
author | Wayne Davison <wayned@samba.org> | 2014-12-31 12:41:03 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2014-12-31 13:48:42 -0800 |
commit | 962f8b90045ab331fc04c9e65f80f1a53e68243b (patch) | |
tree | 8131cafaf10b656baf1f382786722320a94f1ae8 | |
parent | ae189e18ded7a306a2d5516fbd5b7112c784e333 (diff) | |
download | android_external_rsync-962f8b90045ab331fc04c9e65f80f1a53e68243b.tar.gz android_external_rsync-962f8b90045ab331fc04c9e65f80f1a53e68243b.tar.bz2 android_external_rsync-962f8b90045ab331fc04c9e65f80f1a53e68243b.zip |
Complain if an inc-recursive path is not right for its dir.
This ensures that a malicious sender can't use a just-sent
symlink as a trasnfer path.
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | flist.c | 22 | ||||
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | main.c | 4 | ||||
-rw-r--r-- | rsync.c | 2 |
5 files changed, 30 insertions, 7 deletions
@@ -4,7 +4,11 @@ Changes since 3.1.1: BUG FIXES: - - ... + - Make sure that an inc-recursive transfer includes the right directory- + name prefixes for each dir. This makes it impossible for a malicious + sender to use a just-sent symlink as a path in a transfer. + - Only skip set_modtime() on a transferred file if the time is exactly + right. ENHANCEMENTS: @@ -12,6 +16,7 @@ Changes since 3.1.1: - Use usleep() for our msleep() function if it is available. - Added a few extra long-option names to rrsync script, which will make BackupPC happier. + - Misc. manpage tweaks. DEVELOPER RELATED: @@ -2435,8 +2435,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) return flist; } -struct file_list *recv_file_list(int f) +struct file_list *recv_file_list(int f, int dir_ndx) { + const char *good_dirname = NULL; struct file_list *flist; int dstart, flags; int64 start_read; @@ -2492,6 +2493,23 @@ struct file_list *recv_file_list(int f) flist_expand(flist, 1); file = recv_file_entry(f, flist, flags); + if (inc_recurse) { + static const char empty_dir[] = "\0"; + const char *cur_dir = file->dirname ? file->dirname : empty_dir; + if (relative_paths && *cur_dir == '/') + cur_dir++; + if (cur_dir != good_dirname) { + const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir; + if (strcmp(cur_dir, d) != 0) { + rprintf(FERROR, + "ABORTING due to invalid dir prefix from sender: %s (should be: %s)\n", + cur_dir, d); + exit_cleanup(RERR_PROTOCOL); + } + good_dirname = cur_dir; + } + } + if (S_ISREG(file->mode)) { /* Already counted */ } else if (S_ISDIR(file->mode)) { @@ -2615,7 +2633,7 @@ void recv_additional_file_list(int f) rprintf(FINFO, "[%s] receiving flist for dir %d\n", who_am_i(), ndx); } - flist = recv_file_list(f); + flist = recv_file_list(f, ndx); flist->parent_ndx = ndx; } } @@ -1685,7 +1685,7 @@ void wait_for_receiver(void) rprintf(FINFO, "[%s] receiving flist for dir %d\n", who_am_i(), ndx); } - flist = recv_file_list(iobuf.in_fd); + flist = recv_file_list(iobuf.in_fd, ndx); flist->parent_ndx = ndx; #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links) @@ -1009,7 +1009,7 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[]) filesfrom_fd = -1; } - flist = recv_file_list(f_in); + flist = recv_file_list(f_in, -1); if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); @@ -1183,7 +1183,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (write_batch && !am_server) start_write_batch(f_in); - flist = recv_file_list(f_in); + flist = recv_file_list(f_in, -1); if (inc_recurse && file_total == 1) recv_additional_file_list(f_in); @@ -364,7 +364,7 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, } /* Send all the data we read for this flist to the generator. */ start_flist_forward(ndx); - flist = recv_file_list(f_in); + flist = recv_file_list(f_in, ndx); flist->parent_ndx = ndx; stop_flist_forward(); } |