diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-12 01:15:08 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-12 01:17:20 -0400 |
commit | d4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb (patch) | |
tree | 20ce6e4991c0dc3b0701fbb0b37819f19d3e9d00 /lib/zlib_inflate/infutil.c | |
parent | 9ce768ead83216d394175c0a0d72bc527648c7d0 (diff) |
[ZLIB]: Fix external builds of zlib_inflate code.
Move zlib_inflate_blob() out into it's own source file,
infutil.c, so that things like the powerpc zImage builder
in arch/powerpc/boot/Makefile don't end up trying to
compile it.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/zlib_inflate/infutil.c')
-rw-r--r-- | lib/zlib_inflate/infutil.c | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/lib/zlib_inflate/infutil.c b/lib/zlib_inflate/infutil.c new file mode 100644 index 000000000000..4824c2cc7a09 --- /dev/null +++ b/lib/zlib_inflate/infutil.c | |||
@@ -0,0 +1,49 @@ | |||
1 | #include <linux/zutil.h> | ||
2 | #include <linux/errno.h> | ||
3 | #include <linux/slab.h> | ||
4 | #include <linux/vmalloc.h> | ||
5 | |||
6 | /* Utility function: initialize zlib, unpack binary blob, clean up zlib, | ||
7 | * return len or negative error code. | ||
8 | */ | ||
9 | int zlib_inflate_blob(void *gunzip_buf, unsigned int sz, | ||
10 | const void *buf, unsigned int len) | ||
11 | { | ||
12 | const u8 *zbuf = buf; | ||
13 | struct z_stream_s *strm; | ||
14 | int rc; | ||
15 | |||
16 | rc = -ENOMEM; | ||
17 | strm = kmalloc(sizeof(*strm), GFP_KERNEL); | ||
18 | if (strm == NULL) | ||
19 | goto gunzip_nomem1; | ||
20 | strm->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL); | ||
21 | if (strm->workspace == NULL) | ||
22 | goto gunzip_nomem2; | ||
23 | |||
24 | /* gzip header (1f,8b,08... 10 bytes total + possible asciz filename) | ||
25 | * expected to be stripped from input | ||
26 | */ | ||
27 | strm->next_in = zbuf; | ||
28 | strm->avail_in = len; | ||
29 | strm->next_out = gunzip_buf; | ||
30 | strm->avail_out = sz; | ||
31 | |||
32 | rc = zlib_inflateInit2(strm, -MAX_WBITS); | ||
33 | if (rc == Z_OK) { | ||
34 | rc = zlib_inflate(strm, Z_FINISH); | ||
35 | /* after Z_FINISH, only Z_STREAM_END is "we unpacked it all" */ | ||
36 | if (rc == Z_STREAM_END) | ||
37 | rc = sz - strm->avail_out; | ||
38 | else | ||
39 | rc = -EINVAL; | ||
40 | zlib_inflateEnd(strm); | ||
41 | } else | ||
42 | rc = -EINVAL; | ||
43 | |||
44 | kfree(strm->workspace); | ||
45 | gunzip_nomem2: | ||
46 | kfree(strm); | ||
47 | gunzip_nomem1: | ||
48 | return rc; /* returns Z_OK (0) if successful */ | ||
49 | } | ||