Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4faaecb authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ce768ea

lib/zlib_inflate/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 


obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o



zlib_inflate-objs := inffast.o inflate.o \

zlib_inflate-objs := inffast.o inflate.o infutil.o \

		     inftrees.o inflate_syms.o

lib/zlib_inflate/inflate.c

+0 −47
Original line number Diff line number Diff line
@@ -916,50 +916,3 @@ int zlib_inflateIncomp(z_stream *z) 


    return Z_OK;

}
 


#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



/* Utility function: initialize zlib, unpack binary blob, clean up zlib,

 * return len or negative error code. */

int zlib_inflate_blob(void *gunzip_buf, unsigned sz, const void *buf, unsigned len)

{

	const u8 *zbuf = buf;

	struct z_stream_s *strm;

	int rc;



	rc = -ENOMEM;

	strm = kmalloc(sizeof(*strm), GFP_KERNEL);

	if (strm == NULL)

		goto gunzip_nomem1;

	strm->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);

	if (strm->workspace == NULL)

		goto gunzip_nomem2;



	/* gzip header (1f,8b,08... 10 bytes total + possible asciz filename)

	 * expected to be stripped from input */



	strm->next_in = zbuf;

	strm->avail_in = len;

	strm->next_out = gunzip_buf;

	strm->avail_out = sz;



	rc = zlib_inflateInit2(strm, -MAX_WBITS);

	if (rc == Z_OK) {

		rc = zlib_inflate(strm, Z_FINISH);

		/* after Z_FINISH, only Z_STREAM_END is "we unpacked it all" */

		if (rc == Z_STREAM_END)

			rc = sz - strm->avail_out;

		else

			rc = -EINVAL;

		zlib_inflateEnd(strm);

	} else

		rc = -EINVAL;



	kfree(strm->workspace);

gunzip_nomem2:

	kfree(strm);

gunzip_nomem1:

	return rc; /* returns Z_OK (0) if successful */

}

lib/zlib_inflate/infutil.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
#include <linux/zutil.h>

#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



/* Utility function: initialize zlib, unpack binary blob, clean up zlib,

 * return len or negative error code.

 */

int zlib_inflate_blob(void *gunzip_buf, unsigned int sz,

		      const void *buf, unsigned int len)

{

	const u8 *zbuf = buf;

	struct z_stream_s *strm;

	int rc;



	rc = -ENOMEM;

	strm = kmalloc(sizeof(*strm), GFP_KERNEL);

	if (strm == NULL)

		goto gunzip_nomem1;

	strm->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);

	if (strm->workspace == NULL)

		goto gunzip_nomem2;



	/* gzip header (1f,8b,08... 10 bytes total + possible asciz filename)

	 * expected to be stripped from input

	 */

	strm->next_in = zbuf;

	strm->avail_in = len;

	strm->next_out = gunzip_buf;

	strm->avail_out = sz;



	rc = zlib_inflateInit2(strm, -MAX_WBITS);

	if (rc == Z_OK) {

		rc = zlib_inflate(strm, Z_FINISH);

		/* after Z_FINISH, only Z_STREAM_END is "we unpacked it all" */

		if (rc == Z_STREAM_END)

			rc = sz - strm->avail_out;

		else

			rc = -EINVAL;

		zlib_inflateEnd(strm);

	} else

		rc = -EINVAL;



	kfree(strm->workspace);

gunzip_nomem2:

	kfree(strm);

gunzip_nomem1:

	return rc; /* returns Z_OK (0) if successful */

}