Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 24, 2011
  1. @torvalds

    Linux 3.2-rc3

    torvalds authored
  2. @torvalds

    Merge git://github.com/rustyrussell/linux

    torvalds authored
    * git://github.com/rustyrussell/linux:
      virtio-pci: make reset operation safer
      virtio-mmio: Correct the name of the guest features selector
      virtio: add HAS_IOMEM dependency to MMIO platform bus driver
  3. @mstsirkin @rustyrussell

    virtio-pci: make reset operation safer

    mstsirkin authored rustyrussell committed
    virtio pci device reset actually just does an I/O
    write, which in PCI is really posted, that is it
    can complete on CPU before the device has received it.
    
    Further, interrupts might have been pending on
    another CPU, so device callback might get invoked after reset.
    
    This conflicts with how drivers use reset, which is typically:
    	reset
    	unregister
    a callback running after reset completed can race with
    unregister, potentially leading to use after free bugs.
    
    Fix by flushing out the write, and flushing pending interrupts.
    
    This assumes that device is never reset from
    its vq/config callbacks, or in parallel with being
    added/removed, document this assumption.
    
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  4. @sashalevin @rustyrussell

    virtio-mmio: Correct the name of the guest features selector

    sashalevin authored rustyrussell committed
    Guest features selector spelling mistake.
    
    Cc: Pawel Moll <pawel.moll@arm.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: virtualization@lists.linux-foundation.org
    Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  5. @rustyrussell

    virtio: add HAS_IOMEM dependency to MMIO platform bus driver

    Heiko Carstens authored rustyrussell committed
    Fix this compile error on s390:
    
      CC [M]  drivers/virtio/virtio_mmio.o
    drivers/virtio/virtio_mmio.c: In function 'vm_get_features':
    drivers/virtio/virtio_mmio.c:107:2: error: implicit declaration of function 'writel'
    
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Acked-by: Pawel Moll <pawel.moll@arm.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  6. @torvalds

    Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

    torvalds authored
    * 'upstream-linus' of git://github.com/jgarzik/libata-dev:
      libata: fix build without BMDMA
      [libata] ahci_platform: fix DT probing
Commits on Nov 23, 2011
  1. @torvalds

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

    torvalds authored
    …/git/jbarnes/pci
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
      PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs
      PCI: pciehp: wait 100 ms after Link Training check
      PCI: pciehp: wait 1000 ms before Link Training check
      PCI: pciehp: Retrieve link speed after link is trained
      PCI: Let PCI_PRI depend on PCI
      PCI: Fix compile errors with PCI_ATS and !PCI_IOV
      PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug
  2. @torvalds

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

    torvalds authored
    …/git/tyhicks/ecryptfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
      eCryptfs: Extend array bounds for all filename chars
      eCryptfs: Flush file in vma close
      eCryptfs: Prevent file create race condition
  3. eCryptfs: Extend array bounds for all filename chars

    Tyler Hicks authored
    From mhalcrow's original commit message:
    
        Characters with ASCII values greater than the size of
        filename_rev_map[] are valid filename characters.
        ecryptfs_decode_from_filename() will access kernel memory beyond
        that array, and ecryptfs_parse_tag_70_packet() will then decrypt
        those characters. The attacker, using the FNEK of the crafted file,
        can then re-encrypt the characters to reveal the kernel memory past
        the end of the filename_rev_map[] array. I expect low security
        impact since this array is statically allocated in the text area,
        and the amount of memory past the array that is accessible is
        limited by the largest possible ASCII filename character.
    
    This patch solves the issue reported by mhalcrow but with an
    implementation suggested by Linus to simply extend the length of
    filename_rev_map[] to 256. Characters greater than 0x7A are mapped to
    0x00, which is how invalid characters less than 0x7A were previously
    being handled.
    
    Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
    Reported-by: Michael Halcrow <mhalcrow@google.com>
    Cc: stable@kernel.org
  4. eCryptfs: Flush file in vma close

    Tyler Hicks authored
    Dirty pages weren't being written back when an mmap'ed eCryptfs file was
    closed before the mapping was unmapped. Since f_ops->flush() is not
    called by the munmap() path, the lower file was simply being released.
    This patch flushes the eCryptfs file in the vm_ops->close() path.
    
    https://launchpad.net/bugs/870326
    
    Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
    Cc: stable@kernel.org [2.6.39+]
  5. eCryptfs: Prevent file create race condition

    Tyler Hicks authored
    The file creation path prematurely called d_instantiate() and
    unlock_new_inode() before the eCryptfs inode info was fully
    allocated and initialized and before the eCryptfs metadata was written
    to the lower file.
    
    This could result in race conditions in subsequent file and inode
    operations leading to unexpected error conditions or a null pointer
    dereference while attempting to use the unallocated memory.
    
    https://launchpad.net/bugs/813146
    
    Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
    Cc: stable@kernel.org
  6. @torvalds

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

    torvalds authored
    …/git/rostedt/linux-ktest
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
      ktest: Check parent options for iterated tests
  7. @torvalds

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

    torvalds authored
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c: Make i2cdev_notifier_call static
      i2c: Delete ANY_I2C_BUS
      i2c: Fix device name for 10-bit slave address
      i2c-algo-bit: Generate correct i2c address sequence for 10-bit target
  8. @torvalds

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

    torvalds authored
    …/git/broonie/regulator
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: TPS65910: Fix VDD1/2 voltage selector count
  9. @torvalds

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds authored
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
      drm: integer overflow in drm_mode_dirtyfb_ioctl()
      drivers/gpu/vga/vgaarb.c: add missing kfree
      drm/radeon/kms/atom: unify i2c gpio table handling
      drm/radeon/kms: fix up gpio i2c mask bits for r4xx for real
      ttm: Don't return the bo reserved on error path
      drm/radeon/kms: add a CS ioctl flag not to rewrite tiling flags in the CS
      drm/i915: Fix inconsistent backlight level during disabled
      drm, i915: Fix memory leak in i915_gem_busy_ioctl().
      drm/i915: Use DPCD value for max DP lanes.
      drm/i915: Initiate DP link training only on the lanes we'll be using
      drm/i915: Remove trailing white space
      drm/i915: Try harder during dp pattern 1 link training
      drm/i915: Make DP prepare/commit consistent with DP dpms
      drm/i915: Let panel power sequencing hardware do its job
      drm/i915: Treat PCH eDP like DP in most places
      drm/i915: Remove link_status field from intel_dp structure
      drm/i915: Move common PCH_PP_CONTROL setup to ironlake_get_pp_control
      drm/i915: Module parameters using '-1' as default must be signed type
      drm/i915: Turn on another required clock gating bit on gen6.
      drm/i915: Turn on a required 3D clock gating bit on Sandybridge.
      ...
  10. @broonie

    regulator: TPS65910: Fix VDD1/2 voltage selector count

    Afzal Mohammed authored broonie committed
    Count of selector voltage is required for regulator_set_voltage
    to work via set_voltage_sel. VDD1/2 currently have it as zero,
    so regulator_set_voltage won't work for VDD1/2.
    Update count (n_voltages) for VDD1/2.
    
    Output Voltage = (step value * 12.5 mV + 562.5 mV) * gain
    
    With above expr, number of voltages that can be selected is
    step value count * gain count
    
    constant for gain count will be called VDD1_2_NUM_VOLT_COARSE
    
    existing constant for step value count is VDD1_2_NUM_VOLTS,
    use VDD1_2_NUM_VOLT_FINE instead to make clear that step value
    is not the only component in deciding selectable voltage count
    
    Signed-off-by: Afzal Mohammed <afzal@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  11. i2c: Make i2cdev_notifier_call static

    Shubhrajyoti D authored Jean Delvare committed
    The function i2cdev_notifier_call is used only in i2c-dev file
    making it static.
    Also removes the following sparse warning
    
    drivers/i2c/i2c-dev.c:582:5: warning: symbol 'i2cdev_notifier_call'
    was not declared. Should it be static?
    
    Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  12. i2c: Delete ANY_I2C_BUS

    Jean Delvare authored Jean Delvare committed
    Last piece of code using ANY_I2C_BUS was deleted almost 2 years ago,
    so ANY_I2C_BUS can go away as well.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  13. i2c: Fix device name for 10-bit slave address

    Jean Delvare authored Jean Delvare committed
    10-bit addresses overlap with traditional 7-bit addresses, leading in
    device name collisions. Add an arbitrary offset to 10-bit addresses to
    prevent this collision. The offset was chosen so that the address is
    still easily recognizable.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
  14. @sjchu

    i2c-algo-bit: Generate correct i2c address sequence for 10-bit target

    sjchu authored Jean Delvare committed
    The wrong bits were put on the wire, fix that.
    
    This fixes kernel bug #42562.
    
    Signed-off-by: Sheng-Hui J. Chu <jeffchu@broadcom.com>
    Cc: stable@kernel.org
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  15. @xiw

    drm: integer overflow in drm_mode_dirtyfb_ioctl()

    xiw authored Dave Airlie committed
    There is a potential integer overflow in drm_mode_dirtyfb_ioctl()
    if userspace passes in a large num_clips.  The call to kmalloc would
    allocate a small buffer, and the call to fb->funcs->dirty may result
    in a memory corruption.
    
    Reported-by: Haogang Chen <haogangchen@gmail.com>
    Signed-off-by: Xi Wang <xi.wang@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Nov 22, 2011
  1. @torvalds

    Revert "of/irq: of_irq_find_parent: check for parent equal to child"

    torvalds authored
    This reverts commit dc93728.
    
    As requested by Ben Herrenschmidt:
      "This breaks some powerpc platforms at least.  The practice of having
       a node provide an explicit "interrupt-parent" property pointing to
       itself is an old trick that we've used in the past to allow a
       device-node to have interrupts routed to different controllers.
    
       In that case, the node also contains an interrupt-map, so the node is
       its own parent, the interrupt resolution hits the map, which then can
       route each individual interrupt to a different parent."
    
    Grant says:
      "Ah, nuts, yes that is broken then.  Yes, please revert the commit and
       Rob & I will come up with a better solution.
    
       Rob, I think it can be done by explicitly checking for np ==
       desc->interrupt_parent in of_irq_init() instead of relying on
       of_irq_find_parent() returning NULL."
    
    Requested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Cc: Rob Herring <rob.herring@calxeda.com>
    Cc: devicetree-discuss@lists.ozlabs.org
    Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
    Cc: Tanmay Inamdar <tinamdar@apm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

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

    torvalds authored
    …/git/viro/vfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      mount_subtree() pointless use-after-free
      iio: fix a leak due to improper use of anon_inode_getfd()
      microblaze: bury asm/namei.h
  3. @JuliaLawall

    drivers/gpu/vga/vgaarb.c: add missing kfree

    JuliaLawall authored Dave Airlie committed
    kbuf is a buffer that is local to this function, so all of the error paths
    leaving the function should release it.
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Cc: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  4. drm/radeon/kms/atom: unify i2c gpio table handling

    Alex Deucher authored Dave Airlie committed
    Split the quirks and i2c_rec assignment into separate
    functions used by both radeon_lookup_i2c_gpio() and
    radeon_atombios_i2c_init().  This avoids duplicating code
    and cases where quirks were only added to one of the
    functions.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  5. drm/radeon/kms: fix up gpio i2c mask bits for r4xx for real

    Alex Deucher authored Dave Airlie committed
    Fixes i2c test failures when i2c_algo_bit.bit_test=1.
    
    The hw doesn't actually require a mask, so just set it
    to the default mask bits for r1xx-r4xx radeon ddc.
    
    I missed this part the first time through.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@kernel.org
    Cc: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. ttm: Don't return the bo reserved on error path

    Thomas Hellstrom authored Dave Airlie committed
    An unlikely race could case a bo to be returned reserved on an error path.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keith…

    Dave Airlie authored
    …p/linux into drm-fixes
    
    * 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux: (25 commits)
      drm/i915: Fix inconsistent backlight level during disabled
      drm, i915: Fix memory leak in i915_gem_busy_ioctl().
      drm/i915: Use DPCD value for max DP lanes.
      drm/i915: Initiate DP link training only on the lanes we'll be using
      drm/i915: Remove trailing white space
      drm/i915: Try harder during dp pattern 1 link training
      drm/i915: Make DP prepare/commit consistent with DP dpms
      drm/i915: Let panel power sequencing hardware do its job
      drm/i915: Treat PCH eDP like DP in most places
      drm/i915: Remove link_status field from intel_dp structure
      drm/i915: Move common PCH_PP_CONTROL setup to ironlake_get_pp_control
      drm/i915: Module parameters using '-1' as default must be signed type
      drm/i915: Turn on another required clock gating bit on gen6.
      drm/i915: Turn on a required 3D clock gating bit on Sandybridge.
      drm/i915: enable cacheable objects on Ivybridge
      drm/i915: add constants to size fence arrays and fields
      drm/i915: Ivybridge still has fences!
      drm/i915: forcewake warning fixes in debugfs
      drm/i915: Fix object refcount leak on mmappable size limit error path.
      drm/i915: Use mode_config.mutex in ironlake_panel_vdd_work
      ...
  8. mount_subtree() pointless use-after-free

    Al Viro authored
    d'oh... we'd carefully pinned mnt->mnt_sb down, dropped mnt and attempt
    to grab s_umount on mnt->mnt_sb.  The trouble is, *mnt might've been
    overwritten by now...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  9. @torvalds

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

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: ams_delta_serio - include linux/module.h
      Input: elantech - adjust hw_version detection logic
      Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists
  10. @torvalds

    Merge git://www.linux-watchdog.org/linux-watchdog

    torvalds authored
    * git://www.linux-watchdog.org/linux-watchdog:
      watchdog: fix initialisation printout in s3c2410_wdt
      watchdog: Don't overwrite error value in wm831x_wdt_set_timeout()
      watchdog: adx_wdt.c: remove driver
  11. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/l…

    torvalds authored
    …inux-nfs
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
      NFS: Revert pnfs ugliness from the generic NFS read code path
      SUNRPC: destroy freshly allocated transport in case of sockaddr init error
      NFS: Fix a regression in the referral code
      nfs: move nfs_file_operations declaration to bottom of file.c (try #2)
      nfs: when attempting to open a directory, fall back on normal lookup (try #5)
  12. @torvalds

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

    torvalds authored
    …/git/mason/linux-btrfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: remove free-space-cache.c WARN during log replay
      Btrfs: sectorsize align offsets in fiemap
      Btrfs: clear pages dirty for io and set them extent mapped
      Btrfs: wait on caching if we're loading the free space cache
      Btrfs: prefix resize related printks with btrfs:
      btrfs: fix stat blocks accounting
      Btrfs: avoid unnecessary bitmap search for cluster setup
      Btrfs: fix to search one more bitmap for cluster setup
      btrfs: mirror_num should be int, not u64
      btrfs: Fix up 32/64-bit compatibility for new ioctls
      Btrfs: fix barrier flushes
      Btrfs: fix tree corruption after multi-thread snapshots and inode_cache flush
  13. @torvalds

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

    torvalds authored
    …nux/kernel/git/wfg/linux
    
    * 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
      writeback: remove vm_dirties and task->dirties
      writeback: hard throttle 1000+ dd on a slow USB stick
      mm: Make task in balance_dirty_pages() killable
  14. @torvalds

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

    torvalds authored
    …rnel/git/gregkh/staging
    
    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      staging: fix more ET131X build errors
      staging: et131x depends on NET
      staging: slicoss depends on NET
      linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled
Something went wrong with that request. Please try again.