Skip to contentSkip to conversation

ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio

PATCH New piaojun 2 participants 2 messages Mar 29, 2018 OCFS2

lore
Share & tools
lore

piaojun

author
#0 lore raw

PATCH v2 1/1 ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio

We need check len for bio_add_page() to make sure the bio has been set up correctly, otherwise we may submit incorrect data to device.

---
 fs/ocfs2/cluster/heartbeat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ocfs2/cluster/heartbeat.c +10 -1
index ea8c551..91a8889 100644
@@ -570,7 +570,16 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
 		     current_page, vec_len, vec_start);
 
 		len = bio_add_page(bio, page, vec_len, vec_start);
-		if (len != vec_len) break;
+		if (len != vec_len) {
+			mlog(ML_ERROR, "Adding page[%d] to bio failed, "
+			     "page %p, len %d, vec_len %u, vec_start %u, "
+			     "bi_sector %llu\n", current_page, page, len,
+			     vec_len, vec_start,
+			     (unsigned long long)bio->bi_iter.bi_sector);
+			bio_put(bio);
+			bio = ERR_PTR(-EIO);
+			return bio;
+		}
 
 		cs += vec_len / (PAGE_SIZE/spp);
 		vec_start = 0;
#1 lore raw

PATCH v2 1/1 ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio

Quoted 6 lines · piaojun

We need check len for bio_add_page() to make sure the bio has been set up correctly, otherwise we may submit incorrect data to device.

Quoted 27 lines
---
 fs/ocfs2/cluster/heartbeat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ocfs2/cluster/heartbeat.c +10 -1
index ea8c551..91a8889 100644
@@ -570,7 +570,16 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
 		     current_page, vec_len, vec_start);
 
 		len = bio_add_page(bio, page, vec_len, vec_start);
-		if (len != vec_len) break;
+		if (len != vec_len) {
+			mlog(ML_ERROR, "Adding page[%d] to bio failed, "
+			     "page %p, len %d, vec_len %u, vec_start %u, "
+			     "bi_sector %llu\n", current_page, page, len,
+			     vec_len, vec_start,
+			     (unsigned long long)bio->bi_iter.bi_sector);
+			bio_put(bio);
+			bio = ERR_PTR(-EIO);
+			return bio;
+		}
 
 		cs += vec_len / (PAGE_SIZE/spp);
 		vec_start = 0;