summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-23 21:40:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:39 -0500
commit0845fa40853040c3ddb9d7a56fd756924f3369eb (patch)
tree5c55cfc452c39937f23740de537c2158a556c3c5
parent4742fa9366020accb033e622881c8cb29a6e427f (diff)
downloadsamba-0845fa40853040c3ddb9d7a56fd756924f3369eb.tar.gz
samba-0845fa40853040c3ddb9d7a56fd756924f3369eb.tar.bz2
samba-0845fa40853040c3ddb9d7a56fd756924f3369eb.zip
r22493: Fix horrible memory corruption bug with CIFS POSIX open/mkidr.
Found by SteveF + valgrind :-). Jerry - essential for rc3. Jeremy. (This used to be commit b01c1c4618fe0ff9fd9bac7ed780a4676ea1ba7a)
-rw-r--r--source3/smbd/trans2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2c6df0a11e..512b3162fa 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5434,6 +5434,7 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
*pdata_return_size = 0;
return NT_STATUS_NO_MEMORY;
}
+ pdata = *ppdata;
SSVAL(pdata,0,NO_OPLOCK_RETURN);
SSVAL(pdata,2,0); /* No fnum. */
@@ -5610,6 +5611,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
*pdata_return_size = 0;
return NT_STATUS_NO_MEMORY;
}
+ pdata = *ppdata;
if (extended_oplock_granted) {
if (flags & REQUEST_BATCH_OPLOCK) {