aboutsummaryrefslogtreecommitdiff
path: root/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch')
1 files changed, 22 insertions, 0 deletions
diff --git a/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch b/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch
new file mode 100644
index 000000000..688baff4c
--- /dev/null
+++ b/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch
@@ -0,0 +1,22 @@
+commit 47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1
+Author: Wayne Davison <wayned@samba.org>
+Date: Sun Nov 5 11:33:15 2017 -0800
+
+ Enforce trailing \0 when receiving xattr name values.
+ Fixes bug 13112.
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+ out_of_memory("receive_xattr");
+ name = ptr + dget_len + extra_len;
+ read_buf(f, name, name_len);
++ if (name_len < 1 || name[name_len-1] != '\0') {
++ rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
++ exit_cleanup(RERR_FILEIO);
++ }
+ if (dget_len == datum_len)
+ read_buf(f, ptr, dget_len);
+ else {