sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients.

Browse Source 
Windows 2008 R2 (and others) ignore the high bits for the read size.

Unless we're using the unix extentions and the client
uses CIFS_UNIX_LARGE_READ_CAP, we should also ignore
the high bits.

But we still need to support old "smbclient" binaries
and have to check if the client is "Samba".

metze

Signed-off-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2011-09-10 11:02:02 +02:00 committed by Jeremy Allison
parent 555c626af8
commit f8c26c16b8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/smbd/reply.c
View File

@ -3738,6 +3738,7 @@ nosendfile_read:
void reply_read_and_X(struct smb_request *req)
{
struct smbd_server_connection *sconn = req->sconn;
connection_struct *conn = req->conn;
files_struct *fsp;
SMB_OFF_T startpos;
@ -3776,7 +3777,15 @@ void reply_read_and_X(struct smb_request *req)
return;
}
if (global_client_caps & CAP_LARGE_READX) {
if ((sconn->smb1.unix_info.client_cap_low & CIFS_UNIX_LARGE_READ_CAP) ||
(get_remote_arch() == RA_SAMBA)) {
/*
* 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.
*/
size_t upper_size = SVAL(req->vwv+7, 0);
smb_maxcnt |= (upper_size<<16);
if (upper_size > 1) {