diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 08:51:58 +0300 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-27 12:26:30 -0700 |
| commit | 1874119664dafda3ef2ed9b51b4759a9540d4a1a (patch) | |
| tree | c0ef0813aeefd50703f2934abe752a2b4ebaad83 /net/ceph | |
| parent | b314a90d8f3f1d16ec45744e5e2141ea6e14e034 (diff) | |
| download | linux-stable-1874119664dafda3ef2ed9b51b4759a9540d4a1a.tar.gz linux-stable-1874119664dafda3ef2ed9b51b4759a9540d4a1a.tar.bz2 linux-stable-1874119664dafda3ef2ed9b51b4759a9540d4a1a.zip | |
libceph: fix error handling in handle_reply()
We've tried to fix the error paths in this function before, but there
is still a hidden goto in the ceph_decode_need() macro which goes to the
wrong place. We need to release the "req" and unlock a mutex before
returning.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 8ec65bc11c71..3ee4a1da02cd 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1495,14 +1495,14 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, dout("handle_reply %p tid %llu req %p result %d\n", msg, tid, req, result); - ceph_decode_need(&p, end, 4, bad); + ceph_decode_need(&p, end, 4, bad_put); numops = ceph_decode_32(&p); if (numops > CEPH_OSD_MAX_OP) goto bad_put; if (numops != req->r_num_ops) goto bad_put; payload_len = 0; - ceph_decode_need(&p, end, numops * sizeof(struct ceph_osd_op), bad); + ceph_decode_need(&p, end, numops * sizeof(struct ceph_osd_op), bad_put); for (i = 0; i < numops; i++) { struct ceph_osd_op *op = p; int len; @@ -1520,7 +1520,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, goto bad_put; } - ceph_decode_need(&p, end, 4 + numops * 4, bad); + ceph_decode_need(&p, end, 4 + numops * 4, bad_put); retry_attempt = ceph_decode_32(&p); for (i = 0; i < numops; i++) req->r_reply_op_result[i] = ceph_decode_32(&p); |