diff options
| author | Raghavendra G <raghavendra@zresearch.com> | 2009-05-15 03:56:22 -0700 |
|---|---|---|
| committer | Anand V. Avati <avati@amp.gluster.com> | 2009-05-16 16:40:32 +0530 |
| commit | 49523c834f075007352d07bf09463af9499b59f5 (patch) | |
| tree | 1e6bbbbecd7df28acf07ff4510400b5fd41ae4dc | |
| parent | 254f770af6ae6ff207fc567b6576a31469c84f67 (diff) | |
client-protocol: Fix memory corruption in client_lookup
- memory corruption was due to new members being added between allocation
of buffer for serializing xattr_req dictionary and dict_serialize of
xattr_req.
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
| -rw-r--r-- | xlators/protocol/client/src/client-protocol.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/xlators/protocol/client/src/client-protocol.c b/xlators/protocol/client/src/client-protocol.c index 97697ce6baa..59b2e1d0b40 100644 --- a/xlators/protocol/client/src/client-protocol.c +++ b/xlators/protocol/client/src/client-protocol.c @@ -3096,6 +3096,7 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t op_ret = -1; int32_t op_errno = EINVAL; client_local_t *local = NULL; + char *buf = NULL; local = calloc (1, sizeof (*local)); GF_VALIDATE_OR_GOTO(this->name, local, unwind); @@ -3124,12 +3125,11 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, pathlen = STRLEN_0(loc->path); if (xattr_req) { - dictlen = dict_serialized_length (xattr_req); - if (dictlen < 0) { + ret = dict_allocate_and_serialize (xattr_req, &buf, &dictlen); + if (ret < 0) { gf_log (this->name, GF_LOG_DEBUG, "failed to get serialized length of dict(%p)", xattr_req); - ret = dictlen; goto unwind; } } @@ -3146,16 +3146,10 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, if (baselen) strcpy (req->path + pathlen, loc->name); - if (dictlen) { - ret = dict_serialize (xattr_req, - req->dict + baselen + pathlen); - if (ret < 0) { - gf_log (this->name, GF_LOG_DEBUG, - "failed to serialize dictionary(%p)", - xattr_req); - goto unwind; - } - } + if (dictlen > 0) { + memcpy (req->dict + pathlen + baselen, buf, dictlen); + FREE (buf); + } req->dictlen = hton32 (dictlen); |