Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 30, 2010
  1. Linux 2.6.37-rc4

    authored
  2. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Use call_rcu_sched() for pagetables
Commits on Nov 29, 2010
  1. @ozbenh

    powerpc: Use call_rcu_sched() for pagetables

    Peter Zijlstra authored ozbenh committed
    PowerPC relies on IRQ-disable to guard against RCU quiecent states,
    use the appropriate RCU call version.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  2. Revert "debug_locks: set oops_in_progress if we will log messages."

    Dave Airlie authored committed
    This reverts commit e0fdace.
    
    On-list discussion seems to suggest that the robustness fixes for printk
    make this unnecessary and DaveM has also agreed in person at Kernel Summit
    and on list.
    
    The main problem with this code is once we hit a lockdep splat we always
    keep oops_in_progress set, the console layer uses oops_in_progress with KMS
    to decide when it should be showing the oops and not showing X, so it causes
    problems around suspend/resume time when a userspace resume can cause a console
    switch away from X, only if oops_in_progress is set (which is what we want
    if an oops actually is in progress, but not because we had a lockdep splat
    2 days prior).
    
    Cc: David S Miller <davem@davemloft.net>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      tpm: Autodetect itpm devices
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
      af_unix: limit recursion level
      pch_gbe driver: The wrong of initializer entry
      pch_gbe dreiver: chang author
      ucc_geth: fix ucc halt problem in half duplex mode
      inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners
      ehea: Add some info messages and fix an issue
      hso: fix disable_net
      NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty
      cxgb4vf: fix setting unicast/multicast addresses ...
      net, ppp: Report correct error code if unit allocation failed
      DECnet: don't leak uninitialized stack byte
      au1000_eth: fix invalid address accessing the MAC enable register
      dccp: fix error in updating the GAR
      tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)
      netns: Don't leak others' openreq-s in proc
      Net: ceph: Makefile: Remove unnessary code
      vhost/net: fix rcu check usage
      econet: fix CVE-2010-3848
      econet: fix CVE-2010-3850
      econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
      ...
  5. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
      OMAP: UART: don't resume UARTs that are not enabled.
  6. tpm: Autodetect itpm devices

    Matthew Garrett authored James Morris committed
    Some Lenovos have TPMs that require a quirk to function correctly. This can
    be autodetected by checking whether the device has a _HID of INTC0102. This
    is an invalid PNPid, and as such is discarded by the pnp layer - however
    it's still present in the ACPI code, so we can pull it out that way. This
    means that the quirk won't be automatically applied on non-ACPI systems,
    but without ACPI we don't have any way to identify the chip anyway so I
    don't think that's a great concern.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    Tested-by: Jiri Kosina <jkosina@suse.cz>
    Tested-by: Andy Isaacson <adi@hexapodia.org>
    Signed-off-by: James Morris <jmorris@namei.org>
  7. Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (24 commits)
      Btrfs: don't use migrate page without CONFIG_MIGRATION
      Btrfs: deal with DIO bios that span more than one ordered extent
      Btrfs: setup blank root and fs_info for mount time
      Btrfs: fix fiemap
      Btrfs - fix race between btrfs_get_sb() and umount
      Btrfs: update inode ctime when using links
      Btrfs: make sure new inode size is ok in fallocate
      Btrfs: fix typo in fallocate to make it honor actual size
      Btrfs: avoid NULL pointer deref in try_release_extent_buffer
      Btrfs: make btrfs_add_nondir take parent inode as an argument
      Btrfs: hold i_mutex when calling btrfs_log_dentry_safe
      Btrfs: use dget_parent where we can UPDATED
      Btrfs: fix more ESTALE problems with NFS
      Btrfs: handle NFS lookups properly
      btrfs: make 1-bit signed fileds unsigned
      btrfs: Show device attr correctly for symlinks
      btrfs: Set file size correctly in file clone
      btrfs: Check if dest_offset is block-size aligned before cloning file
      Btrfs: handle the space_cache option properly
      btrfs: Fix early enospc because 'unused' calculated with wrong sign.
      ...
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      EDAC: Fix typos in Documentation/edac.txt
      EDAC, MCE: Fix edac_init_mce_inject error handling
      EDAC: Remove deprecated kbuild goal definitions
  9. Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: Userland expects quota limit/warn/usage in 512b blocks
  10. @davem330

    af_unix: limit recursion level

    Eric Dumazet authored davem330 committed
    Its easy to eat all kernel memory and trigger NMI watchdog, using an
    exploit program that queues unix sockets on top of others.
    
    lkml ref : http://lkml.org/lkml/2010/11/25/8
    
    This mechanism is used in applications, one choice we have is to have a
    recursion limit.
    
    Other limits might be needed as well (if we queue other types of files),
    since the passfd mechanism is currently limited by socket receive queue
    sizes only.
    
    Add a recursion_level to unix socket, allowing up to 4 levels.
    
    Each time we send an unix socket through sendfd mechanism, we copy its
    recursion level (plus one) to receiver. This recursion level is cleared
    when socket receive queue is emptied.
    
    Reported-by: Марк Коренберг <socketpair@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. @davem330

    pch_gbe driver: The wrong of initializer entry

    Toshiharu Okada authored davem330 committed
    The wrong of initializer entry was modified.
    
    Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
    Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. @davem330

    pch_gbe dreiver: chang author

    Toshiharu Okada authored davem330 committed
    This driver's AUTHOR was changed to "Toshiharu Okada" from "Masayuki Ohtake".
    I update the Kconfig, renamed "Topcliff" to "EG20T".
    
    Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. @chrismason-xx

    Btrfs: don't use migrate page without CONFIG_MIGRATION

    chrismason-xx authored
    Fixes compile error
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  14. @davem330

    ucc_geth: fix ucc halt problem in half duplex mode

    Yang Li authored davem330 committed
    In commit 58933c6(ucc_geth: Fix the wrong the Rx/Tx FIFO size),
    the UCC_GETH_UTFTT_INIT is set to 512 based on the recommendation
    of the QE Reference Manual.  But that will sometimes cause tx halt
    while working in half duplex mode.
    
    According to errata draft QE_GENERAL-A003(High Tx Virtual FIFO
    threshold size can cause UCC to halt), setting UTFTT less than
    [(UTFS x (M - 8)/M) - 128] will prevent this from happening
    (M is the minimum buffer size).
    
    The patch changes UTFTT back to 256.
    
    Signed-off-by: Li Yang <leoli@freescale.com>
    Cc: Jean-Denis Boyer <jdboyer@media5corp.com>
    Cc: Andreas Schmitz <Andreas.Schmitz@riedel.net>
    Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @davem330

    inet: Fix __inet_inherit_port() to correctly increment bsockets and n…

    Nagendra Tomar authored davem330 committed
    …um_owners
    
    inet sockets corresponding to passive connections are added to the bind hash
    using ___inet_inherit_port(). These sockets are later removed from the bind
    hash using __inet_put_port(). These two functions are not exactly symmetrical.
    __inet_put_port() decrements hashinfo->bsockets and tb->num_owners, whereas
    ___inet_inherit_port() does not increment them. This results in both of these
    going to -ve values.
    
    This patch fixes this by calling inet_bind_hash() from ___inet_inherit_port(),
    which does the right thing.
    
    'bsockets' and 'num_owners' were introduced by commit a9d8f91
    (inet: Allowing more than 64k connections and heavily optimize bind(0))
    
    Signed-off-by: Nagendra Singh Tomar <tomer_iisc@yahoo.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. @davem330

    ehea: Add some info messages and fix an issue

    Breno Leitao authored davem330 committed
    This patch adds some debug information about ehea not being able to
    allocate enough spaces. Also it correctly updates the amount of available
    skb.
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. @chrismason-xx

    Btrfs: deal with DIO bios that span more than one ordered extent

    chrismason-xx authored
    The new DIO bio splitting code has problems when the bio
    spans more than one ordered extent.  This will happen as the
    generic DIO code merges our get_blocks calls together into
    a bigger single bio.
    
    This fixes things by walking forward in the ordered extent
    code finding all the overlapping ordered extents and completing them
    all at once.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  18. Un-inline get_pipe_info() helper function

    authored
    This avoids some include-file hell, and the function isn't really
    important enough to be inlined anyway.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Nov 28, 2010
  1. Export 'get_pipe_info()' to other users

    authored
    And in particular, use it in 'pipe_fcntl()'.
    
    The other pipe functions do not need to use the 'careful' version, since
    they are only ever called for things that are already known to be pipes.
    
    The normal read/write/ioctl functions are called through the file
    operations structures, so if a file isn't a pipe, they'd never get
    called.  But pipe_fcntl() is special, and called directly from the
    generic fcntl code, and needs to use the same careful function that the
    splice code is using.
    
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Rename 'pipe_info()' to 'get_pipe_info()'

    authored
    .. and change it to take the 'file' pointer instead of an inode, since
    that's what all users want anyway.
    
    The renaming is preparatory to exporting it to other users.  The old
    'pipe_info()' name was too generic and is already used elsewhere, so
    before making the function public we need to use a more specific name.
    
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix the software context switch counter
      perf, x86: Fixup Kconfig deps
      x86, perf, nmi: Disable perf if counters are not accessible
      perf: Fix inherit vs. context rotation bug
  4. Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git…

    authored
    …/ieee1394/linux1394-2.6
    
    * 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: net: throttle TX queue before running out of tlabels
      firewire: net: replace lists by counters
      firewire: net: fix memory leaks
      firewire: net: count stats.tx_packets and stats.tx_bytes
  5. @davem330

    hso: fix disable_net

    Filip Aben authored davem330 committed
    The HSO driver incorrectly creates a serial device instead of a net
    device when disable_net is set. It shouldn't create anything for the
    network interface.
    
    Signed-off-by: Filip Aben <f.aben@option.com>
    Reported-by: Piotr Isajew <pki@ex.com.pl>
    Reported-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty

    Jiri Slaby authored davem330 committed
    We register lapb when tty is created, but unregister it only when the
    device is UP. So move the lapb_unregister to x25_asy_close_tty after
    the device is down.
    
    The old behaviour causes ldisc switching to fail each second attempt,
    because we noted for us that the device is unused, so we use it the
    second time, but labp layer still have it registered, so it fails
    obviously.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Reported-by: Sergey Lapin <slapin@ossfans.org>
    Cc: Andrew Hendry <andrew.hendry@gmail.com>
    Tested-by: Sergey Lapin <slapin@ossfans.org>
    Tested-by: Mikhail Ulyanov <ulyanov.mikhail@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    cxgb4vf: fix setting unicast/multicast addresses ...

    Casey Leedom authored davem330 committed
    We were truncating the number of unicast and multicast MAC addresses
    supported.  Additionally, we were incorrectly computing the MAC Address
    hash (a "1 << N" where we needed a "1ULL << N").
    
    Signed-off-by: Casey Leedom <leedom@chelsio.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @cyrillos @davem330

    net, ppp: Report correct error code if unit allocation failed

    cyrillos authored davem330 committed
    Allocating unit from ird might return several error codes
    not only -EAGAIN, so it should not be changed and returned
    precisely. Same time unit release procedure should be invoked
    only if device is unregistering.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    CC: Paul Mackerras <paulus@samba.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @davem330

    DECnet: don't leak uninitialized stack byte

    Dan Rosenberg authored davem330 committed
    A single uninitialized padding byte is leaked to userspace.
    
    Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
    CC: stable <stable@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. @davem330

    au1000_eth: fix invalid address accessing the MAC enable register

    Wolfgang Grandegger authored davem330 committed
    "aup->enable" holds already the address pointing to the MAC enable
    register. The bug was introduced by commit d0e7cb:
    
    "au1000-eth: remove volatiles, switch to I/O accessors".
    
    CC: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Wolfgang Grandegger <wg@denx.de>
    Acked-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. @grrtrr @davem330

    dccp: fix error in updating the GAR

    grrtrr authored davem330 committed
    This fixes a bug in updating the Greatest Acknowledgment number Received (GAR):
    the current implementation does not track the greatest received value -
    lower values in the range AWL..AWH (RFC 4340, 7.5.1) erase higher ones.
    
    Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. @davem330
  13. @davem330

    tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)

    Alexey Dobriyan authored davem330 committed
    tcp_win_from_space() does the following:
    
          if (sysctl_tcp_adv_win_scale <= 0)
                  return space >> (-sysctl_tcp_adv_win_scale);
          else
                  return space - (space >> sysctl_tcp_adv_win_scale);
    
    "space" is int.
    
    As per C99 6.5.7 (3) shifting int for 32 or more bits is
    undefined behaviour.
    
    Indeed, if sysctl_tcp_adv_win_scale is exactly 32,
    space >> 32 equals space and function returns 0.
    
    Which means we busyloop in tcp_fixup_rcvbuf().
    
    Restrict net.ipv4.tcp_adv_win_scale to [-31, 31].
    
    Fix https://bugzilla.kernel.org/show_bug.cgi?id=20312
    
    Steps to reproduce:
    
          echo 32 >/proc/sys/net/ipv4/tcp_adv_win_scale
          wget www.kernel.org
          [softlockup]
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. @xemul @davem330

    netns: Don't leak others' openreq-s in proc

    xemul authored davem330 committed
    The /proc/net/tcp leaks openreq sockets from other namespaces.
    
    Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @Tdent48227 @davem330

    Net: ceph: Makefile: Remove unnessary code

    Tdent48227 authored davem330 committed
    Remove the if and else conditional because the code is in mainline and there
    is no need in it being there.
    
    Signed-off-by: Tracey Dent <tdent48227@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.