[PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself

[PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself

[WHR]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

In order to prevent crashing due to infinite recursion and actually
decompress the requested data, call the zlib function 'uncompress'
instead.

Signed-off-by: WHR <msl0000023508@gmail.com>

---
v2:
Resubmit with diff content in plain text.


[-- Attachment #2: 0001-zfs-fix-function-zlib_decompress-pointlessly-calling --]
[-- Type: text/plain, Size: 564 bytes --]

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index bfc11fa667..4896cc18ef 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -17,6 +17,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <u-boot/zlib.h>
 #include "zfs_common.h"
 #include "div64.h"
 
@@ -183,7 +184,8 @@ static int
 zlib_decompress(void *s, void *d,
 				uint32_t slen, uint32_t dlen)
 {
-	if (zlib_decompress(s, d, slen, dlen) < 0)
+	uLongf z_dest_len = dlen;
+	if (uncompress(d, &z_dest_len, s, slen) != Z_OK)
 		return ZFS_ERR_BAD_FS;
 	return ZFS_ERR_NONE;
 }

Re: [PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On Wed, May 01, 2024 at 12:40:38AM +0800, WHR wrote:

> In order to prevent crashing due to infinite recursion and actually
> decompress the requested data, call the zlib function 'uncompress'
> instead.
> 
> Signed-off-by: WHR <msl0000023508@gmail.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself

[whr]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

To prevent crashing due infinite recursion and actually decompress the
requested data, call the zlib function 'uncompress' instead.

Signed-off-by: WHR <msl0000023508@gmail.com>

[-- Attachment #2: 0001-zfs-fix-function-zlib_decompress-pointlessly-calling --]
[-- Type: /, Size: 565 bytes --]

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index bfc11fa667..4896cc18ef 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -17,6 +17,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <u-boot/zlib.h>
 #include "zfs_common.h"
 #include "div64.h"
 
@@ -183,7 +184,8 @@ static int
 zlib_decompress(void *s, void *d,
 				uint32_t slen, uint32_t dlen)
 {
-	if (zlib_decompress(s, d, slen, dlen) < 0)
+	uLongf z_dest_len = dlen;
+	if (uncompress(d, &z_dest_len, s, slen) != Z_OK)
 		return ZFS_ERR_BAD_FS;
 	return ZFS_ERR_NONE;
 }