1. 19 Dec, 2009 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · ecd5907a
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] Use strim instead of strstrip to avoid false warnings.
        [S390] qdio: add counter for input queue full condition
        [S390] qdio: remove superfluous log entries and WARN_ONs.
        [S390] ptrace: dont abuse PT_PTRACED
        [S390] cio: fix channel path vary
        [S390] drivers: Correct size given to memset
        [S390] tape: Add pr_fmt() macro to all tape source files
        [S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS
        [S390] tty: PTR_ERR return of wrong pointer in fs3270_open()
        [S390] s390: PTR_ERR return of wrong pointer in fallback_init_cip()
        [S390] dasd: PTR_ERR return of wrong pointer in
        [S390] dasd: move dasd-diag kmsg to dasd
        [S390] cio: fix drvdata usage for the console subchannel
        [S390] wire up sys_recvmmsg
      ecd5907a
    • Al Viro's avatar
      fix more leaks in audit_tree.c tag_chunk() · b4c30aad
      Al Viro authored
      Several leaks in audit_tree didn't get caught by commit
      318b6d3d, including the leak on normal
      exit in case of multiple rules refering to the same chunk.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b4c30aad
    • Al Viro's avatar
      fix braindamage in audit_tree.c untag_chunk() · 6f5d5114
      Al Viro authored
      ... aka "Al had badly fscked up when writing that thing and nobody
      noticed until Eric had fixed leaks that used to mask the breakage".
      
      The function essentially creates a copy of old array sans one element
      and replaces the references to elements of original (they are on cyclic
      lists) with those to corresponding elements of new one.  After that the
      old one is fair game for freeing.
      
      First of all, there's a dumb braino: when we get to list_replace_init we
      use indices for wrong arrays - position in new one with the old array
      and vice versa.
      
      Another bug is more subtle - termination condition is wrong if the
      element to be excluded happens to be the last one.  We shouldn't go
      until we fill the new array, we should go until we'd finished the old
      one.  Otherwise the element we are trying to kill will remain on the
      cyclic lists...
      
      That crap used to be masked by several leaks, so it was not quite
      trivial to hit.  Eric had fixed some of those leaks a while ago and the
      shit had hit the fan...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6f5d5114
  2. 18 Dec, 2009 24 commits
  3. 17 Dec, 2009 13 commits