diff options
| author | Amar Tumballi <amar@gluster.com> | 2009-06-23 13:41:26 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2009-06-23 14:26:40 -0700 |
| commit | c15ab84a1dd687e9e97b17fb7250ba945857026e (patch) | |
| tree | 2785645be1e8e0c984e5e8707c3a7ecd445f9ea1 | |
| parent | 60aaf35a044357b3a639e0d8f46102a3272b5c65 (diff) | |
server-protocol: interpret the 'op' value properly when a packet is received.
Ref: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=35
The check done earlier was not handling the case when a 'op' is == MAX_VALUE (which
is not defined), and used to skip to the next array (like gf_mops[MAX] == gf_cbks[0])
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
| -rw-r--r-- | xlators/protocol/server/src/server-protocol.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c index 02aad32d0..6faf0a517 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/server/src/server-protocol.c @@ -7485,8 +7485,7 @@ protocol_server_interpret (xlator_t *this, transport_t *trans, peerinfo = &trans->peerinfo; switch (type) { case GF_OP_TYPE_FOP_REQUEST: - if ((op < 0) || - (op > GF_FOP_MAXVALUE)) { + if ((op < 0) || (op >= GF_FOP_MAXVALUE)) { gf_log (this->name, GF_LOG_ERROR, "invalid fop %"PRId32" from client %s", op, peerinfo->identifier); @@ -7503,7 +7502,7 @@ protocol_server_interpret (xlator_t *this, transport_t *trans, break; case GF_OP_TYPE_MOP_REQUEST: - if (op < 0 || op > GF_MOP_MAXVALUE) { + if ((op < 0) || (op >= GF_MOP_MAXVALUE)) { gf_log (this->name, GF_LOG_ERROR, "invalid mop %"PRId32" from client %s", op, peerinfo->identifier); @@ -7514,7 +7513,7 @@ protocol_server_interpret (xlator_t *this, transport_t *trans, break; case GF_OP_TYPE_CBK_REQUEST: - if (op < 0 || op > GF_CBK_MAXVALUE) { + if ((op < 0) || (op >= GF_CBK_MAXVALUE)) { gf_log (this->name, GF_LOG_ERROR, "invalid cbk %"PRId32" from client %s", op, peerinfo->identifier); |