diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-09 02:12:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:41 -0500 |
| commit | 47b91c97cd5ec323b9c3b73bfa7951f8105da732 (patch) | |
| tree | 174efb7a5927ccc58c18831cdc138cb6f0ba1c5b /source4/ntvfs | |
| parent | 0639758dd9b19926baac1fd5636d00e3a3d23404 (diff) | |
| download | samba-47b91c97cd5ec323b9c3b73bfa7951f8105da732.tar.gz samba-47b91c97cd5ec323b9c3b73bfa7951f8105da732.tar.bz2 samba-47b91c97cd5ec323b9c3b73bfa7951f8105da732.zip | |
r3631: a couple of tweaks to the talloc hierarchy for async requests in
pvfs. This prevents a possible crash due to free ordering on
unexpected disconnect.
(This used to be commit bfca9eb7cb7a2caf3a232d538808ff2ade8e1ca9)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_wait.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index cfd2b0f159..cc4498eee1 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -669,6 +669,8 @@ static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs, return NT_STATUS_NO_MEMORY; } + talloc_steal(pvfs, r); + return NT_STATUS_OK; } diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c index 968f659421..479d339592 100644 --- a/source4/ntvfs/posix/pvfs_wait.c +++ b/source4/ntvfs/posix/pvfs_wait.c @@ -127,7 +127,7 @@ static int pvfs_wait_destructor(void *ptr) struct timed_event te; struct pvfs_wait *pwait; - pwait = talloc_p(req, struct pvfs_wait); + pwait = talloc_p(pvfs, struct pvfs_wait); if (pwait == NULL) { return NULL; } |