summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-02-23 17:43:47 -0800
committerTim Prouty <tprouty@samba.org>2009-02-23 23:22:03 -0800
commit997dfbbf5409a9df3b3c87025fa80fb6bdafcac2 (patch)
tree5e6c19fca08ea569d67966365929da149ff24ff8
parent7bcaaf14fbf22805d88b945256b6bd31121c7c66 (diff)
downloadsamba-997dfbbf5409a9df3b3c87025fa80fb6bdafcac2.tar.gz
samba-997dfbbf5409a9df3b3c87025fa80fb6bdafcac2.tar.bz2
samba-997dfbbf5409a9df3b3c87025fa80fb6bdafcac2.zip
s3 OneFS: Fix a double free in an error path
-rw-r--r--source3/smbd/oplock_onefs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/oplock_onefs.c b/source3/smbd/oplock_onefs.c
index 0908ce4386..d4f181fc47 100644
--- a/source3/smbd/oplock_onefs.c
+++ b/source3/smbd/oplock_onefs.c
@@ -744,13 +744,13 @@ struct kernel_oplocks *onefs_init_kernel_oplocks(TALLOC_CTX *mem_ctx)
po.po_flags_on |= P_NON_BLOCKING_SEMLOCK;
if (setprocoptions(&po) != 0) {
DEBUG(0, ("setprocoptions failed: %s.\n", strerror(errno)));
- goto err_out;
+ return NULL;
}
/* Setup the oplock contexts */
_ctx = talloc_zero(mem_ctx, struct kernel_oplocks);
if (!_ctx) {
- goto err_out;
+ return NULL;
}
ctx = talloc_zero(_ctx, struct onefs_oplocks_context);
@@ -788,7 +788,6 @@ struct kernel_oplocks *onefs_init_kernel_oplocks(TALLOC_CTX *mem_ctx)
err_out:
talloc_free(_ctx);
- talloc_free(ctx);
return NULL;
}