From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kent Overstreet Subject: [PATCH v3 01/26] block: Fix a buffer overrun in bio_integrity_split() Date: Mon, 24 Sep 2012 15:34:41 -0700 Message-ID: <1348526106-17074-2-git-send-email-koverstreet@google.com> References: <1348526106-17074-1-git-send-email-koverstreet@google.com> Reply-To: device-mapper development Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1348526106-17074-1-git-send-email-koverstreet@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@redhat.com Cc: axboe@kernel.dk, "Martin K. Petersen" , Kent Overstreet , tj@kernel.org, vgoyal@redhat.com List-Id: linux-bcache@vger.kernel.org bio_integrity_split() seemed to be confusing pointers and arrays - bip_vec in bio_integrity_payload is an array appended to the end of the payload, so the bio_vecs in struct bio_pair need to come immediately after the bio_integrity_payload they're for, and there was an assignment in bio_integrity_split() that didn't make any sense. Signed-off-by: Kent Overstreet CC: Jens Axboe CC: Martin K. Petersen --- fs/bio-integrity.c | 3 --- include/linux/bio.h | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index a3f28f3..c7b6b52 100644 --- a/fs/bio-integrity.c +++ b/fs/bio-integrity.c @@ -697,9 +697,6 @@ void bio_integrity_split(struct bio *bio, struct bio_pair *bp, int sectors) bp->iv1 = bip->bip_vec[0]; bp->iv2 = bip->bip_vec[0]; - bp->bip1.bip_vec[0] = bp->iv1; - bp->bip2.bip_vec[0] = bp->iv2; - bp->iv1.bv_len = sectors * bi->tuple_size; bp->iv2.bv_offset += sectors * bi->tuple_size; bp->iv2.bv_len -= sectors * bi->tuple_size; diff --git a/include/linux/bio.h b/include/linux/bio.h index b31036f..8e2d108 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -200,8 +200,10 @@ struct bio_pair { struct bio bio1, bio2; struct bio_vec bv1, bv2; #if defined(CONFIG_BLK_DEV_INTEGRITY) - struct bio_integrity_payload bip1, bip2; - struct bio_vec iv1, iv2; + struct bio_integrity_payload bip1; + struct bio_vec iv1; + struct bio_integrity_payload bip2; + struct bio_vec iv2; #endif atomic_t cnt; int error; -- 1.7.12