projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed0df61
)
btrfs: Call kunmap if zlib_inflateInit2 fails
author
Nick Terrell
<nickrterrell@gmail.com>
Wed, 2 Nov 2016 03:25:27 +0000
(20:25 -0700)
committer
David Sterba
<dsterba@suse.com>
Wed, 30 Nov 2016 12:45:18 +0000
(13:45 +0100)
If zlib_inflateInit2 fails, the input page is never unmapped.
Add a call to kunmap when it fails.
Signed-off-by: Nick Terrell <nickrterrell@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/zlib.c
patch
|
blob
|
blame
|
history
diff --git
a/fs/btrfs/zlib.c
b/fs/btrfs/zlib.c
index 441b81a3e54568d5e93db4be02f0e8fdec58dcb7..0ed90ccd81eb1ab73bde7fda2788bd3f542f64ab 100644
(file)
--- a/
fs/btrfs/zlib.c
+++ b/
fs/btrfs/zlib.c
@@
-250,6
+250,7
@@
static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in,
if (Z_OK != zlib_inflateInit2(&workspace->strm, wbits)) {
pr_warn("BTRFS: inflateInit failed\n");
+ kunmap(pages_in[page_in_index]);
return -EIO;
}
while (workspace->strm.total_in < srclen) {