piaojun
2018-Mar-29 01:17 UTC
[Ocfs2-devel] [PATCH v2] 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.
Signed-off-by: Jun Piao <piaojun at huawei.com>
Reviewed-by: Yiwen Jiang <jiangyiwen at huawei.com>
Reviewed-by: Changwei Ge <ge.changwei at h3c.com>
---
fs/ocfs2/cluster/heartbeat.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index ea8c551..91a8889 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -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;
--
Joseph Qi
2018-Mar-29 01:33 UTC
[Ocfs2-devel] [PATCH v2] ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio
On 18/3/29 09:17, piaojun wrote:> 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. > > Signed-off-by: Jun Piao <piaojun at huawei.com> > Reviewed-by: Yiwen Jiang <jiangyiwen at huawei.com> > Reviewed-by: Changwei Ge <ge.changwei at h3c.com>Acked-by: Joseph Qi <jiangqi903 at gmail.com>> --- > fs/ocfs2/cluster/heartbeat.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c > index ea8c551..91a8889 100644 > --- a/fs/ocfs2/cluster/heartbeat.c > +++ b/fs/ocfs2/cluster/heartbeat.c > @@ -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; >