1. 25 Sep, 2011 2 commits
  2. 23 Sep, 2011 26 commits
  3. 22 Sep, 2011 9 commits
  4. 21 Sep, 2011 3 commits
    • Linus Torvalds's avatar
      Linux 3.1-rc7 · d93dc5c4
      Linus Torvalds authored
      d93dc5c4
    • Lasse Collin's avatar
      XZ: Fix incorrect XZ_BUF_ERROR · 9c1f8594
      Lasse Collin authored
      xz_dec_run() could incorrectly return XZ_BUF_ERROR if all of the
      following was true:
      
       - The caller knows how many bytes of output to expect and only provides
         that much output space.
      
       - When the last output bytes are decoded, the caller-provided input
         buffer ends right before the LZMA2 end of payload marker.  So LZMA2
         won't provide more output anymore, but it won't know it yet and thus
         won't return XZ_STREAM_END yet.
      
       - A BCJ filter is in use and it hasn't left any unfiltered bytes in the
         temp buffer.  This can happen with any BCJ filter, but in practice
         it's more likely with filters other than the x86 BCJ.
      
      This fixes <https://bugzilla.redhat.com/show_bug.cgi?id=735408> where
      Squashfs thinks that a valid file system is corrupt.
      
      This also fixes a similar bug in single-call mode where the uncompressed
      size of a block using BCJ + LZMA2 was 0 bytes and caller provided no
      output space.  Many empty .xz files don't contain any blocks and thus
      don't trigger this bug.
      
      This also tweaks a closely related detail: xz_dec_bcj_run() could call
      xz_dec_lzma2_run() to decode into temp buffer when it was known to be
      useless.  This was harmless although it wasted a minuscule number of CPU
      cycles.
      Signed-off-by: default avatarLasse Collin <lasse.collin@tukaani.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9c1f8594
    • Linus Torvalds's avatar
      Merge git://github.com/davem330/net · e5b26a88
      Linus Torvalds authored
      * git://github.com/davem330/net: (27 commits)
        xfrm: Perform a replay check after return from async codepaths
        fib:fix BUG_ON in fib_nl_newrule when add new fib rule
        ixgbe: fix possible null buffer error
        tg3: fix VLAN tagging regression
        net: pxa168: Fix build errors by including interrupt.h
        netconsole: switch init_netconsole() to late_initcall
        gianfar: Fix overflow check and return value for gfar_get_cls_all()
        ppp_generic: fix multilink fragment MTU calculation (again)
        GRETH: avoid overwrite IP-stack's IP-frags checksum
        GRETH: RX/TX bytes were never increased
        ipv6: fix a possible double free
        b43: Fix beacon problem in ad-hoc mode
        Bluetooth: add support for 2011 mac mini
        Bluetooth: Add MacBookAir4,1 support
        Bluetooth: Fixed BT ST Channel reg order
        r8169: do not enable the TBI for anything but the original 8169.
        r8169: remove erroneous processing of always set bit.
        r8169: fix WOL setting for 8105 and 8111evl
        r8169: add MODULE_FIRMWARE for the firmware of 8111evl
        r8169: fix the reset setting for 8111evl
        ...
      e5b26a88