Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:Update
rsync.25514
rsync-CVE-2022-29154.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File rsync-CVE-2022-29154.patch of Package rsync.25514
From b7231c7d02cfb65d291af74ff66e7d8c507ee871 Mon Sep 17 00:00:00 2001 From: Wayne Davison <wayne@opencoder.net> Date: Sun, 31 Jul 2022 16:55:34 -0700 Subject: [PATCH] Some extra file-list safety checks. --- exclude.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flist.c | 17 ++++++- io.c | 4 ++ main.c | 7 ++- receiver.c | 11 +++-- rsync.1.md | 44 ++++++++++++++++-- 6 files changed, 202 insertions(+), 11 deletions(-) Index: rsync-3.1.0/exclude.c =================================================================== --- rsync-3.1.0.orig/exclude.c 2013-01-19 19:05:53.000000000 +0000 +++ rsync-3.1.0/exclude.c 2022-08-15 08:15:39.639436566 +0000 @@ -26,16 +26,23 @@ extern int am_server; extern int am_sender; extern int eol_nulls; extern int io_error; +extern int xfer_dirs; +extern int recurse; extern int local_server; extern int prune_empty_dirs; extern int ignore_perishable; +extern int relative_paths; extern int delete_mode; extern int delete_excluded; extern int cvs_exclude; extern int sanitize_paths; extern int protocol_version; +extern int list_only; extern int module_id; +extern int local_server; + +extern char *filesfrom_host; extern char curr_dir[MAXPATHLEN]; extern unsigned int curr_dir_len; extern unsigned int module_dirlen; @@ -43,6 +50,9 @@ extern unsigned int module_dirlen; filter_rule_list filter_list = { .debug_type = "" }; filter_rule_list cvs_filter_list = { .debug_type = " [global CVS]" }; filter_rule_list daemon_filter_list = { .debug_type = " [daemon]" }; +filter_rule_list implied_filter_list = { .debug_type = " [implied]" }; + +int trust_sender_filter = 0; /* Need room enough for ":MODS " prefix plus some room to grow. */ #define MAX_RULE_PREFIX (16) @@ -297,6 +307,143 @@ static void add_rule(filter_rule_list *l } } +/* Each arg the client sends to the remote sender turns into an implied include + * that the receiver uses to validate the file list from the sender. */ +void add_implied_include(const char *arg) +{ + filter_rule *rule; + int arg_len, saw_wild = 0, backslash_cnt = 0; + int slash_cnt = 1; /* We know we're adding a leading slash. */ + const char *cp; + char *p; + + int old_style_args = -1; + + /* + A local transfer doesn't unbackslash anything, so leave the args alone. + + This check comes from 3.2.4+ main.c check, where the CVE is fixed. In + these versions, the protection against the CVE is ran only when a remote + server is involved. + + In this version, there is no "old_style_args", as this was not + implemented yet, so we relay on detecting if a local server is + involved directly and we set a local variable "old_style_args" + to not to modify the original patch too much. + */ + if (local_server) + old_style_args = 2; + + if (old_style_args || list_only || filesfrom_host != NULL) + return; + if (relative_paths) { + cp = strstr(arg, "/./"); + if (cp) + arg = cp+3; + } else { + if ((cp = strrchr(arg, '/')) != NULL) + arg = cp + 1; + } + arg_len = strlen(arg); + if (arg_len) { + if (strpbrk(arg, "*[?")) { + /* We need to add room to escape backslashes if wildcard chars are present. */ + cp = arg; + while ((cp = strchr(cp, '\\')) != NULL) { + arg_len++; + cp++; + } + saw_wild = 1; + } + arg_len++; /* Leave room for the prefixed slash */ + rule = new0(filter_rule); + if (!implied_filter_list.head) + implied_filter_list.head = implied_filter_list.tail = rule; + else { + rule->next = implied_filter_list.head; + implied_filter_list.head = rule; + } + rule->rflags = FILTRULE_INCLUDE + (saw_wild ? FILTRULE_WILD : 0); + p = rule->pattern = new_array(char, arg_len + 1); + *p++ = '/'; + cp = arg; + while (*cp) { + switch (*cp) { + case '\\': + backslash_cnt++; + if (saw_wild) + *p++ = '\\'; + *p++ = *cp++; + break; + case '/': + if (p[-1] == '/') /* This is safe because of the initial slash. */ + break; + if (relative_paths) { + filter_rule const *ent; + int found = 0; + *p = '\0'; + for (ent = implied_filter_list.head; ent; ent = ent->next) { + if (ent != rule && strcmp(ent->pattern, rule->pattern) == 0) + found = 1; + } + if (!found) { + filter_rule *R_rule = new0(filter_rule); + R_rule->rflags = FILTRULE_INCLUDE + (saw_wild ? FILTRULE_WILD : 0); + R_rule->pattern = strdup(rule->pattern); + R_rule->u.slash_cnt = slash_cnt; + R_rule->next = implied_filter_list.head; + implied_filter_list.head = R_rule; + } + } + slash_cnt++; + *p++ = *cp++; + break; + default: + *p++ = *cp++; + break; + } + } + *p = '\0'; + rule->u.slash_cnt = slash_cnt; + arg = (const char *)rule->pattern; + } + + if (recurse || xfer_dirs) { + /* Now create a rule with an added "/" & "**" or "*" at the end */ + rule = new0(filter_rule); + if (recurse) + rule->rflags = FILTRULE_INCLUDE | FILTRULE_WILD | FILTRULE_WILD2; + else + rule->rflags = FILTRULE_INCLUDE | FILTRULE_WILD; + /* A +4 in the len leaves enough room for / * * \0 or / * \0 \0 */ + if (!saw_wild && backslash_cnt) { + /* We are appending a wildcard, so now the backslashes need to be escaped. */ + p = rule->pattern = new_array(char, arg_len + backslash_cnt + 3 + 1); + cp = arg; + while (*cp) { + if (*cp == '\\') + *p++ = '\\'; + *p++ = *cp++; + } + } else { + p = rule->pattern = new_array(char, arg_len + 3 + 1); + if (arg_len) { + memcpy(p, arg, arg_len); + p += arg_len; + } + } + if (p[-1] != '/') + *p++ = '/'; + *p++ = '*'; + if (recurse) + *p++ = '*'; + *p = '\0'; + rule->u.slash_cnt = slash_cnt + 1; + rule->next = implied_filter_list.head; + implied_filter_list.head = rule; + } +} + static void clear_filter_list(filter_rule_list *listp) { if (listp->tail) { @@ -715,7 +862,7 @@ static void report_filter_result(enum lo = { {"show", "hid"}, {"risk", "protect"} }; const char *w = who_am_i(); rprintf(code, "[%s] %sing %s %s because of pattern %s%s%s\n", - w, actions[*w!='s'][!(ent->rflags & FILTRULE_INCLUDE)], + w, actions[*w=='g'][!(ent->rflags & FILTRULE_INCLUDE)], name_is_dir ? "directory" : "file", name, ent->pattern, ent->rflags & FILTRULE_DIRECTORY ? "/" : "", type); } @@ -871,6 +1018,7 @@ static filter_rule *parse_rule_tok(const } switch (ch) { case ':': + trust_sender_filter = 1; rule->rflags |= FILTRULE_PERDIR_MERGE | FILTRULE_FINISH_SETUP; /* FALL THROUGH */ Index: rsync-3.1.0/flist.c =================================================================== --- rsync-3.1.0.orig/flist.c 2022-08-15 08:12:36.025735017 +0000 +++ rsync-3.1.0/flist.c 2022-08-15 08:12:39.741214673 +0000 @@ -68,6 +68,7 @@ extern int need_unsorted_flist; extern int sender_symlink_iconv; extern int output_needs_newline; extern int sender_keeps_checksum; +extern int trust_sender_filter; extern int unsort_ndx; extern uid_t our_uid; extern struct stats stats; @@ -78,8 +79,7 @@ extern char curr_dir[MAXPATHLEN]; extern struct chmod_mode_struct *chmod_modes; -extern filter_rule_list filter_list; -extern filter_rule_list daemon_filter_list; +extern filter_rule_list filter_list, implied_filter_list, daemon_filter_list; #ifdef ICONV_OPTION extern int filesfrom_convert; @@ -922,6 +922,19 @@ static struct file_struct *recv_file_ent exit_cleanup(RERR_UNSUPPORTED); } + if (*thisname != '.' || thisname[1] != '\0') { + int filt_flags = S_ISDIR(mode) ? NAME_IS_DIR : NAME_IS_FILE; + if (!trust_sender_filter /* a per-dir filter rule means we must trust the sender's filtering */ + && filter_list.head && check_filter(&filter_list, FINFO, thisname, filt_flags) < 0) { + rprintf(FERROR, "ERROR: rejecting excluded file-list name: %s\n", thisname); + exit_cleanup(RERR_PROTOCOL); + } + if (implied_filter_list.head && check_filter(&implied_filter_list, FINFO, thisname, filt_flags) <= 0) { + rprintf(FERROR, "ERROR: rejecting unrequested file-list name: %s\n", thisname); + exit_cleanup(RERR_PROTOCOL); + } + } + if (inc_recurse && S_ISDIR(mode)) { if (one_file_system) { /* Room to save the dir's device for -x */ Index: rsync-3.1.0/io.c =================================================================== --- rsync-3.1.0.orig/io.c 2022-08-15 08:12:36.421786146 +0000 +++ rsync-3.1.0/io.c 2022-08-15 08:12:39.742214802 +0000 @@ -441,6 +441,7 @@ static void forward_filesfrom_data(void) while (s != eob) { if (*s++ == '\0') { ff_xb.len = s - sob - 1; + add_implied_include(sob); if (iconvbufs(ic_send, &ff_xb, &iobuf.out, flags) < 0) exit_cleanup(RERR_PROTOCOL); /* impossible? */ write_buf(iobuf.out_fd, s-1, 1); /* Send the '\0'. */ @@ -472,9 +473,12 @@ static void forward_filesfrom_data(void) char *f = ff_xb.buf + ff_xb.pos; char *t = ff_xb.buf; char *eob = f + len; + char *cur = t; /* Eliminate any multi-'\0' runs. */ while (f != eob) { if (!(*t++ = *f++)) { + add_implied_include(cur); + cur = t; while (f != eob && *f == '\0') f++; } Index: rsync-3.1.0/main.c =================================================================== --- rsync-3.1.0.orig/main.c 2022-08-15 08:12:36.109745862 +0000 +++ rsync-3.1.0/main.c 2022-08-15 08:12:39.742214802 +0000 @@ -77,6 +77,7 @@ extern unsigned int module_dirlen; extern BOOL flist_receiving_enabled; extern BOOL shutting_down; extern int basis_dir_cnt; +extern int trust_sender_filter; extern struct stats stats; extern char *stdout_format; extern char *logfile_format; @@ -92,7 +93,7 @@ extern char curr_dir[MAXPATHLEN]; extern char backup_dir_buf[MAXPATHLEN]; extern char *basis_dir[MAX_BASIS_DIRS+1]; extern struct file_list *first_flist; -extern filter_rule_list daemon_filter_list; +extern filter_rule_list daemon_filter_list, implied_filter_list; uid_t our_uid; gid_t our_gid; @@ -526,6 +527,7 @@ static pid_t do_cmd(char *cmd, char *mac #ifdef ICONV_CONST setup_iconv(); #endif + trust_sender_filter = 1; } else if (local_server) { /* If the user didn't request --[no-]whole-file, force * it on, but only if we're not batch processing. */ @@ -1349,6 +1351,8 @@ static int start_client(int argc, char * char *dummy_host; int dummy_port = rsync_port; int i; + if (filesfrom_fd < 0) + add_implied_include(remote_argv[0]); /* For remote source, any extra source args must have either * the same hostname or an empty hostname. */ for (i = 1; i < remote_argc; i++) { @@ -1372,6 +1376,7 @@ static int start_client(int argc, char * if (!rsync_port && !*arg) /* Turn an empty arg into a dot dir. */ arg = "."; remote_argv[i] = arg; + add_implied_include(arg); } } Index: rsync-3.1.0/receiver.c =================================================================== --- rsync-3.1.0.orig/receiver.c 2022-08-15 08:12:36.240762776 +0000 +++ rsync-3.1.0/receiver.c 2022-08-15 08:17:58.156314229 +0000 @@ -576,11 +576,14 @@ int recv_files(int f_in, int f_out, char file = dir_flist->files[cur_flist->parent_ndx]; fname = local_name ? local_name : f_name(file, fbuf); - if (daemon_filter_list.head - && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { - rprintf(FERROR, "attempt to hack rsync failed.\n"); + if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')) { + int filt_flags = S_ISDIR(file->mode) ? NAME_IS_DIR : NAME_IS_FILE; + if (check_filter(&daemon_filter_list, FLOG, fname, filt_flags) < 0) { + rprintf(FERROR, "ERROR: rejecting file transfer request for daemon excluded file: %s\n", + fname); exit_cleanup(RERR_PROTOCOL); } + } if (DEBUG_GTE(RECV, 1)) rprintf(FINFO, "recv_files(%s)\n", fname); Index: rsync-3.1.0/rsync.h =================================================================== --- rsync-3.1.0.orig/rsync.h 2022-08-15 08:21:39.611893076 +0000 +++ rsync-3.1.0/rsync.h 2022-08-15 08:22:00.537593376 +0000 @@ -859,6 +859,10 @@ struct map_struct { int status; /* first errno from read errors */ }; +#define NAME_IS_FILE (0) /* filter name as a file */ +#define NAME_IS_DIR (1<<0) /* filter name as a dir */ +#define NAME_IS_XATTR (1<<2) /* filter name as an xattr */ + #define FILTRULE_WILD (1<<0) /* pattern has '*', '[', and/or '?' */ #define FILTRULE_WILD2 (1<<1) /* pattern has '**' */ #define FILTRULE_WILD2_PREFIX (1<<2) /* pattern starts with "**" */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
