diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-09-23 13:32:13 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-09-23 13:32:13 +0000 |
| commit | 727e5a8d67fc07cccef843aa8f698fbe0efb7315 (patch) | |
| tree | a77f21c8e298808e9aa4b33121d07d67dd9709ae | |
| parent | 8b19e0a2e544762b545f2b31792ff14f91fb7033 (diff) | |
| download | upstream-727e5a8d67fc07cccef843aa8f698fbe0efb7315.tar.gz upstream-727e5a8d67fc07cccef843aa8f698fbe0efb7315.tar.bz2 upstream-727e5a8d67fc07cccef843aa8f698fbe0efb7315.zip | |
merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17686 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/053-squashfs_lzma.patch | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/053-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.31/053-squashfs_lzma.patch index c07239bb2d..2725f06699 100644 --- a/target/linux/generic-2.6/patches-2.6.31/053-squashfs_lzma.patch +++ b/target/linux/generic-2.6/patches-2.6.31/053-squashfs_lzma.patch @@ -47,7 +47,7 @@ __le32 s_magic; --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c -@@ -48,13 +48,65 @@ +@@ -48,13 +48,76 @@ #include "squashfs.h" @@ -81,7 +81,7 @@ + crypto_free_pcomp(msblk->tfm); + } +#endif - ++ + return err; +} + @@ -90,6 +90,17 @@ + int err = -EOPNOTSUPP; + +#ifdef CONFIG_SQUASHFS_SUPPORT_LZMA ++ struct { ++ struct nlattr nla; ++ int val; ++ } params = { ++ .nla = { ++ .nla_len = nla_attr_size(sizeof(int)), ++ .nla_type = UNLZMA_DECOMP_OUT_BUFFERS, ++ }, ++ .val = (msblk->block_size / PAGE_CACHE_SIZE) + 1 ++ }; + + msblk->tfm = crypto_alloc_pcomp("lzma", 0, + CRYPTO_ALG_ASYNC); + if (IS_ERR(msblk->tfm)) { @@ -97,7 +108,7 @@ + return PTR_ERR(msblk->tfm); + } + -+ err = crypto_decompress_setup(msblk->tfm, NULL, 0); ++ err = crypto_decompress_setup(msblk->tfm, ¶ms, sizeof(params)); + if (err) { + ERROR("Failed to set up decompression parameters\n"); + crypto_free_pcomp(msblk->tfm); @@ -115,7 +126,7 @@ { if (major < SQUASHFS_MAJOR) { ERROR("Major/Minor mismatch, older Squashfs %d.%d " -@@ -67,9 +119,6 @@ static int supported_squashfs_filesystem +@@ -67,9 +130,6 @@ static int supported_squashfs_filesystem return -EINVAL; } @@ -125,7 +136,7 @@ return 0; } -@@ -84,16 +133,6 @@ static int squashfs_fill_super(struct su +@@ -84,16 +144,6 @@ static int squashfs_fill_super(struct su unsigned short flags; unsigned int fragments; u64 lookup_table_start; @@ -142,7 +153,7 @@ int err; TRACE("Entered squashfs_fill_superblock\n"); -@@ -105,21 +144,6 @@ static int squashfs_fill_super(struct su +@@ -105,21 +155,6 @@ static int squashfs_fill_super(struct su } msblk = sb->s_fs_info; @@ -164,8 +175,15 @@ sblk = kzalloc(sizeof(*sblk), GFP_KERNEL); if (sblk == NULL) { ERROR("Failed to allocate squashfs_super_block\n"); -@@ -159,8 +183,21 @@ static int squashfs_fill_super(struct su +@@ -157,10 +192,28 @@ static int squashfs_fill_super(struct su + goto failed_mount; + } ++ /* Check block size for sanity */ ++ msblk->block_size = le32_to_cpu(sblk->block_size); ++ if (msblk->block_size > SQUASHFS_FILE_MAX_SIZE) ++ goto failed_mount; ++ /* Check the MAJOR & MINOR versions and compression type */ err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major), - le16_to_cpu(sblk->s_minor), @@ -188,7 +206,19 @@ if (err < 0) goto failed_mount; -@@ -316,21 +353,16 @@ allocate_root: +@@ -180,11 +233,6 @@ static int squashfs_fill_super(struct su + i_size_read(sb->s_bdev->bd_inode)) + goto failed_mount; + +- /* Check block size for sanity */ +- msblk->block_size = le32_to_cpu(sblk->block_size); +- if (msblk->block_size > SQUASHFS_FILE_MAX_SIZE) +- goto failed_mount; +- + /* + * Check the system page size is not larger than the filesystem + * block size (by default 128K). This is currently not supported. +@@ -316,21 +364,16 @@ allocate_root: return 0; failed_mount: |