21 Dec, 2012

28 commits


20 Dec, 2012

12 commits

  • Pull sparc fixes from David Miller:
    "Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
    well as an addition of a pte_accessible() define for sparc64 and a
    hugetlb fix from Dave Kleikamp."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
    sparc64: Fix ECB looping constructs in AES code.
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
    sparc64: Fix AES ctr mode block size.
    sparc64: Fix unrolled AES 256-bit key loops.
    sparc64: Define pte_accessible()
    sparc: huge_ptep_set_* functions need to call set_huge_pte_at()

    Linus Torvalds
     
  • Pull networking fixes from David Miller:

    1) Really fix tuntap SKB use after free bug, from Eric Dumazet.

    2) Adjust SKB data pointer to point past the transport header before
    calling icmpv6_notify() so that the headers are in the state which
    that function expects. From Duan Jiong.

    3) Fix ambiguities in the new tuntap multi-queue APIs. From Jason
    Wang.

    4) mISDN needs to use del_timer_sync(), from Konstantin Khlebnikov.

    5) Don't destroy mutex after freeing up device private in mac802154,
    fix also from Konstantin Khlebnikov.

    6) Fix INET request socket leak in TCP and DCCP, from Christoph Paasch.

    7) SCTP HMAC kconfig rework, from Neil Horman.

    8) Fix SCTP jprobes function signature, otherwise things explode, from
    Daniel Borkmann.

    9) Fix typo in ipv6-offload Makefile variable reference, from Simon
    Arlott.

    10) Don't fail USBNET open just because remote wakeup isn't supported,
    from Oliver Neukum.

    11) be2net driver bug fixes from Sathya Perla.

    12) SOLOS PCI ATM driver bug fixes from Nathan Williams and David
    Woodhouse.

    13) Fix MTU changing regression in 8139cp driver, from John Greene.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
    solos-pci: ensure all TX packets are aligned to 4 bytes
    solos-pci: add firmware upgrade support for new models
    solos-pci: remove superfluous debug output
    solos-pci: add GPIO support for newer versions on Geos board
    8139cp: Prevent dev_close/cp_interrupt race on MTU change
    net: qmi_wwan: add ZTE MF880
    drivers/net: Use of_match_ptr() macro in smsc911x.c
    drivers/net: Use of_match_ptr() macro in smc91x.c
    ipv6: addrconf.c: remove unnecessary "if"
    bridge: Correctly encode addresses when dumping mdb entries
    bridge: Do not unregister all PF_BRIDGE rtnl operations
    use generic usbnet_manage_power()
    usbnet: generic manage_power()
    usbnet: handle PM failure gracefully
    ksz884x: fix receive polling race condition
    qlcnic: update driver version
    qlcnic: fix unused variable warnings
    net: fec: forbid FEC_PTP on SoCs that do not support
    be2net: fix wrong frag_idx reported by RX CQ
    be2net: fix be_close() to ensure all events are ack'ed
    ...

    Linus Torvalds
     
  • Linus Torvalds
     
  • Pull drm bugfix from Dave Airlie:
    "Just a single urgent regression fix, seeing a few wierd behaviours I'd
    like not to persist."

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
    drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling

    Linus Torvalds
     
  • Pull random updates from Ted Ts'o:
    "A few /dev/random improvements for the v3.8 merge window."

    * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
    random: Mix cputime from each thread that exits to the pool
    random: prime last_data value per fips requirements
    random: fix debug format strings
    random: make it possible to enable debugging without rebuild

    Linus Torvalds
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Things works better when you increment the source buffer pointer
    properly.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Like the generic versions, we need to support a block size
    of '1' for CTR mode AES.

    This was discovered thanks to all of the new test cases added by
    Jussi Kivilinna.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The basic scheme of the block mode assembler is that we start by
    enabling the FPU, loading the key into the floating point registers,
    then iterate calling the encrypt/decrypt routine for each block.

    For the 256-bit key cases, we run short on registers in the unrolled
    loops.

    So the {ENCRYPT,DECRYPT}_256_2() macros reload the key registers that
    get clobbered.

    The unrolled macros, {ENCRYPT,DECRYPT}_256(), are not mindful of this.

    So if we have a mix of multi-block and single-block calls, the
    single-block unrolled 256-bit encrypt/decrypt can run with some
    of the key registers clobbered.

    Handle this by always explicitly loading those registers before using
    the non-unrolled 256-bit macro.

    This was discovered thanks to all of the new test cases added by
    Jussi Kivilinna.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The FPGA can't handled unaligned DMA (yet). So copy into an aligned buffer,
    if skb->data isn't suitably aligned.

    Signed-off-by: David Woodhouse
    Signed-off-by: David S. Miller

    David Woodhouse