lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: correct error-handling zlib error handling

Browse Source 
find_zlib_workspace returns an ERR_PTR value in an error case instead of NULL.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@

x = find_zlib_workspace(...)
... when != x = E
(
*  if (x == NULL || ...) S1 else S2
|
*  if (x == NULL && ...) S1 else S2
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Julia Lawall
2009-08-07 13:51:33 -04:00
committed by Chris Mason
parent 4baf8c9201
commit 60f2e8f8a0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/zlib.c
View File

@@ -208,7 +208,7 @@ int btrfs_zlib_compress_pages(struct address_space *mapping,
*total_in = 0; *total_in = 0;
workspace = find_zlib_workspace(); workspace = find_zlib_workspace();
if (!workspace) if (IS_ERR(workspace))
return -1; return -1;
if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) { if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) {
@@ -366,7 +366,7 @@ int btrfs_zlib_decompress_biovec(struct page **pages_in,
char *kaddr; char *kaddr;
workspace = find_zlib_workspace(); workspace = find_zlib_workspace();
if (!workspace) if (IS_ERR(workspace))
return -ENOMEM; return -ENOMEM;
data_in = kmap(pages_in[page_in_index]); data_in = kmap(pages_in[page_in_index]);
@@ -547,7 +547,7 @@ int btrfs_zlib_decompress(unsigned char *data_in,
return -ENOMEM; return -ENOMEM;
workspace = find_zlib_workspace(); workspace = find_zlib_workspace();
if (!workspace) if (IS_ERR(workspace))
return -ENOMEM; return -ENOMEM;
workspace->inf_strm.next_in = data_in; workspace->inf_strm.next_in = data_in;