1. 21 May, 2011 2 commits
    • Erez Zadok's avatar
      VFS: move BUG_ON test for symlink nd->depth after current->link_count test · 1a4022f8
      Erez Zadok authored
      This solves a serious VFS-level bug in nested_symlink (which was
      rewritten from do_follow_link), and follows the order of depth tests
      that existed before.
      
      The bug triggers a BUG_ON in fs/namei.c:1381, when running racer with
      symlink and rename ops.
      Signed-off-by: default avatarErez Zadok <ezk@cs.sunysb.edu>
      Acked-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1a4022f8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 05249755
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (45 commits)
        crypto: caam - add support for sha512 variants of existing AEAD algorithms
        crypto: caam - remove unused authkeylen from caam_ctx
        crypto: caam - fix decryption shared vs. non-shared key setting
        crypto: caam - platform_bus_type migration
        crypto: aesni-intel - fix aesni build on i386
        crypto: aesni-intel - Merge with fpu.ko
        crypto: mv_cesa - make count_sgs() null-pointer proof
        crypto: mv_cesa - copy remaining bytes to SRAM only when needed
        crypto: mv_cesa - move digest state initialisation to a better place
        crypto: mv_cesa - fill inner/outer IV fields only in HMAC case
        crypto: mv_cesa - refactor copy_src_to_buf()
        crypto: mv_cesa - no need to save digest state after the last chunk
        crypto: mv_cesa - print a warning when registration of AES algos fail
        crypto: mv_cesa - drop this call to mv_hash_final from mv_hash_finup
        crypto: mv_cesa - the descriptor pointer register needs to be set just once
        crypto: mv_cesa - use ablkcipher_request_cast instead of the manual container_of
        crypto: caam - fix printk recursion for long error texts
        crypto: caam - remove unused keylen from session context
        hwrng: amd - enable AMD hw rnd driver for Maple PPC boards
        hwrng: amd - manage resource allocation
        ...
      05249755
  2. 20 May, 2011 38 commits