From daf57cb5d4b325983287a1f2006b29f9fca383f4ae38f37ce8393c7b568973dc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Sep 2023 12:08:12 +0000 Subject: [PATCH] - add fortified-strlcpy-fix.patch (bsc#1214616) OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=106 --- fortified-strlcpy-fix.patch | 48 +++++++++++++++++++++++++++++++++++++ rsync.changes | 5 ++++ rsync.spec | 1 + 3 files changed, 54 insertions(+) create mode 100644 fortified-strlcpy-fix.patch diff --git a/fortified-strlcpy-fix.patch b/fortified-strlcpy-fix.patch new file mode 100644 index 0000000..d01d078 --- /dev/null +++ b/fortified-strlcpy-fix.patch @@ -0,0 +1,48 @@ +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; diff --git a/rsync.changes b/rsync.changes index e6a2c80..3328a61 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 5 12:07:57 UTC 2023 - Dirk Müller + +- add fortified-strlcpy-fix.patch (bsc#1214616) + ------------------------------------------------------------------- Wed Jul 26 15:07:23 UTC 2023 - Antonio Teixeira diff --git a/rsync.spec b/rsync.spec index ba09867..2c59965 100644 --- a/rsync.spec +++ b/rsync.spec @@ -49,6 +49,7 @@ Source11: https://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.t Source12: %{name}.keyring Source13: rsyncd Patch0: rsync-no-libattr.patch +Patch1: fortified-strlcpy-fix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: c++_compiler