2013-06-26 12:28:57

by Sergey Senozhatsky

Subject: [PATCH staging-next] zram: protect zram_reset_device() call

Commit 9b3bb7abcdf2df0f1b2657e6cbc9d06bc2b3b36f (remove
zram_sysfs file (v2)) accidentally made zram_reset_device()
racy. Protect zram_reset_device() call with zram->lock.

Signed-off-by: Sergey Senozhatsky <[email protected]>

---
drivers/staging/zram/zram_drv.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 82c7202..e77fb6e 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -527,8 +527,11 @@ static void zram_reset_device(struct zram *zram)
size_t index;
struct zram_meta *meta;

- if (!zram->init_done)
+ down_write(&zram->init_lock);
+ if (!zram->init_done) {
+ up_write(&zram->init_lock);
return;
+ }

meta = zram->meta;
zram->init_done = 0;
@@ -549,6 +552,7 @@ static void zram_reset_device(struct zram *zram)

zram->disksize = 0;
set_capacity(zram->disk, 0);
+ up_write(&zram->init_lock);
}

static void zram_init_device(struct zram *zram, struct zram_meta *meta)

2013-07-03 09:37:14

by Jerome Marchand

Subject: Re: [PATCH staging-next] zram: protect zram_reset_device() call

On 06/26/2013 02:28 PM, Sergey Senozhatsky wrote:
> Commit 9b3bb7abcdf2df0f1b2657e6cbc9d06bc2b3b36f (remove
> zram_sysfs file (v2)) accidentally made zram_reset_device()
> racy. Protect zram_reset_device() call with zram->lock.
>
> Signed-off-by: Sergey Senozhatsky <[email protected]>

Acked-by: Jerome Marchand <[email protected]>

2013-07-12 13:47:00

by Sergey Senozhatsky

Subject: Re: [PATCH staging-next] zram: protect zram_reset_device() call

On (07/03/13 11:37), Jerome Marchand wrote:
> Subject: Re: [PATCH staging-next] zram: protect zram_reset_device() call
> User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110
> Thunderbird/17.0.2
>
> On 06/26/2013 02:28 PM, Sergey Senozhatsky wrote:
> > Commit 9b3bb7abcdf2df0f1b2657e6cbc9d06bc2b3b36f (remove
> > zram_sysfs file (v2)) accidentally made zram_reset_device()
> > racy. Protect zram_reset_device() call with zram->lock.
> >
> > Signed-off-by: Sergey Senozhatsky <[email protected]>
>
> Acked-by: Jerome Marchand <[email protected]>

Hello Greg,
could you please apply this patch?

thank you,
-ss

2013-07-12 14:48:04

by Greg Kroah-Hartman

Subject: Re: [PATCH staging-next] zram: protect zram_reset_device() call

On Fri, Jul 12, 2013 at 04:46:29PM +0300, Sergey Senozhatsky wrote:
> On (07/03/13 11:37), Jerome Marchand wrote:
> > Subject: Re: [PATCH staging-next] zram: protect zram_reset_device() call
> > User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110
> > Thunderbird/17.0.2
> >
> > On 06/26/2013 02:28 PM, Sergey Senozhatsky wrote:
> > > Commit 9b3bb7abcdf2df0f1b2657e6cbc9d06bc2b3b36f (remove
> > > zram_sysfs file (v2)) accidentally made zram_reset_device()
> > > racy. Protect zram_reset_device() call with zram->lock.
> > >
> > > Signed-off-by: Sergey Senozhatsky <[email protected]>
> >
> > Acked-by: Jerome Marchand <[email protected]>
>
> Hello Greg,
> could you please apply this patch?

After the merge window is closed I will get to it, thanks.

greg k-h