1. 01 7月, 2009 36 次提交
  2. 30 6月, 2009 4 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · 5a4f13fa
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ioctl HDIO_OBSOLETE_IDENTITY
        ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y
        ide-cd: handle fragmented packet commands gracefully
        ide: always kill the whole request on error
        ide: fix ide_kill_rq() for special ide-{floppy,tape} driver requests
      5a4f13fa
    • C
      ide: memory overrun in ide_get_identity_ioctl() on big endian machines using... · e18ed145
      Christian Engelmayer 提交于
      ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ioctl HDIO_OBSOLETE_IDENTITY
      
      This patch fixes a memory overrun in function ide_get_identity_ioctl() which
      chooses the size of a memory buffer depending on the ioctl command that led
      to the function call, however, passes that buffer to a function which needs the
      buffer size to be always chosen unconditionally.
      
      Due to conditional compilation the memory overrun can only happen on big endian
      machines. The error can be triggered using ioctl HDIO_OBSOLETE_IDENTITY. Usage
      of ioctl HDIO_GET_IDENTITY is safe.
      Signed-off-by: NChristian Engelmayer <christian.engelmayer@frequentis.com>
      Acked-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e18ed145
    • B
      ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y · 2bf427b2
      Bartlomiej Zolnierkiewicz 提交于
      commit 2f0d0fd2 ("ide-acpi: cleanup
      do_drive_get_GTF()") didn't account for the lack of hwif->acpidata
      check in generic_ide_suspend() [ indirect user of do_drive_get_GTF()
      through ide_acpi_exec_tfs() ] resulting in broken resume when ACPI
      support is enabled but ACPI data is unavailable.
      
      Fix it by adding ide_port_acpi() helper for checking if port needs
      ACPI handling and cleaning generic_ide_{suspend,resume}() to use it
      instead of hiding hwif->acpidata and ide_noacpi checks in IDE ACPI
      helpers (this should help in preventing similar bugs in the future).
      
      While at it:
      - kill superfluous debugging printks in ide_acpi_{get,push}_timing()
      Reported-and-tested-by: NEtienne Basset <etienne.basset@numericable.fr>
      Also-reported-and-tested-by: NJeff Chua <jeff.chua.linux@gmail.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2bf427b2
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · ec9c45d4
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
        [ARM] 5562/2: at91: add gpio button support for at91sam9g20ek
        [ARM] 5563/1: at91: at91sam9rlek lcd interface correction
        [ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script
        [ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQ
        [ARM] GTA02: build fixes (s3c2410_nand_set usage)
        [ARM] MINI2440: Add missing flash_bbt flat to NAND
        [ARM] s3c2410_defconfig: add MINI2440 machine to build
        [ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
        [ARM] S3C24XX: Fix missing s3c_iis_device.
        [ARM] MINI2440: remove duplicated #include
        [ARM] S3C24XX: Fix spi-bus configuration build errors
        OMAP: Fix IOMEM macro for assembly
        [ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORT
        [ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWM
        OMAP2/3: Initialize gpio debounce register
        OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry
        OMAP3: RX51: Use OneNAND sync read / write
        OMAP2/3: gpmc-onenand: correct use of async timings
        OMAP3: DMA: Enable idlemodes for DMA OCP
        OMAP3: SRAM size fix for HS/EMU devices
        ...
      ec9c45d4