Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b8514ee authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: fix potential data corruption and protocol error 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent e8744f5a

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio) 
	struct bio_vec *bvec;

	int i;

	/* hint all but last page with MSG_MORE */

	__bio_for_each_segment(bvec, bio, i, 0) {

	bio_for_each_segment(bvec, bio, i) {

		int err;



		err = _drbd_no_send_page(mdev, bvec->bv_page,
@@ -1746,7 +1746,7 @@ static int _drbd_send_zc_bio(struct drbd_conf *mdev, struct bio *bio) 
	struct bio_vec *bvec;

	int i;

	/* hint all but last page with MSG_MORE */

	__bio_for_each_segment(bvec, bio, i, 0) {

	bio_for_each_segment(bvec, bio, i) {

		int err;



		err = _drbd_send_page(mdev, bvec->bv_page,

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio * 
	sg_init_table(&sg, 1);

	crypto_hash_init(&desc);



	__bio_for_each_segment(bvec, bio, i, 0) {

	bio_for_each_segment(bvec, bio, i) {

		sg_set_page(&sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset);

		crypto_hash_update(&desc, &sg, sg.length);

	}