sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

vfs_fruit: ignore or delete invalid AFP_AfpInfo streams

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12427

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
(cherry picked from commit a2afd61906fbf36f75b2054abfd7384f220a14e3)
This commit is contained in:
Ralph Boehme 2016-12-11 19:10:05 +01:00 committed by Stefan Metzmacher
parent aad3ccc71d
commit 05d0b6dd63
1 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
source3/modules/vfs_fruit.c
View File

@ -3527,7 +3527,26 @@ static ssize_t fruit_pread_meta_stream(vfs_handle_struct *handle,
files_struct *fsp, void *data,
size_t n, off_t offset)
{
return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
ssize_t nread;
int ret;
nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
if (nread == n) {
return nread;
}
DBG_ERR("Removing [%s] after short read [%zd]\n",
fsp_str_dbg(fsp), nread);
ret = SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
if (ret != 0) {
DBG_ERR("Removing [%s] failed\n", fsp_str_dbg(fsp));
return -1;
}
errno = EINVAL;
return -1;
}
static ssize_t fruit_pread_meta_adouble(vfs_handle_struct *handle,
@ -4365,6 +4384,50 @@ static NTSTATUS fruit_streaminfo_meta_stream(
unsigned int *pnum_streams,
struct stream_struct **pstreams)
{
struct stream_struct *stream = *pstreams;
unsigned int num_streams = *pnum_streams;
struct smb_filename *sname = NULL;
int i;
int ret;
bool ok;
for (i = 0; i < num_streams; i++) {
if (strequal_m(stream[i].name, AFPINFO_STREAM)) {
break;
}
}
if (i == num_streams) {
return NT_STATUS_OK;
}
if (stream[i].size == AFP_INFO_SIZE) {
return NT_STATUS_OK;
}
DBG_ERR("Removing invalid AFPINFO_STREAM size [%zd] from [%s]\n",
stream[i].size, smb_fname_str_dbg(smb_fname));
ok = del_fruit_stream(mem_ctx, pnum_streams, pstreams, AFPINFO_STREAM);
if (!ok) {
return NT_STATUS_INTERNAL_ERROR;
}
sname = synthetic_smb_fname(talloc_tos(),
smb_fname->base_name,
AFPINFO_STREAM_NAME,
NULL, 0);
if (sname == NULL) {
return NT_STATUS_NO_MEMORY;
}
ret = SMB_VFS_NEXT_UNLINK(handle, sname);
TALLOC_FREE(sname);
if (ret != 0) {
DBG_ERR("Removing [%s] failed\n", smb_fname_str_dbg(sname));
return map_nt_error_from_unix(errno);
}
return NT_STATUS_OK;
}
@ -4376,8 +4439,11 @@ static NTSTATUS fruit_streaminfo_meta_netatalk(
unsigned int *pnum_streams,
struct stream_struct **pstreams)
{
struct stream_struct *stream = *pstreams;
unsigned int num_streams = *pnum_streams;
struct adouble *ad = NULL;
bool is_fi_empty;
int i;
bool ok;
/* Remove the Netatalk xattr from the list */
@ -4387,6 +4453,27 @@ static NTSTATUS fruit_streaminfo_meta_netatalk(
return NT_STATUS_NO_MEMORY;
}
/*
* Check if there's a AFPINFO_STREAM from the VFS streams
* backend and if yes, remove it from the list
*/
for (i = 0; i < num_streams; i++) {
if (strequal_m(stream[i].name, AFPINFO_STREAM)) {
break;
}
}
if (i < num_streams) {
DBG_WARNING("Unexpected AFPINFO_STREAM on [%s]\n",
smb_fname_str_dbg(smb_fname));
ok = del_fruit_stream(mem_ctx, pnum_streams, pstreams,
AFPINFO_STREAM);
if (!ok) {
return NT_STATUS_INTERNAL_ERROR;
}
}
ad = ad_get(talloc_tos(), handle,
smb_fname->base_name, ADOUBLE_META);
if (ad == NULL) {