rbd: Clear ceph_msg->bio_iter for retransmitted message
authorYan, Zheng <zheng.z.yan@intel.com>
Thu, 7 Jun 2012 00:35:55 +0000 (19:35 -0500)
committerAlex Elder <elder@dreamhost.com>
Thu, 7 Jun 2012 13:27:33 +0000 (08:27 -0500)
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>
net/ceph/messenger.c

index 3857f815c0359b0e3800ca12de70a74d3cd9aa8e..769a2c9fe1afb5136ec352e26b856c54c3a5801f 100644 (file)
@@ -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),