1. 30 1月, 2014 21 次提交
  2. 29 1月, 2014 19 次提交
    • J
      fanotify: Fix use after free for permission events · 85816794
      Jan Kara 提交于
      Currently struct fanotify_event_info has been destroyed immediately
      after reporting its contents to userspace. However that is wrong for
      permission events because those need to stay around until userspace
      provides response which is filled back in fanotify_event_info. So change
      to code to free permission events only after we have got the response
      from userspace.
      Reported-and-tested-by: NJiri Kosina <jkosina@suse.cz>
      Reported-and-tested-by: NDave Jones <davej@fedoraproject.org>
      Signed-off-by: NJan Kara <jack@suse.cz>
      85816794
    • J
      fsnotify: Do not return merged event from fsnotify_add_notify_event() · 83c0e1b4
      Jan Kara 提交于
      The event returned from fsnotify_add_notify_event() cannot ever be used
      safely as the event may be freed by the time the function returns (after
      dropping notification_mutex). So change the prototype to just return
      whether the event was added or merged into some existing event.
      Reported-and-tested-by: NJiri Kosina <jkosina@suse.cz>
      Reported-and-tested-by: NDave Jones <davej@fedoraproject.org>
      Signed-off-by: NJan Kara <jack@suse.cz>
      83c0e1b4
    • J
      fanotify: Fix use after free in mask checking · 13116dfd
      Jan Kara 提交于
      We cannot use the event structure returned from
      fsnotify_add_notify_event() because that event can be freed by the time
      that function returns. Use the mask argument passed into the event
      handler directly instead. This also fixes a possible problem when we
      could unnecessarily wait for permission response for a normal fanotify
      event which got merged with a permission event.
      
      We also disallow merging of permission event with any other event so
      that we know the permission event which we just created is the one on
      which we should wait for permission response.
      Reported-and-tested-by: NJiri Kosina <jkosina@suse.cz>
      Reported-and-tested-by: NDave Jones <davej@fedoraproject.org>
      Signed-off-by: NJan Kara <jack@suse.cz>
      13116dfd
    • D
      a54983ae
    • P
      sparc: don't use module_init in non-modular pci.c code · 1b925b57
      Paul Gortmaker 提交于
      The pci.o is built for SPARC64_PCI -- which is bool, and hence
      this code is either present or absent.  It will never be modular,
      so using module_init as an alias for __initcall can be somewhat
      misleading.
      
      Fix this up now, so that we can relocate module_init from
      init.h into module.h in the future.  If we don't do this, we'd
      have to add module.h to obviously non-modular code, and that
      would be a worse thing.
      
      Note that direct use of __initcall is discouraged, vs. one
      of the priority categorized subgroups.  As __initcall gets
      mapped onto device_initcall, our use of device_initcall
      directly in this change means that the runtime impact is
      zero -- it will remain at level 6 in initcall ordering.
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1b925b57
    • P
      sparc: delete non-required instances of include <linux/init.h> · 8b2abcbc
      Paul Gortmaker 提交于
      None of these files are actually using any __init type directives
      and hence don't need to include <linux/init.h>.  Most are just a
      left over from __devinit and __cpuinit removal, or simply due to
      code getting copied from one driver to the next.
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b2abcbc
    • R
      drivers: ide: Include appropriate header file in ide-pio-blacklist.c · 61eae5bb
      Rashika Kheria 提交于
      Include appropriate header file include/linux/ide.h in file
      ide-pio-blacklist.c because function ide_scan_pio_blacklist() has it's
      prototype declaration in include/linux/ide.h.
      
      This eliminates the following warning in ide-pio-blacklist.c:
      drivers/ide/ide-pio-blacklist.c:85:5: warning: no previous prototype for ‘ide_scan_pio_blacklist’ [-Wmissing-prototypes]
      Signed-off-by: NRashika Kheria <rashika.kheria@gmail.com>
      Reviewed-by: NJosh Triplett <josh@joshtriplett.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      61eae5bb
    • R
      drivers: ide: Include appropriate header file in ide-cd_verbose.c · dfea4aa2
      Rashika Kheria 提交于
      Include appropriate header file ide-cd.h in ide-cd_verbose.c because
      function ide_cd_log_error() has its prototype declaration in ide-cd.h.
      Also, include linux/ide.h because it contains certain declarations
      necessary for including ide-cd.h.
      
      This eliminates the following warnings in ide-cd_verbose.c:
      drivers/ide/ide-cd_verbose.c:251:6: warning: no previous prototype for ‘ide_cd_log_error’ [-Wmissing-prototypes]
      Signed-off-by: NRashika Kheria <rashika.kheria@gmail.com>
      Reviewed-by: NJosh Triplett <josh@joshtriplett.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dfea4aa2
    • L
      Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd · 0e47c969
      Linus Torvalds 提交于
      Pull MTD updates from Brian Norris:
       - Add me (Brian Norris) as an additional MTD maintainer (it'd be nice to get
         David's "ack" for this; I'm sure he approves, but he's been pretty silent
         lately)
       - Add Ezequiel Garcie as maintainer for the pxa3xx NAND driver
       - Last (?) round of pxa3xx improvements for supporting Armada 370/XP
       - Typical churn in driver boilerplate (OOM messages, printk()'s, devm_*, etc.)
       - Quad read mode support for SPI NOR driver (m25p80)
       - Update Davinci NAND driver to prepare for use on new platforms
       - Begin to kill off NAND_MAX_{PAGE,OOB}SIZE macros; more work is pending
       - Miscellaneous NAND device support (new IDs)
       - Add READ RETRY support for Micron MLC NAND
       - Support new GPMI NAND ECC layout device-tree binding
       - Avoid mapping stack/vmalloc() memory for GPMI NAND DMA
      
      * tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd: (151 commits)
        mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf
        mtd: gpmi: allocate a proper buffer for non ECC read/write
        mtd: m25p80: Set rx_nbits for Quad SPI transfers
        mtd: m25p80: Enable Quad SPI read transfers for s25fl512s
        mtd: s3c2410: Merge plat/regs-nand.h into s3c2410.c
        mtd: mtdram: add missing 'const'
        mtd: m25p80: assign default read command
        mtd: nuc900_nand: remove redundant return value check of platform_get_resource()
        mtd: plat_nand: remove redundant return value check of platform_get_resource()
        mtd: nand: add Intel manufacturer ID
        mtd: nand: add SanDisk manufacturer ID
        mtd: nand: add support for Samsung K9LCG08U0B
        mtd: nand: pxa3xx: Add support for 2048 bytes page size devices
        mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing
        mtd: nand: don't use {read,write}_buf for 8-bit transfers
        mtd: nand: use __packed shorthand
        mtd: nand: support Micron READ RETRY
        mtd: nand: add generic READ RETRY support
        mtd: nand: add ONFI vendor block for Micron
        mtd: nand: localize ECC failures per page
        ...
      0e47c969
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · 268943fb
      Linus Torvalds 提交于
      Pull LED subsystem update from Bryan Wu:
       "Basically this cycle is mostly cleanup for LED subsystem"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: s3c24xx: Remove hardware.h inclusion
        leds: replace list_for_each with list_for_each_entry
        leds: kirkwood: Cleanup in header files
        leds: pwm: Remove a warning on non-DT platforms
        leds: leds-pwm: fix duty time overflow.
        leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock
        leds: leds-mc13783: Remove duplicate field in platform data
        drivers: leds: leds-tca6507: check CONFIG_GPIOLIB whether defined for 'gpio_base'
        leds: lp5523: Support LED MUX configuration on running a pattern
        leds: lp5521/5523: Fix multiple engine usage bug
        LEDS: tca6507 - fix up some comments.
        LEDS: tca6507: add device-tree support for GPIO configuration.
        LEDS: tca6507 - fix bugs in parsing of device-tree configuration.
      268943fb
    • L
      Merge tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 2ad48ee8
      Linus Torvalds 提交于
      Pull serial fixes from Greg KH:
       "Here are tiny and assorted serial driver fixes that have been in a
        branch in my tree for a while and somehow did not get properly merged
        into my big TTY / Serial pull request for 3.14-rc1.  Sorry about that.
      
        All have been in linux-next for a while with no issues"
      
      * tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: xuartps: Properly guard sysrq specific code
        serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip
        serial: icom: dereference after free in load_code()
        serial: 8250_dw: add new ACPI IDs
        tty: serial: pch: don't crash if DMA enabled but not loaded
        serial: samsung: move clock deactivation below uart registration
      2ad48ee8
    • L
      Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette/linux · d30492ad
      Linus Torvalds 提交于
      Pull more clock framework changes from Mike Turquette:
       "The second half of the clock framework pull requeust for 3.14 is
        dominated by platform support for Qualcomm's MSM SoCs, DT binding
        updates for TI's OMAP-ish processors and additional support for
        Samsung chips.
      
        Additionally there are other smaller clock driver changes and several
        last minute fixes.  This pull request also includes the HiSilicon
        support that depends on the already-merged arm-soc pull request"
      
      [ Fix up stupid compile error in the source tree with evil merge  - Grumpy Linus ]
      
      * tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette/linux: (49 commits)
        clk: sort Makefile
        clk: sunxi: fix overflow when setting up divided factors
        clk: Export more clk-provider functions
        dt-bindings: qcom: Fix warning with duplicate dt define
        clk: si5351: remove variant from platform_data
        clk: samsung: Remove unneeded semicolon
        clk: qcom: Fix modular build
        ARM: OMAP3: use DT clock init if DT data is available
        ARM: AM33xx: remove old clock data and link in new clock init code
        ARM: AM43xx: Enable clock init
        ARM: OMAP: DRA7: Enable clock init
        ARM: OMAP4: remove old clock data and link in new clock init code
        ARM: OMAP2+: io: use new clock init API
        ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT
        ARM: OMAP3: hwmod: initialize clkdm from clkdm_name
        ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm
        ARM: OMAP2+: clock: use driver API instead of direct memory read/write
        ARM: OMAP2+: clock: add support for indexed memmaps
        ARM: dts: am43xx clock data
        ARM: dts: AM35xx: use DT clock data
        ...
      d30492ad
    • L
      Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs · f1499382
      Linus Torvalds 提交于
      Pull second xfs update from Ben Myers:
       "Allow logical sector sized direct io on 'advanced format' 4k/512 disk"
      
      * tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs:
        xfs: allow logical-sector sized O_DIRECT
        xfs: rename xfs_buftarg structure members
        xfs: clean up xfs_buftarg
      f1499382
    • L
      ceph: Fix up after semantic merge conflict · 4db658ea
      Linus Torvalds 提交于
      The previous ceph-client merge resulted in ceph not even building,
      because there was a merge conflict that wasn't visible as an actual data
      conflict: commit 7221fe4c ("ceph: add acl for cephfs") added support
      for POSIX ACL's into Ceph, but unluckily we also had the VFS tree change
      a lot of the POSIX ACL helper functions to be much more helpful to
      filesystems (see for example commits 2aeccbe9 "fs: add generic
      xattr_acl handlers", 5bf3258f "fs: make posix_acl_chmod more useful"
      and 37bc1539 "fs: make posix_acl_create more useful")
      
      The reason this conflict wasn't obvious was many-fold: because it was a
      semantic conflict rather than a data conflict, it wasn't visible in the
      git merge as a conflict.  And because the VFS tree hadn't been in
      linux-next, people hadn't become aware of it that way.  And because I
      was at jury duty this morning, I was using my laptop and as a result not
      doing constant "allmodconfig" builds.
      
      Anyway, this fixes the build and generally removes a fair chunk of the
      Ceph POSIX ACL support code, since the improved helpers seem to match
      really well for Ceph too.  But I don't actually have any way to *test*
      the end result, and I was really hoping for some ACK's for this.  Oh,
      well.
      
      Not compiling certainly doesn't make things easier to test, so I'm
      committing this without the acks after having waited for four hours...
      Plus it's what I would have done for the merge had I noticed the
      semantic conflict..
      Reported-by: NDave Jones <davej@redhat.com>
      Cc: Sage Weil <sage@inktank.com>
      Cc: Guangliang Zhao <lucienchao@gmail.com>
      Cc: Li Wang <li.wang@ubuntykylin.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4db658ea
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · d891ea23
      Linus Torvalds 提交于
      Pull ceph updates from Sage Weil:
       "This is a big batch.  From Ilya we have:
      
         - rbd support for more than ~250 mapped devices (now uses same scheme
           that SCSI does for device major/minor numbering)
         - crush updates for new mapping behaviors (will be needed for coming
           erasure coding support, among other things)
         - preliminary support for tiered storage pools
      
        There is also a big series fixing a pile cephfs bugs with clustered
        MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
        fscache improvements from Li Wang, improved behavior when we get
        ENOSPC from Josh Durgin, some readv/writev improvements from
        Majianpeng, and the usual mix of small cleanups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
        ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
        ceph: fix dout() compile warnings in ceph_filemap_fault()
        libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
        libceph: follow redirect replies from osds
        libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
        libceph: follow {read,write}_tier fields on osd request submission
        libceph: add ceph_pg_pool_by_id()
        libceph: CEPH_OSD_FLAG_* enum update
        libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
        libceph: introduce and start using oid abstraction
        libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
        libceph: move ceph_file_layout helpers to ceph_fs.h
        libceph: start using oloc abstraction
        libceph: dout() is missing a newline
        libceph: add ceph_kv{malloc,free}() and switch to them
        libceph: support CEPH_FEATURE_EXPORT_PEER
        ceph: add imported caps when handling cap export message
        ceph: add open export target session helper
        ceph: remove exported caps when handling cap import message
        ceph: handle session flush message
        ...
      d891ea23
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 08d21b5f
      Linus Torvalds 提交于
      Pull exofs and ore fixes from Boaz Harrosh:
       "The main fix here, the first patch, is also destined for -stable.  The
        rest is small trivia and cosmetics.  The ORE patches effect both exofs
        and pnfs-objects very reproducible bugs"
      
      [ ORE is "object raid engine", used by exofs and pnfs  - Linus ]
      
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Print less in r4w
        exofs: Allow corrupted directory entry to be empty file
        exofs: Allow O_DIRECT open
        ore: Don't crash on NULL bio in _clear_bio
        ore: Fix wrong math in allocation of per device BIO
      08d21b5f
    • I
      ceph: cast PAGE_SIZE to size_t in ceph_sync_write() · 125d725c
      Ilya Dryomov 提交于
      Use min_t(size_t, ...) instead of plain min(), which does strict type
      checking, to avoid compile warning on i386.
      
      Cc: Jianpeng Ma <majianpeng@gmail.com>
      Signed-off-by: NIlya Dryomov <ilya.dryomov@inktank.com>
      Reviewed-by: NSage Weil <sage@inktank.com>
      125d725c
    • I
      ceph: fix dout() compile warnings in ceph_filemap_fault() · 37b52fe6
      Ilya Dryomov 提交于
      PAGE_CACHE_SIZE is unsigned long on all architectures, however size_t
      is either unsigned int or unsigned long.  Rather than change format
      strings, cast PAGE_CACHE_SIZE to size_t to be in line with dout()s in
      ceph_page_mkwrite().
      
      Cc: Yan, Zheng <zheng.z.yan@intel.com>
      Signed-off-by: NIlya Dryomov <ilya.dryomov@inktank.com>
      Reviewed-by: NSage Weil <sage@inktank.com>
      37b52fe6
    • L
      Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 627f4b3e
      Linus Torvalds 提交于
      Pull microblaze patches from Michal Simek:
       - add CCF support
       - fix BS=0 compilation
       - wire up defconfig
       - some minor cleanups and fixes
      
      * tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Add missing v8.50.a version
        microblaze: Fix missing bracket in printk
        microblaze: Fix compilation error for BS=0
        microblaze: Disable stack protection from bootloader
        microblaze: Define read/write{b,w,l}_relaxed MMIO
        microblaze: timer: Do not initialized system timer twice
        microblaze: timer: Use generic sched_clock implementation
        microblaze: Add NOTES section to linker script
        microblaze: Add support for CCF
        microblaze: Simplify fcpu helper function
        microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h>
        microblaze: Remove duplicate declarations of _stext[] and _etext[]
        microblaze: Remove _fdt_start casts
        microblaze: Wire up defconfig to mmu_defconfig
      627f4b3e