1. 01 Apr, 2010 24 commits
  2. 30 Mar, 2010 6 commits
  3. 29 Mar, 2010 10 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 9623e5a2
      Linus Torvalds authored
      * '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
      9623e5a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 9f321603
      Linus Torvalds authored
      * '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
        ...
      9f321603
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 9d54e2c0
      Linus Torvalds authored
      * '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
      9d54e2c0
    • Linus Torvalds's avatar
      7b128872
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 6631424f
      Linus 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()
        ...
      6631424f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · c45140a9
      Linus 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
      c45140a9
    • Linus Torvalds's avatar
      ext3: fix broken handling of EXT3_STATE_NEW · de329820
      Linus Torvalds authored
      In commit 9df93939 ("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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      de329820
    • Neil Horman's avatar
      r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) · c0cd884a
      Neil Horman authored
      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 fdd7b4c3.  A
      long time prior to that however, Francois posted
      126fa4b9, 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: default avatarNeil Horman <nhorman@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c0cd884a
    • David S. Miller's avatar
      sparc64: Properly truncate pt_regs framepointer in perf callback. · 9e8307ec
      David S. Miller 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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9e8307ec
    • Jaswinder Singh Rajput's avatar
      hwmon: (asc7621) Add X58 entry in Kconfig · b00d8a7e
      Jaswinder Singh Rajput authored
      Intel X58 have asc7621a chip. So added X58 entry in Kconfig for asc7621.
      Also arranged existing models in ascending order.
      Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      b00d8a7e