From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Weijie Yang <weijie.yang@samsung.com>
Cc: 'Minchan Kim' <minchan@kernel.org>,
'Andrew Morton' <akpm@linux-foundation.org>,
'Sergey Senozhatsky' <sergey.senozhatsky@gmail.com>,
'Dan Streetman' <ddstreet@ieee.org>,
'Nitin Gupta' <ngupta@vflare.org>,
'Weijie Yang' <weijie.yang.kh@gmail.com>,
'Linux-MM' <linux-mm@kvack.org>,
'linux-kernel' <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] zram: avoid kunmap_atomic a NULL pointer
Date: Fri, 31 Oct 2014 22:46:32 +0900 [thread overview]
Message-ID: <20141031134632.GA942@swordfish> (raw)
In-Reply-To: <000001cff409$bf7bfa50$3e73eef0$%yang@samsung.com>
On (10/30/14 14:20), Weijie Yang wrote:
> zram could kunmap_atomic a NULL pointer in a rare situation:
> a zram page become a full-zeroed page after a partial write io.
> The current code doesn't handle this case and kunmap_atomic a
> NULL porinter, which panic the kernel.
>
> This patch fixes this issue.
>
> Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
thank you, Weijie.
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-ss
> ---
> drivers/block/zram/zram_drv.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 2ad0b5b..3920ee4 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -560,7 +560,8 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
> }
>
> if (page_zero_filled(uncmem)) {
> - kunmap_atomic(user_mem);
> + if (user_mem)
> + kunmap_atomic(user_mem);
> /* Free memory associated with this sector now. */
> bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
> zram_free_page(zram, index);
> --
> 1.7.0.4
>
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Weijie Yang <weijie.yang@samsung.com>
Cc: "'Minchan Kim'" <minchan@kernel.org>,
"'Andrew Morton'" <akpm@linux-foundation.org>,
"'Sergey Senozhatsky'" <sergey.senozhatsky@gmail.com>,
"'Dan Streetman'" <ddstreet@ieee.org>,
"'Nitin Gupta'" <ngupta@vflare.org>,
"'Weijie Yang'" <weijie.yang.kh@gmail.com>,
"'Linux-MM'" <linux-mm@kvack.org>,
"'linux-kernel'" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] zram: avoid kunmap_atomic a NULL pointer
Date: Fri, 31 Oct 2014 22:46:32 +0900 [thread overview]
Message-ID: <20141031134632.GA942@swordfish> (raw)
In-Reply-To: <000001cff409$bf7bfa50$3e73eef0$%yang@samsung.com>
On (10/30/14 14:20), Weijie Yang wrote:
> zram could kunmap_atomic a NULL pointer in a rare situation:
> a zram page become a full-zeroed page after a partial write io.
> The current code doesn't handle this case and kunmap_atomic a
> NULL porinter, which panic the kernel.
>
> This patch fixes this issue.
>
> Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
thank you, Weijie.
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-ss
> ---
> drivers/block/zram/zram_drv.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 2ad0b5b..3920ee4 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -560,7 +560,8 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
> }
>
> if (page_zero_filled(uncmem)) {
> - kunmap_atomic(user_mem);
> + if (user_mem)
> + kunmap_atomic(user_mem);
> /* Free memory associated with this sector now. */
> bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
> zram_free_page(zram, index);
> --
> 1.7.0.4
>
>
next prev parent reply other threads:[~2014-10-31 13:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-30 6:20 [PATCH] zram: avoid kunmap_atomic a NULL pointer Weijie Yang
2014-10-30 6:20 ` Weijie Yang
2014-10-30 13:13 ` Jerome Marchand
2014-10-31 13:46 ` Sergey Senozhatsky [this message]
2014-10-31 13:46 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141031134632.GA942@swordfish \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=ddstreet@ieee.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=weijie.yang.kh@gmail.com \
--cc=weijie.yang@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.