diff options
| author |   Yan, Zheng <zheng.z.yan@intel.com> | 2012-06-06 19:35:55 -0500 |
|---|---|---|
| committer |   Alex Elder <elder@dreamhost.com> | 2012-06-07 08:27:33 -0500 |
| commit | 43643528cce60ca184fe8197efa8e8da7c89a037 (patch) | |
| tree | b374f11881ac017c4bed056bee1b4de195c482d7 | |
| parent | libceph: make ceph_con_revoke_message() a msg op (diff) | |
rbd: Clear ceph_msg->bio_iter for retransmitted message
The bug can cause NULL pointer dereference in write_partial_msg_pages
Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
Reviewed-by: Alex Elder <elder@inktank.com>
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3857f815c035..769a2c9fe1af 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -649,6 +649,10 @@ static void prepare_write_message(struct ceph_connection *con) m->hdr.seq = cpu_to_le64(++con->out_seq); m->needs_out_seq = false; } +#ifdef CONFIG_BLOCK + else + m->bio_iter = NULL; +#endif dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", m, con->out_seq, le16_to_cpu(m->hdr.type), |