diff options
| author | Raghavendra Bhat <raghavendra@redhat.com> | 2012-09-18 13:09:10 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-09-25 17:40:26 -0700 |
| commit | ddcfd0888294b99049c7b05c0a43129b5099b19e (patch) | |
| tree | 0222c05e008a46e13a10e537c6930f55f9fa88af | |
| parent | 95a33a59039f582987c86755961c97ac07338197 (diff) | |
protocol/server: put the connection back if setvolume fails
In server_setvolume, put the connection back (thus removing it
from a the list of connections that protocol/server is maintaining
if the connection object is a newly created one) if some operations
such as getting the bound_xl etc fails. Otherwise the process might
segfault upon statedump, when it tries to access NULL bound_xl of a
connection.
Change-Id: Ifa340f534cd88d5601a9219da622b323fbe98b80
BUG: 858191
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: http://review.gluster.org/3953
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 6bbf8df0eb0..d893716ccec 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -588,7 +588,6 @@ server_setvolume (rpcsvc_request_t *req) if (ret < 0) gf_log (this->name, GF_LOG_DEBUG, "failed to set error msg"); - goto fail; } @@ -665,6 +664,13 @@ fail: rsp.op_ret = op_ret; rsp.op_errno = gf_errno_to_error (op_errno); + /* if bound_xl is NULL or something fails, then put the connection + * back. Otherwise the connection would have been added to the + * list of connections the server is maintaining and might segfault + * during statedump when bound_xl of the connection is accessed. + */ + if (op_ret && conn) + server_connection_put (this, conn, NULL); server_submit_reply (NULL, req, &rsp, NULL, 0, NULL, (xdrproc_t)xdr_gf_setvolume_rsp); |