Merge tag 'pm-5.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / fs / squashfs / lzo_wrapper.c

diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c
index cb510a6..d216aee 100644 (file)
--- a/fs/squashfs/lzo_wrapper.c
+++ b/fs/squashfs/lzo_wrapper.c
@@ -93,10 +93,12 @@ static int lzo_uncompress(struct squashfs_sb_info *msblk, void *strm,
        buff = stream->output;
        while (data) {
                if (bytes <= PAGE_SIZE) {
-                       memcpy(data, buff, bytes);
+                       if (!IS_ERR(data))
+                               memcpy(data, buff, bytes);
                        break;
                } else {
-                       memcpy(data, buff, PAGE_SIZE);
+                       if (!IS_ERR(data))
+                               memcpy(data, buff, PAGE_SIZE);
                        buff += PAGE_SIZE;
                        bytes -= PAGE_SIZE;
                        data = squashfs_next_page(output);
@@ -116,5 +118,6 @@ const struct squashfs_decompressor squashfs_lzo_comp_ops = {
        .decompress = lzo_uncompress,
        .id = LZO_COMPRESSION,
        .name = "lzo",
+       .alloc_buffer = 0,
        .supported = 1
 };