isofs compress: Remove VLA usage
PATCH v2 1/1 isofs compress: Remove VLA usage
As part of the effort to remove VLAs from the kernel[1], this changes the allocation of the bhs and pages arrays from being on the stack to being kcalloc()ed. This also allows for the removal of the explicit zeroing of bhs.
https://lkml.org/lkml/2018/3/7/621
--- fs/isofs/compress.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
fs/isofs/compress.c +12 -3
@@ -20,6 +20,7 @@#include <linux/init.h> #include <linux/bio.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/zlib.h>
@@ -59,7 +60,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, >> bufshift;int haveblocks;blkcnt_t blocknum; -struct buffer_head *bhs[needblocks +1 ]; +struct buffer_head **bhs;int curbh, curpage;if (block_size >deflateBound (1UL << zisofs_block_shift)) {
@@ -80,7 +81,9 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,/* Because zlib is not thread-safe, do all the I/O at the top. */ blocknum = block_start >> bufshift; -memset (bhs,0 , (needblocks +1 ) *sizeof (struct buffer_head *)); + bhs =kcalloc (needblocks +1 ,sizeof (*bhs),GFP_KERNEL ); +if (!bhs) +return -ENOMEM ; haveblocks =isofs_get_blocks (inode, blocknum, bhs, needblocks);ll_rw_block (REQ_OP_READ ,0 , haveblocks, bhs);
@@ -190,6 +193,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, b_eio:for (i =0 ; i < haveblocks; i++)brelse (bhs[i]); +kfree (bhs);return stream.total_out; }
@@ -305,7 +309,7 @@ static int zisofs_readpage(struct file *file, struct page *page)unsigned int zisofs_pages_per_cblock =PAGE_SHIFT <= zisofs_block_shift ? (1 << (zisofs_block_shift -PAGE_SHIFT )) :0 ; -struct page *pages[max_t (unsigned, zisofs_pages_per_cblock,1 )]; +struct page **pages;pgoff_t index = page->index, end_index; end_index = (inode->i_size +PAGE_SIZE -1 ) >>PAGE_SHIFT ;
@@ -330,6 +334,10 @@ static int zisofs_readpage(struct file *file, struct page *page) full_page =0 ; pcount =1 ; } + pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1), +sizeof (*pages),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; pages[full_page] = page;for (i =0 ; i < pcount; i++, index++) {
@@ -357,6 +365,7 @@ static int zisofs_readpage(struct file *file, struct page *page) }/* At this point, err contains 0 or -EIO depending on the "critical" page */ +kfree (pages);return err; }
Signature · 1 line
2.17.0.484.g0c8726318c-goog
Quoted 8 lines · Kyle Spiers
As part of the effort to remove VLAs from the kernel[1], this changes the allocation of the bhs and pages arrays from being on the stack to being kcalloc()ed. This also allows for the removal of the explicit zeroing of bhs.
https://lkml.org/lkml/2018/3/7/621
Signed-off-by Kyle Spiers <[email protected]>
Looks good! Thanks for fixing the sparc64 build failure. :)
-Kees
Quoted 75 lines
--- fs/isofs/compress.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)fs/isofs/compress.c +12
-4@@ -20,6 +20,7 @@#include <linux/init.h> #include <linux/bio.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/zlib.h> @@ -59,7 +60,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, >> bufshift;int haveblocks;blkcnt_t blocknum; -struct buffer_head *bhs[needblocks +1 ]; +struct buffer_head **bhs;int curbh, curpage;if (block_size >deflateBound (1UL << zisofs_block_shift)) {@@ -80,7 +81,9 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,/* Because zlib is not thread-safe, do all the I/O at the top. */ blocknum = block_start >> bufshift; -memset (bhs,0 , (needblocks +1 ) *sizeof (struct buffer_head *)); + bhs =kcalloc (needblocks +1 ,sizeof (*bhs),GFP_KERNEL ); +if (!bhs) +return -ENOMEM ; haveblocks =isofs_get_blocks (inode, blocknum, bhs, needblocks);ll_rw_block (REQ_OP_READ ,0 , haveblocks, bhs);@@ -190,6 +193,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, b_eio:for (i =0 ; i < haveblocks; i++)brelse (bhs[i]); +kfree (bhs);return stream.total_out; }@@ -305,7 +309,7 @@ static int zisofs_readpage(struct file *file, struct page *page)unsigned int zisofs_pages_per_cblock =PAGE_SHIFT <= zisofs_block_shift ? (1 << (zisofs_block_shift -PAGE_SHIFT )) :0 ; -struct page *pages[max_t (unsigned, zisofs_pages_per_cblock,1 )]; +struct page **pages;pgoff_t index = page->index, end_index; end_index = (inode->i_size +PAGE_SIZE -1 ) >>PAGE_SHIFT ;@@ -330,6 +334,10 @@ static int zisofs_readpage(struct file *file, struct page *page) full_page =0 ; pcount =1 ; } + pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1), +sizeof (*pages),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; pages[full_page] = page;for (i =0 ; i < pcount; i++, index++) {@@ -357,6 +365,7 @@ static int zisofs_readpage(struct file *file, struct page *page) }/* At this point, err contains 0 or -EIO depending on the "critical" page */ +kfree (pages);return err; } --2.17.0.484.g0c8726318c-goog
Signature · 2 lines
Kees Cook Pixel Security
Quoted 34 lines · Kyle Spiers
As part of the effort to remove VLAs from the kernel[1], this changes the allocation of the bhs and pages arrays from being on the stack to being kcalloc()ed. This also allows for the removal of the explicit zeroing of bhs.
https://lkml.org/lkml/2018/3/7/621
Signed-off-by Kyle Spiers <[email protected]>--- fs/isofs/compress.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)fs/isofs/compress.c +2
-1@@ -20,6 +20,7 @@#include <linux/init.h> #include <linux/bio.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/zlib.h> @@ -59,7 +60,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, >> bufshift;int haveblocks;blkcnt_t blocknum; -struct buffer_head *bhs[needblocks +1 ]; +struct buffer_head **bhs;int curbh, curpage;if (block_size >deflateBound (1UL << zisofs_block_shift)) {
fs/isofs/compress.c static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, · line 86
Quoted 7 lines
fs/isofs/compress.c +3
-1@@ -80,7 +81,9 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,/* Because zlib is not thread-safe, do all the I/O at the top. */ blocknum = block_start >> bufshift; -memset (bhs,0 , (needblocks +1 ) *sizeof (struct buffer_head *)); + bhs =kcalloc (needblocks +1 ,sizeof (*bhs),GFP_KERNEL ); +if (!bhs) +return -ENOMEM ;
This direct return appears incorrect.
It seems it should be:
if (!bhs) {
*errp = -ENOMEM;
return 0;
}Jan Kara
maintainerQuoted 8 lines · Kyle Spiers
As part of the effort to remove VLAs from the kernel[1], this changes the allocation of the bhs and pages arrays from being on the stack to being kcalloc()ed. This also allows for the removal of the explicit zeroing of bhs.
https://lkml.org/lkml/2018/3/7/621
Signed-off-by Kyle Spiers <[email protected]>
This is a good cleanup but the error recovery is hosed. See below...
Quoted 26 lines
--- fs/isofs/compress.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)fs/isofs/compress.c +2
-1@@ -20,6 +20,7 @@#include <linux/init.h> #include <linux/bio.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/zlib.h> @@ -59,7 +60,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, >> bufshift;int haveblocks;blkcnt_t blocknum; -struct buffer_head *bhs[needblocks +1 ]; +struct buffer_head **bhs;int curbh, curpage;if (block_size >deflateBound (1UL << zisofs_block_shift)) {
fs/isofs/compress.c static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, · line 86
Quoted 7 lines
fs/isofs/compress.c +3
-1@@ -80,7 +81,9 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,/* Because zlib is not thread-safe, do all the I/O at the top. */ blocknum = block_start >> bufshift; -memset (bhs,0 , (needblocks +1 ) *sizeof (struct buffer_head *)); + bhs =kcalloc (needblocks +1 ,sizeof (*bhs),GFP_KERNEL ); +if (!bhs) +return -ENOMEM ;
As Joe pointed out this needs to be:
if (!bhs) {
*errp = -ENOMEM;
return 0;
}fs/isofs/compress.c static int zisofs_readpage(struct file *file, struct page *page) · line 340
Quoted 8 lines
fs/isofs/compress.c +4
-0@@ -330,6 +334,10 @@ static int zisofs_readpage(struct file *file, struct page *page) full_page =0 ; pcount =1 ; } + pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1), +sizeof (*pages),GFP_KERNEL ); +if (!pages) +return -ENOMEM ;
And this is wrong as well. You need to do:
if (!pages) {
unlock_page(page);
return -ENOMEM;
}
HonzaSignature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR