sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-24 21:49:29 +03:00
Code Activity

Fix bug #9572 - File corruption during SMB1 read by Mac OSX 10.8.2 clients.

Browse Source 
Accept a large read if we told the client we have UNIX extensions
and the client sent a non-zero upper 16-bit size.

Do the non-zero upper 16-bit size check first to save a function
call in what is a hot path.

Signed-off-by: Jeremy Allison <jra@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jan 24 21:01:51 CET 2013 on sn-devel-104
This commit is contained in:
Jeremy Allison
2013-01-23 09:57:50 -08:00
parent 033197958e
commit 996a10cdea
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source3/smbd/reply.c
View File

@ -3848,6 +3848,26 @@ nosendfile_read:
return;
}
/****************************************************************************
MacOSX clients send large reads without telling us they are going to do that.
Bug #9572 - File corruption during SMB1 read by Mac OSX 10.8.2 clients
Allow this if we are talking to a Samba client, or if we told the client
we supported this.
****************************************************************************/
static bool server_will_accept_large_read(void)
{
/* Samba client ? No problem. */
if (get_remote_arch() == RA_SAMBA) {
return true;
}
/* Need UNIX extensions. */
if (!lp_unix_extensions()) {
return false;
}
return true;
}
/****************************************************************************
Reply to a read and X.
****************************************************************************/
@ -3858,6 +3878,7 @@ void reply_read_and_X(struct smb_request *req)
files_struct *fsp;
off_t startpos;
size_t smb_maxcnt;
size_t upper_size;
bool big_readX = False;
#if 0
size_t smb_mincnt = SVAL(req->vwv+6, 0);
@ -3892,8 +3913,15 @@ void reply_read_and_X(struct smb_request *req)
return;
}
if (global_client_caps & CAP_LARGE_READX) {
size_t upper_size = SVAL(req->vwv+7, 0);
upper_size = SVAL(req->vwv+7, 0);
if ((upper_size != 0) && server_will_accept_large_read()) {
/*
* This is Samba only behavior (up to Samba 3.6)!
*
* Windows 2008 R2 ignores the upper_size,
* so we do unless unix extentions are active
* or "smbclient" is talking to us.
*/
smb_maxcnt |= (upper_size<<16);
if (upper_size > 1) {
/* Can't do this on a chained packet. */