diff options
Diffstat (limited to 'meta/recipes-devtools/rsync/files/CVE-2024-12084-0002.patch')
-rw-r--r-- | meta/recipes-devtools/rsync/files/CVE-2024-12084-0002.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rsync/files/CVE-2024-12084-0002.patch b/meta/recipes-devtools/rsync/files/CVE-2024-12084-0002.patch new file mode 100644 index 0000000000..266b80c241 --- /dev/null +++ b/meta/recipes-devtools/rsync/files/CVE-2024-12084-0002.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 42e2b56c4ede3ab164f9a5c6dae02aa84606a6c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wayne Davison <wayne@opencoder.net> | ||
3 | Date: Tue, 5 Nov 2024 11:01:03 -0800 | ||
4 | Subject: [PATCH] Another cast when multiplying integers. | ||
5 | |||
6 | CVE: CVE-2024-12084 | ||
7 | |||
8 | Upstream-Status: Backport [https://git.samba.org/?p=rsync.git;a=commit;h=42e2b56c4ede3ab164f9a5c6dae02aa84606a6c1] | ||
9 | |||
10 | Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> | ||
11 | --- | ||
12 | rsync.h | 2 +- | ||
13 | sender.c | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/rsync.h b/rsync.h | ||
17 | index 8ddbe702..0f9e277f 100644 | ||
18 | --- a/rsync.h | ||
19 | +++ b/rsync.h | ||
20 | @@ -982,7 +982,7 @@ struct map_struct { | ||
21 | int status; /* first errno from read errors */ | ||
22 | }; | ||
23 | |||
24 | -#define sum2_at(s, i) ((s)->sum2_array + ((OFF_T)(i) * xfer_sum_len)) | ||
25 | +#define sum2_at(s, i) ((s)->sum2_array + ((size_t)(i) * xfer_sum_len)) | ||
26 | |||
27 | #define NAME_IS_FILE (0) /* filter name as a file */ | ||
28 | #define NAME_IS_DIR (1<<0) /* filter name as a dir */ | ||
29 | diff --git a/sender.c b/sender.c | ||
30 | index ab205341..2bbff2fa 100644 | ||
31 | --- a/sender.c | ||
32 | +++ b/sender.c | ||
33 | @@ -95,7 +95,7 @@ static struct sum_struct *receive_sums(int f) | ||
34 | return(s); | ||
35 | |||
36 | s->sums = new_array(struct sum_buf, s->count); | ||
37 | - s->sum2_array = new_array(char, s->count * xfer_sum_len); | ||
38 | + s->sum2_array = new_array(char, (size_t)s->count * xfer_sum_len); | ||
39 | |||
40 | for (i = 0; i < s->count; i++) { | ||
41 | s->sums[i].sum1 = read_int(f); | ||
42 | -- | ||
43 | 2.40.0 | ||