43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 8ad4b5d912fad1df29717dddaa775724da77d299 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Tridgell <andrew@tridgell.net>
|
||
|
|
Date: Sat, 23 Nov 2024 11:08:03 +1100
|
||
|
|
Subject: [PATCH] refuse fuzzy options when fuzzy not selected
|
||
|
|
|
||
|
|
this prevents a malicious server providing a file to compare to when
|
||
|
|
the user has not given the fuzzy option
|
||
|
|
|
||
|
|
CVE: CVE-2024-12086
|
||
|
|
|
||
|
|
Upstream-Status: Backport [https://git.samba.org/?p=rsync.git;a=commit;h=8ad4b5d912fad1df29717dddaa775724da77d299]
|
||
|
|
|
||
|
|
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
|
||
|
|
---
|
||
|
|
receiver.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/receiver.c b/receiver.c
|
||
|
|
index 6b4b369e..2d7f6033 100644
|
||
|
|
--- a/receiver.c
|
||
|
|
+++ b/receiver.c
|
||
|
|
@@ -66,6 +66,7 @@ extern char sender_file_sum[MAX_DIGEST_LEN];
|
||
|
|
extern struct file_list *cur_flist, *first_flist, *dir_flist;
|
||
|
|
extern filter_rule_list daemon_filter_list;
|
||
|
|
extern OFF_T preallocated_len;
|
||
|
|
+extern int fuzzy_basis;
|
||
|
|
|
||
|
|
extern struct name_num_item *xfer_sum_nni;
|
||
|
|
extern int xfer_sum_len;
|
||
|
|
@@ -716,6 +717,10 @@ int recv_files(int f_in, int f_out, char *local_name)
|
||
|
|
fnamecmp = get_backup_name(fname);
|
||
|
|
break;
|
||
|
|
case FNAMECMP_FUZZY:
|
||
|
|
+ if (fuzzy_basis == 0) {
|
||
|
|
+ rprintf(FERROR_XFER, "rsync: refusing malicious fuzzy operation for %s\n", xname);
|
||
|
|
+ exit_cleanup(RERR_PROTOCOL);
|
||
|
|
+ }
|
||
|
|
if (file->dirname) {
|
||
|
|
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname);
|
||
|
|
fnamecmp = fnamecmpbuf;
|
||
|
|
--
|
||
|
|
2.40.0
|