1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
samba-mirror/source3/smbd/smb2_glue.c
Uri Simchoni a6073e6130 smbd: allow reading files based on FILE_EXECUTE access right
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12149

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Thu Aug 18 18:58:22 CEST 2016 on sn-devel-144
2016-08-18 18:58:22 +02:00

116 lines
3.5 KiB
C

/*
Unix SMB/CIFS implementation.
Core SMB2 server
Copyright (C) Stefan Metzmacher 2009
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "../libcli/smb/smb_common.h"
struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
{
struct smb_request *smbreq;
const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req);
if (req->smb1req) {
smbreq = req->smb1req;
} else {
smbreq = talloc_zero(req, struct smb_request);
if (smbreq == NULL) {
return NULL;
}
}
smbreq->request_time = req->request_time;
smbreq->vuid = req->session->compat->vuid;
smbreq->tid = req->tcon->compat->cnum;
smbreq->conn = req->tcon->compat;
smbreq->sconn = req->sconn;
smbreq->xconn = req->xconn;
smbreq->smbpid = (uint16_t)IVAL(inhdr, SMB2_HDR_PID);
smbreq->flags2 = FLAGS2_UNICODE_STRINGS |
FLAGS2_32_BIT_ERROR_CODES |
FLAGS2_LONG_PATH_COMPONENTS |
FLAGS2_IS_LONG_NAME;
/* This is not documented in revision 49 of [MS-SMB2] but should be
* added in a later revision (and torture test smb2.read.access
* as well as smb2.ioctl_copy_chunk_bad_access against
* Server 2012R2 confirms this)
*
* If FILE_EXECUTE is granted to a handle then the SMB2 server
* acts as if FILE_READ_DATA has also been granted. We must still
* keep the original granted mask, because with ioctl requests,
* access checks are made on the file handle, "below" the SMB2
* server, and the object store below the SMB layer is not aware
* of this arrangement (see smb2.ioctl.copy_chunk_bad_access
* torture test).
*/
smbreq->flags2 |= FLAGS2_READ_PERMIT_EXECUTE;
if (IVAL(inhdr, SMB2_HDR_FLAGS) & SMB2_HDR_FLAG_DFS) {
smbreq->flags2 |= FLAGS2_DFS_PATHNAMES;
}
smbreq->mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
smbreq->chain_fsp = req->compat_chain_fsp;
smbreq->smb2req = req;
req->smb1req = smbreq;
return smbreq;
}
/*********************************************************
Are there unread bytes for recvfile ?
*********************************************************/
size_t smbd_smb2_unread_bytes(struct smbd_smb2_request *req)
{
if (req->smb1req) {
return req->smb1req->unread_bytes;
}
return 0;
}
/*********************************************************
Called from file_free() to remove any chained fsp pointers.
*********************************************************/
void remove_smb2_chained_fsp(files_struct *fsp)
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct smbXsrv_connection *xconn = NULL;
if (sconn->client != NULL) {
xconn = sconn->client->connections;
}
for (; xconn != NULL; xconn = xconn->next) {
struct smbd_smb2_request *smb2req;
for (smb2req = xconn->smb2.requests; smb2req; smb2req = smb2req->next) {
if (smb2req->compat_chain_fsp == fsp) {
smb2req->compat_chain_fsp = NULL;
}
if (smb2req->smb1req && smb2req->smb1req->chain_fsp == fsp) {
smb2req->smb1req->chain_fsp = NULL;
}
}
}
}