lkml.org 
[lkml]   [2019]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] zram: pass down the bvec we need to read into in the work struct
Adding more Cc and stable (i thought this was 5.1 addition). Note that
without this patch on arch/kernel where PAGE_SIZE != 4096 userspace
could read random memory through a zram block device (thought userspace
probably would have no control on the address being read).

On Mon, Apr 08, 2019 at 02:32:19PM -0400, jglisse@redhat.com wrote:
> From: Jérôme Glisse <jglisse@redhat.com>
>
> When scheduling work item to read page we need to pass down the proper
> bvec struct which point to the page to read into. Before this patch it
> uses randomly initialized bvec (only if PAGE_SIZE != 4096) which is
> wrong.
>
> Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
> Cc: Minchan Kim <minchan@kernel.org>
> Cc: Nitin Gupta <ngupta@vflare.org>
> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/block/zram/zram_drv.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 399cad7daae7..d58a359a6622 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -774,18 +774,18 @@ struct zram_work {
> struct zram *zram;
> unsigned long entry;
> struct bio *bio;
> + struct bio_vec bvec;
> };
>
> #if PAGE_SIZE != 4096
> static void zram_sync_read(struct work_struct *work)
> {
> - struct bio_vec bvec;
> struct zram_work *zw = container_of(work, struct zram_work, work);
> struct zram *zram = zw->zram;
> unsigned long entry = zw->entry;
> struct bio *bio = zw->bio;
>
> - read_from_bdev_async(zram, &bvec, entry, bio);
> + read_from_bdev_async(zram, &zw->bvec, entry, bio);
> }
>
> /*
> @@ -798,6 +798,7 @@ static int read_from_bdev_sync(struct zram *zram, struct bio_vec *bvec,
> {
> struct zram_work work;
>
> + work.bvec = *bvec;
> work.zram = zram;
> work.entry = entry;
> work.bio = bio;
> --
> 2.20.1
>

\
 
 \ /
  Last update: 2019-04-10 21:45    [W:0.045 / U:1.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site