From: Ralph Boehme <slow@samba.org>
Date: Sat, 20 Nov 2021 15:36:42 +0000 (+0100)
Subject: CVE-2021-44142: smbd: add Netatalk xattr used by vfs_fruit to the list of private... 
X-Git-Tag: samba-4.13.17~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eba87ce4b47488f1422248b8d4ad9b37ae26899;p=thirdparty%2Fsamba.git

CVE-2021-44142: smbd: add Netatalk xattr used by vfs_fruit to the list of private Samba xattrs

This is an internal xattr that should not be user visible.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14914

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
[slow@samba.org: conflict due to changed includes in source3/smbd/trans2.c]
---

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7acde285a90..673d7165c04 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -44,6 +44,7 @@
 #include "messages.h"
 #include "smb1_utils.h"
 #include "libcli/smb/smb2_posix.h"
+#include "source3/lib/adouble.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 
@@ -240,6 +241,7 @@ bool samba_private_attr_name(const char *unix_ea_name)
 		SAMBA_XATTR_DOS_ATTRIB,
 		SAMBA_XATTR_MARKER,
 		XATTR_NTACL_NAME,
+		AFPINFO_EA_NETATALK,
 		NULL
 	};