lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 030/139] zram: correct offset usage in zram_bio_discard
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Weijie Yang <weijie.yang@samsung.com>

    commit 38515c73398a4c58059ecf1087e844561b58ee0f upstream.

    We want to skip the physical block(PAGE_SIZE) which is partially covered
    by the discard bio, so we check the remaining size and subtract it if
    there is a need to goto the next physical block.

    The current offset usage in zram_bio_discard is incorrect, it will cause
    its upper filesystem breakdown. Consider the following scenario:

    On some architecture or config, PAGE_SIZE is 64K for example, filesystem
    is set up on zram disk without PAGE_SIZE aligned, a discard bio leads to a
    offset = 4K and size=72K, normally, it should not really discard any
    physical block as it partially cover two physical blocks. However, with
    the current offset usage, it will discard the second physical block and
    free its memory, which will cause filesystem breakdown.

    This patch corrects the offset usage in zram_bio_discard.

    Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
    Cc: Minchan Kim <minchan@kernel.org>
    Cc: Nitin Gupta <ngupta@vflare.org>
    Acked-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
    Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    Cc: Bob Liu <bob.liu@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/zram/zram_drv.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/block/zram/zram_drv.c
    +++ b/drivers/block/zram/zram_drv.c
    @@ -572,10 +572,10 @@ static void zram_bio_discard(struct zram
    * skipping this logical block is appropriate here.
    */
    if (offset) {
    - if (n < offset)
    + if (n <= (PAGE_SIZE - offset))
    return;

    - n -= offset;
    + n -= (PAGE_SIZE - offset);
    index++;
    }




    \
     
     \ /
      Last update: 2014-06-28 21:21    [W:4.276 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site