Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 30, 2010
  1. @torvalds

    Linux 2.6.34-rc3

    torvalds authored
  2. @torvalds

    KEYS: Add MAINTAINERS record

    David Howells authored torvalds committed
    Add a MAINTAINERS record for the key management facility.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      CRED: Fix memory leak in error handling
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
      [LogFS] Erase new journal segments
      [LogFS] Move reserved segments with journal
      [LogFS] Clear PagePrivate when moving journal
      Simplify and fix pad_wbuf
      Prevent data corruption in logfs_rewrite_block()
      Use deactivate_locked_super
      Fix logfs_get_sb_final error path
      Write out both superblocks on mismatch
      Prevent schedule while atomic in __logfs_readdir
      Plug memory leak in writeseg_end_io
      Limit max_pages for insane devices
      Open segment file before using it
  5. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Do not free zero sized per cpu areas
      x86: Make sure free_init_pages() frees pages on page boundary
      x86: Make smp_locks end with page alignment
  6. @compudj

    CRED: Fix memory leak in error handling

    compudj authored James Morris committed
    Fix a memory leak on an OOM condition in prepare_usermodehelper_creds().
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
Commits on Mar 29, 2010
  1. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Fix a race in o2dlm lockres mastery
      Ocfs2: Handle deletion of reflinked oprhan inodes correctly.
      Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir.
      ocfs2: Clear undo bits when local alloc is freed
      ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
      ocfs2: Fix the update of name_offset when removing xattrs
      ocfs2: Always try for maximum bits with new local alloc windows
      ocfs2: set i_mode on disk during acl operations
      ocfs2: Update i_blocks in reflink operations.
      ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
      [PATCH] Skip check for mandatory locks when unlocking
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
      ceph: update discussion list address in MAINTAINERS
      ceph: some documentations fixes
      ceph: fix use after free on mds __unregister_request
      ceph: avoid loaded term 'OSD' in documention
      ceph: fix possible double-free of mds request reference
      ceph: fix session check on mds reply
      ceph: handle kmalloc() failure
      ceph: propagate mds session allocation failures to caller
      ceph: make write_begin wait propagate ERESTARTSYS
      ceph: fix snap rebuild condition
      ceph: avoid reopening osd connections when address hasn't changed
      ceph: rename r_sent_stamp r_stamp
      ceph: fix connection fault con_work reentrancy problem
      ceph: prevent dup stale messages to console for restarting mds
      ceph: fix pg pool decoding from incremental osdmap update
      ceph: fix mds sync() race with completing requests
      ceph: only release unused caps with mds requests
      ceph: clean up handle_cap_grant, handle_caps wrt session mutex
      ceph: fix session locking in handle_caps, ceph_check_caps
      ceph: drop unnecessary WARN_ON in caps migration
      ...
  3. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (asc7621) Add X58 entry in Kconfig
      hwmon: (w83793) Saving negative errors in unsigned
      hwmon: (coretemp) Add missing newline to dev_warn() message
      hwmon: (coretemp) Fix cpu model output
  4. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_via: fix VT6410/6415/6330 detection issue
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
      r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
      ipv6: Don't drop cache route entry unless timer actually expired.
      tulip: Add missing parens.
      r8169: fix broken register writes
      pcnet_cs: add new id
      bonding: fix broken multicast with round-robin mode
      drivers/net: Fix continuation lines
      e1000: do not modify tx_queue_len on link speed change
      net: ipmr/ip6mr: prevent out-of-bounds vif_table access
      ixgbe: Do not run all Diagnostic offline tests when VFs are active
      igb: use correct bits to identify if managability is enabled
      benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c
      net: Add MSG_WAITFORONE flag to recvmmsg
      e1000e: do not modify tx_queue_len on link speed change
      igbvf: do not modify tx_queue_len on link speed change
      ipv4: Restart rt_intern_hash after emergency rebuild (v2)
      ipv4: Cleanup struct net dereference in rt_intern_hash
      net: fix netlink address dumping in IPv4/IPv6
      tulip: Fix null dereference in uli526x_rx_packet()
      gianfar: fix undo of reserve()
      ...
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Properly truncate pt_regs framepointer in perf callback.
      arch/sparc/kernel: Use set_cpus_allowed_ptr
      sparc: Fix use of uid16_t and gid16_t in asm/stat.h
  7. @torvalds

    ext3: fix broken handling of EXT3_STATE_NEW

    torvalds authored
    In commit 9df9393 ("ext3: Use bitops to read/modify
    EXT3_I(inode)->i_state") ext3 changed its internal 'i_state' variable to
    use bitops for its state handling.  However, unline the same ext4
    change, it didn't actually change the name of the field when it changed
    the semantics of it.
    
    As a result, an old use of 'i_state' remained in fs/ext3/ialloc.c that
    initialized the field to EXT3_STATE_NEW.  And that does not work
    _at_all_ when we're now working with individually named bits rather than
    values that get masked.  So the code tried to mark the state to be new,
    but in actual fact set the field to EXT3_STATE_JDATA.  Which makes no
    sense at all, and screws up all the code that checks whether the inode
    was newly allocated.
    
    In particular, it made the xattr code unhappy, and caused various random
    behavior, like apparently
    
    	https://bugzilla.redhat.com/show_bug.cgi?id=577911
    
    So fix the initialization, and rename the field to match ext4 so that we
    don't have this happen again.
    
    Cc: James Morris <jmorris@namei.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Cc: Daniel J Walsh <dwalsh@redhat.com>
    Cc: Eric Paris <eparis@redhat.com>
    Cc: Jan Kara <jack@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @davem330

    r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)

    Neil Horman authored davem330 committed
    Official patch to fix the r8169 frame length check error.
    
    Based on this initial thread:
    http://marc.info/?l=linux-netdev&m=126202972828626&w=1
    This is the official patch to fix the frame length problems in the r8169
    driver.  As noted in the previous thread, while this patch incurs a performance
    hit on the driver, its possible to improve performance dynamically by updating
    the mtu and rx_copybreak values at runtime to return performance to what it was
    for those NICS which are unaffected by the ideosyncracy (if there are any).
    
    Summary:
    
        A while back Eric submitted a patch for r8169 in which the proper
    allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
    much data.  This was done in commit fdd7b4c.  A
    long time prior to that however, Francois posted
    126fa4b, which expiclitly disabled the MaxSize
    setting due to the fact that the hardware behaved in odd ways when overlong
    frames were received on NIC's supported by this driver.  This was mentioned in a
    security conference recently:
    http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
    
    It seems that if we can't enable frame size filtering, then, as Eric correctly
    noticed, we can find ourselves DMA-ing too much data to a buffer, causing
    corruption.  As a result is seems that we are forced to allocate a frame which
    is ready to handle a maximally sized receive.
    
    This obviously has performance issues with it, so to mitigate that issue, this
    patch does two things:
    
    1) Raises the copybreak value to the frame allocation size, which should force
    appropriately sized packets to get allocated on rx, rather than a full new 16k
    buffer.
    
    2) This patch only disables frame filtering initially (i.e., during the NIC
    open), changing the MTU results in ring buffer allocation of a size in relation
    to the new mtu (along with a warning indicating that this is dangerous).
    
    Because of item (2), individuals who can't cope with the performance hit (or can
    otherwise filter frames to prevent the bug), or who have hardware they are sure
    is unaffected by this issue, can manually lower the copybreak and reset the mtu
    such that performance is restored easily.
    
    Signed-off-by: Neil Horman <nhorman@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @davem330

    sparc64: Properly truncate pt_regs framepointer in perf callback.

    davem330 authored
    For 32-bit processes, we save the full 64-bits of the regs in pt_regs.
    
    But unlike when the userspace actually does load and store
    instructions, the top 32-bits don't get automatically truncated by the
    cpu in kernel mode (because the kernel doesn't execute with PSTATE_AM
    address masking enabled).
    
    So we have to do it by hand.
    
    Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. hwmon: (asc7621) Add X58 entry in Kconfig

    Jaswinder Singh Rajput authored Jean Delvare committed
    Intel X58 have asc7621a chip. So added X58 entry in Kconfig for asc7621.
    Also arranged existing models in ascending order.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  11. @error27

    hwmon: (w83793) Saving negative errors in unsigned

    error27 authored Jean Delvare committed
    "ret" is used to store the return value for watchdog_trigger() and it
    should be signed for the error handling to work.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  12. hwmon: (coretemp) Add missing newline to dev_warn() message

    Dean Nelson authored Jean Delvare committed
    Add missing newline to dev_warn() message string. This is more of an issue
    with older kernels that don't automatically add a newline if it was missing
    from the end of the previous line.
    
    Signed-off-by: Dean Nelson <dnelson@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  13. @prarit

    hwmon: (coretemp) Fix cpu model output

    prarit authored Jean Delvare committed
    Avoid hex and decimal confusion when printing out the cpu model.
    
    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  14. [LogFS] Erase new journal segments

    Joern Engel authored
    If the device contains on old logfs image and the journal is moved to
    segment that have never been used by the current logfs and not all
    journal segments are erased before the next mount, the old content can
    confuse mount code.  To prevent this, always erase the new journal
    segments.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  15. [LogFS] Move reserved segments with journal

    Joern Engel authored
    Fixes a GC livelock.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  16. x86: Do not free zero sized per cpu areas

    Ian Campbell authored Ingo Molnar committed
    This avoids an infinite loop in free_early_partial().
    
    Add a warning to free_early_partial() to catch future problems.
    
    -v5: put back start > end back into WARN_ONCE()
    -v6: use one line for warning, suggested by Linus
    -v7: more tests
    -v8: remove the function name as suggested by Johannes
         WARN_ONCE() will print out that function name.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Tested-by: Joel Becker <joel.becker@oracle.com>
    Tested-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: David Miller <davem@davemloft.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <1269830604-26214-4-git-send-email-yinghai@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  17. x86: Make sure free_init_pages() frees pages on page boundary

    Yinghai Lu authored Ingo Molnar committed
    When CONFIG_NO_BOOTMEM=y, it could use memory more effiently, or
    in a more compact fashion.
    
    Example:
    
     Allocated new RAMDISK: 00ec2000 - 0248ce57
     Move RAMDISK from 000000002ea04000 - 000000002ffcee56 to 00ec2000 - 0248ce56
    
    The new RAMDISK's end is not page aligned.
    Last page could be shared with other users.
    
    When free_init_pages are called for initrd or .init, the page
    could be freed and we could corrupt other data.
    
    code segment in free_init_pages():
    
     |        for (; addr < end; addr += PAGE_SIZE) {
     |                ClearPageReserved(virt_to_page(addr));
     |                init_page_count(virt_to_page(addr));
     |                memset((void *)(addr & ~(PAGE_SIZE-1)),
     |                        POISON_FREE_INITMEM, PAGE_SIZE);
     |                free_page(addr);
     |                totalram_pages++;
     |        }
    
    last half page could be used as one whole free page.
    
    So page align the boundaries.
    
    -v2: make the original initramdisk to be aligned, according to
         Johannes, otherwise we have the chance to lose one page.
         we still need to keep initrd_end not aligned, otherwise it could
         confuse decompressor.
    -v3: change to WARN_ON instead, suggested by Johannes.
    -v4: use PAGE_ALIGN, suggested by Johannes.
         We may fix that macro name later to PAGE_ALIGN_UP, and PAGE_ALIGN_DOWN
         Add comments about assuming ramdisk start is aligned
         in relocate_initrd(), change to re get ramdisk_image instead of save it
         to make diff smaller. Add warning for wrong range, suggested by Johannes.
    -v6: remove one WARN()
         We need to align beginning in free_init_pages()
         do not copy more than ramdisk_size, noticed by Johannes
    
    Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Tested-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: David Miller <davem@davemloft.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <1269830604-26214-3-git-send-email-yinghai@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  18. @liewegas

    ceph: update discussion list address in MAINTAINERS

    liewegas authored
    Signed-off-by: Sage Weil <sage@newdream.net>
  19. @crquan @liewegas

    ceph: some documentations fixes

    crquan authored liewegas committed
    New documentation should have an entry in the 00-INDEX.  Correct git
    urls.
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Sage Weil <sage@newdream.net>
  20. x86: Make smp_locks end with page alignment

    Yinghai Lu authored Ingo Molnar committed
    Fix:
    
     ------------[ cut here ]------------
     WARNING: at arch/x86/mm/init.c:342 free_init_pages+0x4c/0xfa()
     free_init_pages: range [0x40daf000, 0x40db5c24] is not aligned
     Modules linked in:
     Pid: 0, comm: swapper Not tainted
     2.6.34-rc2-tip-03946-g4f16b23-dirty #50 Call Trace:
      [<40232e9f>] warn_slowpath_common+0x65/0x7c
      [<4021c9f0>] ? free_init_pages+0x4c/0xfa
      [<40881434>] ? _etext+0x0/0x24
      [<40232eea>] warn_slowpath_fmt+0x24/0x27
      [<4021c9f0>] free_init_pages+0x4c/0xfa
      [<40881434>] ? _etext+0x0/0x24
      [<40d3f4bd>] alternative_instructions+0xf6/0x100
      [<40d3fe4f>] check_bugs+0xbd/0xbf
      [<40d398a7>] start_kernel+0x2d5/0x2e4
      [<40d390ce>] i386_start_kernel+0xce/0xd5
     ---[ end trace 4eaa2a86a8e2da22 ]---
    
    Comments in vmlinux.lds.S already said:
    
     |        /*
     |         * smp_locks might be freed after init
     |         * start/end must be page aligned
     |         */
    
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: David Miller <davem@davemloft.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <1269830604-26214-2-git-send-email-yinghai@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  21. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
      Revert "ide: skip probe if there are no devices on the port (v2)"
      Revert "via82cxxx: workaround h/w bugs"
  22. @torvalds

    frv/chris: fix lines with a missing semicolons

    David Howells authored torvalds committed
    Commit b26b2d4 ("resource/PCI: align functions now return start
    of resource") added lines with missing semicolons.
    
    Add the missing semicolons to the FRV and CRIS arch code.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Cc: linux@dominikbrodowski.net
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. @torvalds

    SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG

    David Howells authored torvalds committed
    CONFIG_SLOW_WORK_PROC was changed to CONFIG_SLOW_WORK_DEBUG, but not in all
    instances.  Change the remaining instances.  This makes the debugfs file
    display the time mark and the owner's description again.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. @torvalds

    slow-work: use get_ref wrapper instead of directly calling get_ref

    Dave Airlie authored torvalds committed
    Otherwise we can get an oops if the user has no get_ref/put_ref
    requirement.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda: Use LPIB for ga-ma770-ud3 board
      ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
      ALSA: pcm_lib - fix xrun functionality
      ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
      ALSA: hda - Don't set invalid connection index in Realtek initialiaiton
  26. @draconx @torvalds

    Staging: et131x: Properly disable FC in txmac.

    draconx authored torvalds committed
    FC disable is bit 3 of the txmac ctl register, but commit 6720949
    ("Staging: et131x: Kil the txmac type") accidentally changed the code to
    set bit 2 instead.
    
    Signed-off-by: Nick Bowler <nbowler@draconx.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. @tiwai
  28. @tiwai
  29. @crimsun @tiwai

    ALSA: hda: Use LPIB for ga-ma770-ud3 board

    crimsun authored tiwai committed
    BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669
    
    The OR states that position_fix=1 is necessary to work around glitching
    during volume adjustments using PulseAudio.
    
    Reported-by: Carlos Laviola <claviola@debian.org>
    Tested-by: Carlos Laviola <claviola@debian.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
Something went wrong with that request. Please try again.