Re: JFFS2 using 'private' zlib header (was [RFC] LZO de/compression support - take 6)

[Mark Adler]

On May 30, 2007, at 6:30 AM, Satyam Sharma wrote:
> [1] For your reference, here is the user code in question:
...
>        if (srclen > 2 && !(data_in[1] & PRESET_DICT) &&
> 	    ((data_in[0] & 0x0f) == Z_DEFLATED) &&
> 	    !(((data_in[0]<<8) + data_in[1]) % 31)) {

The funny thing here is that the author felt compelled to use a  
#defined constant for the dictionary bit (PRESET_DICT), but had no  
problem with a numeric constant to isolate the compression method  
(0x0f), or for that matter extracting the window bits from the  
header.  The easy way to avoid the use of an internal zlib header  
file here is to simply replace PRESET_DICT with 0x20.  That constant  
will never change -- it is part of the definition of the zlib header  
in RFC 1950.

The slightly more involved patch to avoid the problem is to let  
inflate() do all that work for you, including the integrity check on  
the zlib header (% 31).  Also this corrects an error in the original  
code, which is that it continues to try to decompress after finding  
that a dictionary is needed or that the zlib header is invalid.  In  
this version, a bad header simply returns an error:

    /* provide input data and output space */
    inf_strm.next_in = data_in;
    inf_strm.avail_in = srclen;
    inf_strm.next_out = cpage_out;
    inf_strm.avail_out = destlen;

    /* verify and skip zlib header (this updates next_in and  
avail_in) */
    inf_strm.zalloc = Z_NULL;
    inf_strm.zfree = Z_NULL;
    inf_strm.opaque = Z_NULL;
    if (zlib_inflateInit(&inf_strm) != Z_OK) {
        printk(KERN_WARNING "inflateInit failed\n");
        return 1;
    }
    ret = zlib_inflate(&inf_strm, Z_BLOCK);
    if (ret != Z_OK || (inf_strm.data_type & 0x80) == 0) {
        printk(KERN_WARNING "inflate failed on zlib header\n");
        return 1;
    }
    zlib_inflateEnd(&inf_strm);

    /* do raw inflate (no adler32) on deflate data after zlib header */
    inf_strm.zalloc = Z_NULL;
    inf_strm.zfree = Z_NULL;
    inf_strm.opaque = Z_NULL;
    if (zlib_inflateInit2(&inf_strm, -MAX_WBITS) != Z_OK) {
        printk(KERN_WARNING "inflateInit failed\n");
        return 1;
    }
    while ((ret = zlib_inflate ...

Mark

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/