From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Antonov Subject: [PATCH] hfsplus: fix cross-page bio requests Date: Fri, 10 Apr 2015 11:02:23 +0200 Message-ID: <1428656543-6790-1-git-send-email-saproj@gmail.com> Cc: Anton Altaparmakov , Al Viro , Christoph Hellwig , Andrew Morton , Vyacheslav Dubeyko , Hin-Tak Leung , Sougata Santra , Sergei Antonov To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-wg0-f52.google.com ([74.125.82.52]:33027 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752975AbbDJHCx (ORCPT ); Fri, 10 Apr 2015 03:02:53 -0400 Received: by wgin8 with SMTP id n8so8525521wgi.0 for ; Fri, 10 Apr 2015 00:02:51 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Function hfsplus_submit_bio() did not work when the passed buffer spanned over more than one page. That was because bio_alloc() is passed 1 as a number of vectors but more than one vector were added inside the 'while' loop. It periodically caused a mount error when the volume header could not be read. This patch modifies the code so that only one vector is used. It works for multiple pages too. Also adds a return code check after bio_alloc(). Cc: Anton Altaparmakov Cc: Al Viro Cc: Christoph Hellwig Cc: Andrew Morton Cc: Vyacheslav Dubeyko Cc: Hin-Tak Leung Cc: Sougata Santra Signed-off-by: Sergei Antonov --- fs/hfsplus/wrapper.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c index cc62356..e245faa 100644 --- a/fs/hfsplus/wrapper.c +++ b/fs/hfsplus/wrapper.c @@ -62,29 +62,20 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, offset = start & (io_size - 1); sector &= ~((io_size >> HFSPLUS_SECTOR_SHIFT) - 1); - bio = bio_alloc(GFP_NOIO, 1); - bio->bi_iter.bi_sector = sector; - bio->bi_bdev = sb->s_bdev; - if (!(rw & WRITE) && data) *data = (u8 *)buf + offset; - while (io_size > 0) { - unsigned int page_offset = offset_in_page(buf); - unsigned int len = min_t(unsigned int, PAGE_SIZE - page_offset, - io_size); - - ret = bio_add_page(bio, virt_to_page(buf), len, page_offset); - if (ret != len) { - ret = -EIO; - goto out; - } - io_size -= len; - buf = (u8 *)buf + len; - } - + bio = bio_alloc(GFP_NOIO, 1); + if (!bio) + return -ENOMEM; + bio->bi_iter.bi_sector = sector; + bio->bi_bdev = sb->s_bdev; + bio->bi_vcnt = 1; + bio->bi_iter.bi_size = io_size; + bio->bi_io_vec[0].bv_page = virt_to_page(buf); + bio->bi_io_vec[0].bv_offset = offset_in_page(buf); + bio->bi_io_vec[0].bv_len = io_size; ret = submit_bio_wait(rw, bio); -out: bio_put(bio); return ret < 0 ? ret : 0; } -- 2.3.0