summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2012-06-06 19:35:55 -0500
committerAlex Elder <elder@inktank.com>2012-06-20 07:43:50 -0500
commitb132cf4c733f91bb4dd2277ea049243cf16e8b66 (patch)
tree1818eae2e75f6ee26c80736bfd11f15245ec79b2
parent88ed6ea0b295f8e2383d599a04027ec596cdf97b (diff)
downloadop-kernel-dev-b132cf4c733f91bb4dd2277ea049243cf16e8b66.zip
op-kernel-dev-b132cf4c733f91bb4dd2277ea049243cf16e8b66.tar.gz
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> (cherry picked from commit 43643528cce60ca184fe8197efa8e8da7c89a037)
-rw-r--r--net/ceph/messenger.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 524f4e4..b332c3d 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -563,6 +563,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),
OpenPOWER on IntegriCloud