1. 13 Aug, 2010 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 2f2c7795
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
        ctcm: rename READ/WRITE defines to avoid redefinitions
        claw: rename READ/WRITE defines to avoid redefinitions
        phylib: available for any speed ethernet
        can: add limit for nframes and clean up signed/unsigned variables
        pkt_sched: Check .walk and .leaf class handlers
        pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
        caif-spi: Bugfix SPI_DATA_POS settings were inverted.
        caif: Bugfix - Increase default headroom size for control channel.
        net: make netpoll_rx return bool for !CONFIG_NETPOLL
        Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size
        Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
        Bluetooth: Change default L2CAP ERTM retransmit timeout
        Bluetooth: Fix endianness issue with L2CAP MPS configuration
        net: Use NET_XMIT_SUCCESS where possible.
        isdn: mISDN: call pci_disable_device() if pci_probe() failed
        isdn: avm: call pci_disable_device() if pci_probe() failed
        isdn: avm: call pci_disable_device() if pci_probe() failed
        usbnet: rx_submit() should return an error code.
        pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
        pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
        ...
      2f2c7795
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 2897c684
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set
        AFS: Implement an autocell mount capability [ver #2]
        DNS: If the DNS server returns an error, allow that to be cached [ver #2]
        NFS: Use kernel DNS resolver [ver #2]
        cifs: update README to include details about 'fsc' option
      2897c684
    • Linus Torvalds's avatar
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · c029b55a
      Linus Torvalds authored
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, asm: Use a lower case name for the end macro in atomic64_386_32.S
        x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner
        x86: Document __phys_reloc_hide() usage in __pa_symbol()
        x86, apic: Map the local apic when parsing the MP table.
      c029b55a
    • Linus Torvalds's avatar
      x86: don't send SIGBUS for kernel page faults · 96054569
      Linus Torvalds authored
      It's wrong for several reasons, but the most direct one is that the
      fault may be for the stack accesses to set up a previous SIGBUS.  When
      we have a kernel exception, the kernel exception handler does all the
      fixups, not some user-level signal handler.
      
      Even apart from the nested SIGBUS issue, it's also wrong to give out
      kernel fault addresses in the signal handler info block, or to send a
      SIGBUS when a system call already returns EFAULT.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      96054569
    • Linus Torvalds's avatar
      mm: fix missing page table unmap for stack guard page failure case · 5528f913
      Linus Torvalds authored
      .. which didn't show up in my tests because it's a no-op on x86-64 and
      most other architectures.  But we enter the function with the last-level
      page table mapped, and should unmap it at exit.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5528f913
    • Linus Torvalds's avatar
      mm: keep a guard page below a grow-down stack segment · 320b2b8d
      Linus Torvalds authored
      This is a rather minimally invasive patch to solve the problem of the
      user stack growing into a memory mapped area below it.  Whenever we fill
      the first page of the stack segment, expand the segment down by one
      page.
      
      Now, admittedly some odd application might _want_ the stack to grow down
      into the preceding memory mapping, and so we may at some point need to
      make this a process tunable (some people might also want to have more
      than a single page of guarding), but let's try the minimal approach
      first.
      
      Tested with trivial application that maps a single page just below the
      stack, and then starts recursing.  Without this, we will get a SIGSEGV
      _after_ the stack has smashed the mapping.  With this patch, we'll get a
      nice SIGBUS just as the stack touches the page just above the mapping.
      Requested-by: default avatarKeith Packard <keithp@keithp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      320b2b8d
  2. 12 Aug, 2010 34 commits