sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

vfs_fruit: validation of writes on AFP_AfpInfo stream

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13677

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit a7c877847f855be5ee6673e541a181b818013abf)

Autobuild-User(v4-9-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-9-test): Fri Nov 16 11:31:10 CET 2018 on sn-devel-144
This commit is contained in:
Ralph Boehme 2018-11-06 13:24:14 +01:00 committed by Karolin Seeger
parent 4672656d9e
commit 5420863dd1
2 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selftest/knownfail.d/samba3.vfs.fruit
View File

@ -1,5 +1,2 @@
^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\)
^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion without embedded xattr\(nt4_dc\)
^samba3.vfs.fruit metadata_netatalk.writing_afpinfo\(nt4_dc\)
^samba3.vfs.fruit metadata_stream.writing_afpinfo\(nt4_dc\)
^samba3.vfs.fruit streams_depot.writing_afpinfo\(nt4_dc\)

69
source3/modules/vfs_fruit.c
View File

@ -4638,27 +4638,67 @@ static ssize_t fruit_pwrite_meta(vfs_handle_struct *handle,
{
struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
ssize_t nwritten;
if (n != AFP_INFO_SIZE || offset != 0) {
DBG_ERR("unexpected offset=%jd or size=%jd\n",
(intmax_t)offset, (intmax_t)n);
return -1;
}
uint8_t buf[AFP_INFO_SIZE];
size_t to_write;
size_t to_copy;
int cmp;
if (fio == NULL) {
DBG_ERR("Failed to fetch fsp extension");
return -1;
}
if (n < 3) {
errno = EINVAL;
return -1;
}
if (offset != 0 && n < 60) {
errno = EINVAL;
return -1;
}
cmp = memcmp(data, "AFP", 3);
if (cmp != 0) {
errno = EINVAL;
return -1;
}
if (n <= AFP_OFF_FinderInfo) {
/*
* Nothing to do here really, just return
*/
return n;
}
offset = 0;
to_copy = n;
if (to_copy > AFP_INFO_SIZE) {
to_copy = AFP_INFO_SIZE;
}
memcpy(buf, data, to_copy);
to_write = n;
if (to_write != AFP_INFO_SIZE) {
to_write = AFP_INFO_SIZE;
}
switch (fio->config->meta) {
case FRUIT_META_STREAM:
nwritten = fruit_pwrite_meta_stream(handle, fsp, data,
n, offset);
nwritten = fruit_pwrite_meta_stream(handle,
fsp,
buf,
to_write,
offset);
break;
case FRUIT_META_NETATALK:
nwritten = fruit_pwrite_meta_netatalk(handle, fsp, data,
n, offset);
nwritten = fruit_pwrite_meta_netatalk(handle,
fsp,
buf,
to_write,
offset);
break;
default:
@ -4666,7 +4706,14 @@ static ssize_t fruit_pwrite_meta(vfs_handle_struct *handle,
return -1;
}
return nwritten;
if (nwritten != to_write) {
return -1;
}
/*
* Return the requested amount, verified against macOS SMB server
*/
return n;
}
static ssize_t fruit_pwrite_rsrc_stream(vfs_handle_struct *handle,