diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-07-10 14:01:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:00 -0500 |
| commit | 5468516f9af10cb3c67bc93c610c22b5383e20db (patch) | |
| tree | cc2b84121234dd1e9ead2ae6839eb20213515f7f /source4/smb_server | |
| parent | fabc6ae74ded03faac1ed23d79a61e205cd78daa (diff) | |
| download | samba-5468516f9af10cb3c67bc93c610c22b5383e20db.tar.gz samba-5468516f9af10cb3c67bc93c610c22b5383e20db.tar.bz2 samba-5468516f9af10cb3c67bc93c610c22b5383e20db.zip | |
r16918: the SMB2 Ioctls are sometimes called with a wildcard handle
the operation doesn't need a valid file handle in that case
metze
(This used to be commit d41a83d55945b07020349339888f3a34ac4eff4e)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb2/fileio.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c index 69eb4a02f2..fa35afce7e 100644 --- a/source4/smb_server/smb2/fileio.c +++ b/source4/smb_server/smb2/fileio.c @@ -239,7 +239,14 @@ static void smb2srv_ioctl_send(struct ntvfs_request *ntvfs) SSVAL(req->out.body, 0x02, io->smb2.out._pad); SIVAL(req->out.body, 0x04, io->smb2.out.function); - smb2srv_push_handle(req->out.body, 0x08,io->smb2.in.file.ntvfs); + if (io->smb2.level == RAW_IOCTL_SMB2_NO_HANDLE) { + struct smb2_handle h; + h.data[0] = UINT64_MAX; + h.data[1] = UINT64_MAX; + smb2_push_handle(req->out.body + 0x08, &h); + } else { + smb2srv_push_handle(req->out.body, 0x08,io->smb2.in.file.ntvfs); + } SMB2SRV_CHECK(smb2_push_o32s32_blob(&req->out, 0x18, io->smb2.out.in)); SMB2SRV_CHECK(smb2_push_o32s32_blob(&req->out, 0x20, io->smb2.out.out)); SIVAL(req->out.body, 0x28, io->smb2.out.unknown2); @@ -251,23 +258,31 @@ static void smb2srv_ioctl_send(struct ntvfs_request *ntvfs) void smb2srv_ioctl_recv(struct smb2srv_request *req) { union smb_ioctl *io; + struct smb2_handle h; SMB2SRV_CHECK_BODY_SIZE(req, 0x38, True); SMB2SRV_TALLOC_IO_PTR(io, union smb_ioctl); SMB2SRV_SETUP_NTVFS_REQUEST(smb2srv_ioctl_send, NTVFS_ASYNC_STATE_MAY_ASYNC); /* TODO: avoid the memcpy */ - io->smb2.level = RAW_IOCTL_SMB2; io->smb2.in._pad = SVAL(req->in.body, 0x02); io->smb2.in.function = IVAL(req->in.body, 0x04); - io->smb2.in.file.ntvfs = smb2srv_pull_handle(req, req->in.body, 0x08); + /* file handle ... */ SMB2SRV_CHECK(smb2_pull_o32s32_blob(&req->in, io, req->in.body+0x18, &io->smb2.in.out)); io->smb2.in.unknown2 = IVAL(req->in.body, 0x20); SMB2SRV_CHECK(smb2_pull_o32s32_blob(&req->in, io, req->in.body+0x24, &io->smb2.in.in)); io->smb2.in.max_response_size = IVAL(req->in.body, 0x2C); io->smb2.in.flags = BVAL(req->in.body, 0x30); - SMB2SRV_CHECK_FILE_HANDLE(io->smb2.in.file.ntvfs); + smb2_pull_handle(req->in.body + 0x08, &h); + if (h.data[0] == UINT64_MAX && h.data[1] == UINT64_MAX) { + io->smb2.level = RAW_IOCTL_SMB2_NO_HANDLE; + } else { + io->smb2.level = RAW_IOCTL_SMB2; + io->smb2.in.file.ntvfs = smb2srv_pull_handle(req, req->in.body, 0x08); + SMB2SRV_CHECK_FILE_HANDLE(io->smb2.in.file.ntvfs); + } + SMB2SRV_CALL_NTVFS_BACKEND(ntvfs_ioctl(req->ntvfs, io)); } |