* [PATCH] dm: writecache: Use 2-factor allocator arguments
@ 2018-06-18 17:50 Kees Cook
2018-06-18 21:12 ` Mikulas Patocka
2018-06-27 21:48 ` Kees Cook
0 siblings, 2 replies; 6+ messages in thread
From: Kees Cook @ 2018-06-18 17:50 UTC (permalink / raw)
To: Mikulas Patocka
Cc: linux-kernel, dm-devel, Dan Williams, Mike Snitzer, Alasdair Kergon
This adjusts the allocator calls to use the 2-factor argument style, as
already done treewide for better defense against allocator overflows.
Additionally adjusts style nit to avoid assignments in test expressions.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/md/dm-writecache.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 5961c7794ef3..7773f4c75701 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
if (da != p) {
long i;
wc->memory_map = NULL;
- pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);
+ pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
if (!pages) {
r = -ENOMEM;
goto err2;
@@ -859,7 +859,8 @@ static int writecache_alloc_entries(struct dm_writecache *wc)
if (wc->entries)
return 0;
- wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);
+ wc->entries = vmalloc(array_size(sizeof(struct wc_entry),
+ wc->n_blocks));
if (!wc->entries)
return -ENOMEM;
for (b = 0; b < wc->n_blocks; b++) {
@@ -1480,10 +1481,13 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
bio_set_dev(&wb->bio, wc->dev->bdev);
wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
wb->page_offset = PAGE_SIZE;
- if (max_pages <= WB_LIST_INLINE ||
- unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),
- GFP_NOIO | __GFP_NORETRY |
- __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
+ if (max_pages > WB_LIST_INLINE)
+ wb->wc_list = kmalloc_array(max_pages,
+ sizeof(struct wc_entry *),
+ GFP_NOIO | __GFP_NORETRY |
+ __GFP_NOMEMALLOC |
+ __GFP_NOWARN);
+ if (max_pages <= WB_LIST_INLINE || !wb->wc_list) {
wb->wc_list = wb->wc_list_inline;
max_pages = WB_LIST_INLINE;
}
--
2.17.0
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] dm: writecache: Use 2-factor allocator arguments
2018-06-18 17:50 [PATCH] dm: writecache: Use 2-factor allocator arguments Kees Cook
@ 2018-06-18 21:12 ` Mikulas Patocka
2018-06-18 22:10 ` Kees Cook
2018-06-27 21:48 ` Kees Cook
1 sibling, 1 reply; 6+ messages in thread
From: Mikulas Patocka @ 2018-06-18 21:12 UTC (permalink / raw)
To: Kees Cook
Cc: linux-kernel, dm-devel, Dan Williams, Mike Snitzer, Alasdair Kergon
On Mon, 18 Jun 2018, Kees Cook wrote:
> This adjusts the allocator calls to use the 2-factor argument style, as
> already done treewide for better defense against allocator overflows.
> Additionally adjusts style nit to avoid assignments in test expressions.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/md/dm-writecache.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
> index 5961c7794ef3..7773f4c75701 100644
> --- a/drivers/md/dm-writecache.c
> +++ b/drivers/md/dm-writecache.c
> @@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
> if (da != p) {
> long i;
> wc->memory_map = NULL;
> - pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);
> + pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
> if (!pages) {
> r = -ENOMEM;
> goto err2;
> @@ -859,7 +859,8 @@ static int writecache_alloc_entries(struct dm_writecache *wc)
>
> if (wc->entries)
> return 0;
> - wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);
> + wc->entries = vmalloc(array_size(sizeof(struct wc_entry),
> + wc->n_blocks));
> if (!wc->entries)
> return -ENOMEM;
> for (b = 0; b < wc->n_blocks; b++) {
> @@ -1480,10 +1481,13 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
> bio_set_dev(&wb->bio, wc->dev->bdev);
> wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
> wb->page_offset = PAGE_SIZE;
> - if (max_pages <= WB_LIST_INLINE ||
> - unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),
> - GFP_NOIO | __GFP_NORETRY |
> - __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
> + if (max_pages > WB_LIST_INLINE)
> + wb->wc_list = kmalloc_array(max_pages,
> + sizeof(struct wc_entry *),
> + GFP_NOIO | __GFP_NORETRY |
> + __GFP_NOMEMALLOC |
> + __GFP_NOWARN);
> + if (max_pages <= WB_LIST_INLINE || !wb->wc_list) {
The rest of patch is OK - but you shouldn't duplicate the comparison
against WB_LIST_INLINE.
Mikulas
> wb->wc_list = wb->wc_list_inline;
> max_pages = WB_LIST_INLINE;
> }
> --
> 2.17.0
>
>
> --
> Kees Cook
> Pixel Security
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dm: writecache: Use 2-factor allocator arguments
2018-06-18 21:12 ` Mikulas Patocka
@ 2018-06-18 22:10 ` Kees Cook
0 siblings, 0 replies; 6+ messages in thread
From: Kees Cook @ 2018-06-18 22:10 UTC (permalink / raw)
To: Mikulas Patocka
Cc: LKML, dm-devel, Dan Williams, Mike Snitzer, Alasdair Kergon
On Mon, Jun 18, 2018 at 2:12 PM, Mikulas Patocka <mpatocka@redhat.com> wrote:
>
>
> On Mon, 18 Jun 2018, Kees Cook wrote:
>
>> This adjusts the allocator calls to use the 2-factor argument style, as
>> already done treewide for better defense against allocator overflows.
>> Additionally adjusts style nit to avoid assignments in test expressions.
>>
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> ---
>> drivers/md/dm-writecache.c | 16 ++++++++++------
>> 1 file changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
>> index 5961c7794ef3..7773f4c75701 100644
>> --- a/drivers/md/dm-writecache.c
>> +++ b/drivers/md/dm-writecache.c
>> @@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
>> if (da != p) {
>> long i;
>> wc->memory_map = NULL;
>> - pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);
>> + pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
>> if (!pages) {
>> r = -ENOMEM;
>> goto err2;
>> @@ -859,7 +859,8 @@ static int writecache_alloc_entries(struct dm_writecache *wc)
>>
>> if (wc->entries)
>> return 0;
>> - wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);
>> + wc->entries = vmalloc(array_size(sizeof(struct wc_entry),
>> + wc->n_blocks));
>> if (!wc->entries)
>> return -ENOMEM;
>> for (b = 0; b < wc->n_blocks; b++) {
>> @@ -1480,10 +1481,13 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
>> bio_set_dev(&wb->bio, wc->dev->bdev);
>> wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
>> wb->page_offset = PAGE_SIZE;
>> - if (max_pages <= WB_LIST_INLINE ||
>> - unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),
>> - GFP_NOIO | __GFP_NORETRY |
>> - __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
>> + if (max_pages > WB_LIST_INLINE)
>> + wb->wc_list = kmalloc_array(max_pages,
>> + sizeof(struct wc_entry *),
>> + GFP_NOIO | __GFP_NORETRY |
>> + __GFP_NOMEMALLOC |
>> + __GFP_NOWARN);
>> + if (max_pages <= WB_LIST_INLINE || !wb->wc_list) {
>
> The rest of patch is OK - but you shouldn't duplicate the comparison
> against WB_LIST_INLINE.
I couldn't find a better way to avoid an assignment in a test... open
to suggestions! :)
-Kees
--
Kees Cook
Pixel Security
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dm: writecache: Use 2-factor allocator arguments
2018-06-18 17:50 [PATCH] dm: writecache: Use 2-factor allocator arguments Kees Cook
2018-06-18 21:12 ` Mikulas Patocka
@ 2018-06-27 21:48 ` Kees Cook
2018-06-27 21:52 ` Mike Snitzer
1 sibling, 1 reply; 6+ messages in thread
From: Kees Cook @ 2018-06-27 21:48 UTC (permalink / raw)
To: Mikulas Patocka
Cc: LKML, dm-devel, Dan Williams, Mike Snitzer, Alasdair Kergon
On Mon, Jun 18, 2018 at 10:50 AM, Kees Cook <keescook@chromium.org> wrote:
> This adjusts the allocator calls to use the 2-factor argument style, as
> already done treewide for better defense against allocator overflows.
> Additionally adjusts style nit to avoid assignments in test expressions.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Friendly ping -- I'd like to make sure this makes it into 4.18. All
other 2-factor allocations have been fixed in the kernel.
-Kees
> ---
> drivers/md/dm-writecache.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
> index 5961c7794ef3..7773f4c75701 100644
> --- a/drivers/md/dm-writecache.c
> +++ b/drivers/md/dm-writecache.c
> @@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
> if (da != p) {
> long i;
> wc->memory_map = NULL;
> - pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);
> + pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
> if (!pages) {
> r = -ENOMEM;
> goto err2;
> @@ -859,7 +859,8 @@ static int writecache_alloc_entries(struct dm_writecache *wc)
>
> if (wc->entries)
> return 0;
> - wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);
> + wc->entries = vmalloc(array_size(sizeof(struct wc_entry),
> + wc->n_blocks));
> if (!wc->entries)
> return -ENOMEM;
> for (b = 0; b < wc->n_blocks; b++) {
> @@ -1480,10 +1481,13 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
> bio_set_dev(&wb->bio, wc->dev->bdev);
> wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
> wb->page_offset = PAGE_SIZE;
> - if (max_pages <= WB_LIST_INLINE ||
> - unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),
> - GFP_NOIO | __GFP_NORETRY |
> - __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
> + if (max_pages > WB_LIST_INLINE)
> + wb->wc_list = kmalloc_array(max_pages,
> + sizeof(struct wc_entry *),
> + GFP_NOIO | __GFP_NORETRY |
> + __GFP_NOMEMALLOC |
> + __GFP_NOWARN);
> + if (max_pages <= WB_LIST_INLINE || !wb->wc_list) {
> wb->wc_list = wb->wc_list_inline;
> max_pages = WB_LIST_INLINE;
> }
> --
> 2.17.0
>
>
> --
> Kees Cook
> Pixel Security
--
Kees Cook
Pixel Security
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: dm: writecache: Use 2-factor allocator arguments
2018-06-27 21:48 ` Kees Cook
@ 2018-06-27 21:52 ` Mike Snitzer
2018-06-27 21:53 ` Kees Cook
0 siblings, 1 reply; 6+ messages in thread
From: Mike Snitzer @ 2018-06-27 21:52 UTC (permalink / raw)
To: Kees Cook; +Cc: Mikulas Patocka, LKML, dm-devel, Dan Williams, Alasdair Kergon
On Wed, Jun 27 2018 at 5:48pm -0400,
Kees Cook <keescook@chromium.org> wrote:
> On Mon, Jun 18, 2018 at 10:50 AM, Kees Cook <keescook@chromium.org> wrote:
> > This adjusts the allocator calls to use the 2-factor argument style, as
> > already done treewide for better defense against allocator overflows.
> > Additionally adjusts style nit to avoid assignments in test expressions.
> >
> > Signed-off-by: Kees Cook <keescook@chromium.org>
>
> Friendly ping -- I'd like to make sure this makes it into 4.18. All
> other 2-factor allocations have been fixed in the kernel.
Yeap, I'll be sending it to Linus this week. Already staged and ready
to go, please see:
https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-4.18&id=50a7d3ba7c9ac5e0b7e03fc7f420180989361dbf
Thanks,
Mike
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: dm: writecache: Use 2-factor allocator arguments
2018-06-27 21:52 ` Mike Snitzer
@ 2018-06-27 21:53 ` Kees Cook
0 siblings, 0 replies; 6+ messages in thread
From: Kees Cook @ 2018-06-27 21:53 UTC (permalink / raw)
To: Mike Snitzer
Cc: Mikulas Patocka, LKML, dm-devel, Dan Williams, Alasdair Kergon
On Wed, Jun 27, 2018 at 2:52 PM, Mike Snitzer <snitzer@redhat.com> wrote:
> On Wed, Jun 27 2018 at 5:48pm -0400,
> Kees Cook <keescook@chromium.org> wrote:
>
>> On Mon, Jun 18, 2018 at 10:50 AM, Kees Cook <keescook@chromium.org> wrote:
>> > This adjusts the allocator calls to use the 2-factor argument style, as
>> > already done treewide for better defense against allocator overflows.
>> > Additionally adjusts style nit to avoid assignments in test expressions.
>> >
>> > Signed-off-by: Kees Cook <keescook@chromium.org>
>>
>> Friendly ping -- I'd like to make sure this makes it into 4.18. All
>> other 2-factor allocations have been fixed in the kernel.
>
> Yeap, I'll be sending it to Linus this week. Already staged and ready
> to go, please see:
> https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-4.18&id=50a7d3ba7c9ac5e0b7e03fc7f420180989361dbf
Ah! Thank you very much! :)
-Kees
--
Kees Cook
Pixel Security
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-27 21:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-18 17:50 [PATCH] dm: writecache: Use 2-factor allocator arguments Kees Cook
2018-06-18 21:12 ` Mikulas Patocka
2018-06-18 22:10 ` Kees Cook
2018-06-27 21:48 ` Kees Cook
2018-06-27 21:52 ` Mike Snitzer
2018-06-27 21:53 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).