1. 14 Aug, 2011 26 commits
  2. 12 Aug, 2011 5 commits
  3. 11 Aug, 2011 6 commits
    • Vasiliy Kulikov's avatar
      move RLIMIT_NPROC check from set_user() to do_execve_common() · 72fa5997
      Vasiliy Kulikov authored
      The patch http://lkml.org/lkml/2003/7/13/226 introduced an RLIMIT_NPROC
      check in set_user() to check for NPROC exceeding via setuid() and
      similar functions.
      
      Before the check there was a possibility to greatly exceed the allowed
      number of processes by an unprivileged user if the program relied on
      rlimit only.  But the check created new security threat: many poorly
      written programs simply don't check setuid() return code and believe it
      cannot fail if executed with root privileges.  So, the check is removed
      in this patch because of too often privilege escalations related to
      buggy programs.
      
      The NPROC can still be enforced in the common code flow of daemons
      spawning user processes.  Most of daemons do fork()+setuid()+execve().
      The check introduced in execve() (1) enforces the same limit as in
      setuid() and (2) doesn't create similar security issues.
      
      Neil Brown suggested to track what specific process has exceeded the
      limit by setting PF_NPROC_EXCEEDED process flag.  With the change only
      this process would fail on execve(), and other processes' execve()
      behaviour is not changed.
      
      Solar Designer suggested to re-check whether NPROC limit is still
      exceeded at the moment of execve().  If the process was sleeping for
      days between set*uid() and execve(), and the NPROC counter step down
      under the limit, the defered execve() failure because NPROC limit was
      exceeded days ago would be unexpected.  If the limit is not exceeded
      anymore, we clear the flag on successful calls to execve() and fork().
      
      The flag is also cleared on successful calls to set_user() as the limit
      was exceeded for the previous user, not the current one.
      
      Similar check was introduced in -ow patches (without the process flag).
      
      v3 - clear PF_NPROC_EXCEEDED on successful calls to set_user().
      Reviewed-by: default avatarJames Morris <jmorris@namei.org>
      Signed-off-by: default avatarVasiliy Kulikov <segoon@openwall.com>
      Acked-by: default avatarNeilBrown <neilb@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      72fa5997
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · 1d229d54
      Linus Torvalds authored
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf symbols: Check '/tmp/perf-' symbol file ownership
        perf sched: Usage leftover from trace -> script rename
        perf sched: Do not delete session object prematurely
        perf tools: Check $HOME/.perfconfig ownership
        perf, x86: Add model 45 SandyBridge support
        perf tools: Add support to install perf python extension
        perf tools: do not look at ./config for configuration
        perf tools: Make clean leaves some files
        perf lock: Dropping unsupported ':r' modifier
        perf probe: Fix coredump introduced by probe module option
        jump label: Reduce the cycle count by changing the link order
        perf report: Use ui__warning in some more places
        perf python: Add PERF_RECORD_{LOST,READ,SAMPLE} routine tables
        perf evlist: Introduce 'disable' method
        trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACING_DEPRECATED
        perf buildid-cache: Zero out buffer of filenames when adding/removing buildid
      1d229d54
    • Tracey Dent's avatar
      MAINTAINERS: Update linus' git repository · d16adea3
      Tracey Dent authored
      Change to new git tree -
       (git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git).
      Signed-off-by: default avatarTracey Dent <tdent48227@gmail.com>
      Acked-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d16adea3
    • Linus Torvalds's avatar
      Revert "EDAC: Correct Kconfig dependencies" · a9f729f0
      Linus Torvalds authored
      This reverts commit af9d220b.
      
      It turns out that one was meant to be applied on top of the edac.git
      tree in -next that has more i7core_edac changes, but that wasn't clear
      in the original email.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
      Cc: Randy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a9f729f0
    • Peng Tao's avatar
      NFS41: make PNFS_BLOCK selectable · 54a33b19
      Peng Tao authored
      PNFS_BLOCK needs BLK_DEV_DM/MD, which is not a dependency for other
      pnfs layout drivers. Seperate it out so others can still build when
      BLK_DEV_DM/MD is not enabled.
      
      Also change select to depends on to avoid build failures.
      Reported-and-tested-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarPeng Tao <peng_tao@emc.com>
      Acked-by: default avatarBenny Halevy <bhalevy@tonian.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      54a33b19
    • Linus Torvalds's avatar
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 068ef739
      Linus Torvalds authored
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: drop experimental status for ARM_PATCH_PHYS_VIRT
        ARM: 7008/1: alignment: Make SIGBUS sent to userspace POSIXly correct
        ARM: 7007/1: alignment: Prevent ignoring of faults with ARMv6 unaligned access model
        ARM: 7010/1: mm: fix invalid loop for poison_init_mem
        ARM: 7005/1: freshen up mm/proc-arm946.S
        dmaengine: PL08x: Fix trivial build error
        ARM: Fix build error for SMP=n builds
      068ef739
  4. 10 Aug, 2011 3 commits