1. 16 1月, 2012 3 次提交
  2. 15 1月, 2012 19 次提交
    • R
      UBI: use own macros for the layout volume · 1f4f4347
      Richard Weinberger 提交于
      This is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and
      UBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -
      use them.
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      1f4f4347
    • R
      UBI: fix nameless volumes handling · 4a59c797
      Richard Weinberger 提交于
      Currently it's possible to create a volume without a name. E.g:
      ubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N ""
      
      After that vtbl_check() will always fail because it does not permit
      empty strings.
      
      Cc: stable@kernel.org
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      4a59c797
    • D
      UBIFS: fix non-debug configuration build · e234b5f2
      Dominique Martinet 提交于
      Fix a brown paperbag bug introduced by me in the previous commit. I was
      in hurry and forgot about the non-debug case completely.
      
      Artem: amend the commit message and tweak the patch to preserve alignment.
             This made the patch a bit less readable, though.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      e234b5f2
    • L
      Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security · c49c41a4
      Linus Torvalds 提交于
      * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security:
        capabilities: remove __cap_full_set definition
        security: remove the security_netlink_recv hook as it is equivalent to capable()
        ptrace: do not audit capability check when outputing /proc/pid/stat
        capabilities: remove task_ns_* functions
        capabitlies: ns_capable can use the cap helpers rather than lsm call
        capabilities: style only - move capable below ns_capable
        capabilites: introduce new has_ns_capabilities_noaudit
        capabilities: call has_ns_capability from has_capability
        capabilities: remove all _real_ interfaces
        capabilities: introduce security_capable_noaudit
        capabilities: reverse arguments to security_capable
        capabilities: remove the task from capable LSM hook entirely
        selinux: sparse fix: fix several warnings in the security server cod
        selinux: sparse fix: fix warnings in netlink code
        selinux: sparse fix: eliminate warnings for selinuxfs
        selinux: sparse fix: declare selinux_disable() in security.h
        selinux: sparse fix: move selinux_complete_init
        selinux: sparse fix: make selinux_secmark_refcount static
        SELinux: Fix RCU deref check warning in sel_netport_insert()
      
      Manually fix up a semantic mis-merge wrt security_netlink_recv():
      
       - the interface was removed in commit fd778461 ("security: remove
         the security_netlink_recv hook as it is equivalent to capable()")
      
       - a new user of it appeared in commit a38f7907 ("crypto: Add
         userspace configuration API")
      
      causing no automatic merge conflict, but Eric Paris pointed out the
      issue.
      c49c41a4
    • L
      Merge tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux · 892d208b
      Linus Torvalds 提交于
      Kmemleak patches
      
      Main features:
      - Handle percpu memory allocations (only scanning them, not actually
        reporting).
      - Memory hotplug support.
      
      Usability improvements:
      - Show the origin of early allocations.
      - Report previously found leaks even if kmemleak has been disabled by
        some error.
      
      * tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:
        kmemleak: Add support for memory hotplug
        kmemleak: Handle percpu memory allocation
        kmemleak: Report previously found leaks even after an error
        kmemleak: When the early log buffer is exceeded, report the actual number
        kmemleak: Show where early_log issues come from
      892d208b
    • L
      Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers · dca88ad6
      Linus Torvalds 提交于
      * 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
        UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
        UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
        UAPI: Make linux/patchkey.h easier to parse
        UAPI: Fix nested __KERNEL__ guards in video/edid.h
        UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
        UAPI: Guard linux/cuda.h
        UAPI: Guard linux/pmu.h
        UAPI: Guard linux/isdn_divertif.h
        UAPI: Guard linux/sound.h
        UAPI: Rearrange definition of HZ in asm-generic/param.h
        UAPI: Make FRV use asm-generic/param.h
        UAPI: Make M32R use asm-generic/param.h
        UAPI: Make MN10300 use asm-generic/param.h
        UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
        UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
        UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
      dca88ad6
    • M
      fsnotify: don't BUG in fsnotify_destroy_mark() · fed47485
      Miklos Szeredi 提交于
      Removing the parent of a watched file results in "kernel BUG at
      fs/notify/mark.c:139".
      
      To reproduce
      
        add "-w /tmp/audit/dir/watched_file" to audit.rules
        rm -rf /tmp/audit/dir
      
      This is caused by fsnotify_destroy_mark() being called without an
      extra reference taken by the caller.
      
      Reported by Francesco Cosoleto here:
      
        https://bugzilla.novell.com/show_bug.cgi?id=689860
      
      Fix by removing the BUG_ON and adding a comment about not accessing mark after
      the iput.
      Signed-off-by: NMiklos Szeredi <mszeredi@suse.cz>
      CC: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fed47485
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig · 1e6c4dfd
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
        kconfig/streamline-config.pl: Fix parsing Makefile with variables
        kconfig/streamline-config.pl: Simplify backslash line concatination
      1e6c4dfd
    • L
      Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 · 51be0841
      Linus Torvalds 提交于
      * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
        module_param: make bool parameters really bool (drivers/video/i810)
        Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
        OMAPDSS: HDMI: Disable DDC internal pull up
        OMAPDSS: HDMI: Move duplicate code from boardfile
        OMAPDSS: add OrtusTech COM43H4M10XTC display support
        OMAP: DSS2: Support for UMSH-8173MD TFT panel
        ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
        OMAPDSS: HDMI: Create function to enable HDMI audio
        ASoC: OMAP: HDMI: Correct signature of ASoC functions
        ASoC: OMAP: HDMI: Introduce driver data for audio codec
        grvga: fix section mismatch warnings
        video: s3c-fb: Don't keep device runtime active when open
        video: s3c-fb: Hold runtime PM references when touching registers
        video: s3c-fb: Take a runtime PM reference when unblanked
        video: s3c-fb: Disable runtime PM in error paths from probe
        video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
        video: s3c-fb: Make runtime PM functional again
        drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
        drivers/video: fsl-diu-fb: add default platform ops functions
        drivers/video: fsl-diu-fb: remove broken reference count enabling the display
        ...
      51be0841
    • P
      dm: do not forward ioctls from logical volumes to the underlying device · ec8013be
      Paolo Bonzini 提交于
      A logical volume can map to just part of underlying physical volume.
      In this case, it must be treated like a partition.
      
      Based on a patch from Alasdair G Kergon.
      
      Cc: Alasdair G Kergon <agk@redhat.com>
      Cc: dm-devel@redhat.com
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ec8013be
    • P
      block: fail SCSI passthrough ioctls on partition devices · 0bfc96cb
      Paolo Bonzini 提交于
      Linux allows executing the SG_IO ioctl on a partition or LVM volume, and
      will pass the command to the underlying block device.  This is
      well-known, but it is also a large security problem when (via Unix
      permissions, ACLs, SELinux or a combination thereof) a program or user
      needs to be granted access only to part of the disk.
      
      This patch lets partitions forward a small set of harmless ioctls;
      others are logged with printk so that we can see which ioctls are
      actually sent.  In my tests only CDROM_GET_CAPABILITY actually occurred.
      Of course it was being sent to a (partition on a) hard disk, so it would
      have failed with ENOTTY and the patch isn't changing anything in
      practice.  Still, I'm treating it specially to avoid spamming the logs.
      
      In principle, this restriction should include programs running with
      CAP_SYS_RAWIO.  If for example I let a program access /dev/sda2 and
      /dev/sdb, it still should not be able to read/write outside the
      boundaries of /dev/sda2 independent of the capabilities.  However, for
      now programs with CAP_SYS_RAWIO will still be allowed to send the
      ioctls.  Their actions will still be logged.
      
      This patch does not affect the non-libata IDE driver.  That driver
      however already tests for bd != bd->bd_contains before issuing some
      ioctl; it could be restricted further to forbid these ioctls even for
      programs running with CAP_SYS_ADMIN/CAP_SYS_RAWIO.
      
      Cc: linux-scsi@vger.kernel.org
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: James Bottomley <JBottomley@parallels.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      [ Make it also print the command name when warning - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0bfc96cb
    • P
      block: add and use scsi_blk_cmd_ioctl · 577ebb37
      Paolo Bonzini 提交于
      Introduce a wrapper around scsi_cmd_ioctl that takes a block device.
      
      The function will then be enhanced to detect partition block devices
      and, in that case, subject the ioctls to whitelisting.
      
      Cc: linux-scsi@vger.kernel.org
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: James Bottomley <JBottomley@parallels.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      577ebb37
    • L
      Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 81d48f0a
      Linus Torvalds 提交于
      2nd set of device tree changes and SPI bug fixes for v3.3
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of/irq: Add interrupts-names property to name an irq resource
        of/address: Add reg-names property to name an iomem resource
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        spi/tegra: depend instead of select TEGRA_SYSTEM_DMA
      81d48f0a
    • L
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 · f5e4e20f
      Linus Torvalds 提交于
      2nd round of GPIO changes for v3.3 merge window
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion
        gpio: pl061: remove combined interrupt
        gpio: pl061: convert to use generic irq chip
        GPIO: add bindings for managed devices
        ARM: realview: convert pl061 no irq to 0 instead of -1
        gpio: pl061: convert to use 0 for no irq
        gpio: pl061: use chained_irq_* functions in irq handler
        GPIO/pl061: Add suspend resume capability
        drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
      f5e4e20f
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 4964e066
      Linus Torvalds 提交于
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
        MIPS: Delete unused function add_temporary_entry.
        MIPS: Set default pci cache line size.
        MIPS: Flush huge TLB
        MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
        MIPS: Octeon: Add support for OCTEON II PCIe
        MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
        MIPS: Alchemy: Update cpu-feature-overrides
        MIPS: Alchemy: db1200: Improve PB1200 detection.
        MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
        MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
        MIPS: Alchemy: irq: register pm at irq init time
        MIPS: Alchemy: Touchscreen support on DB1100
        MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
        net/irda: convert au1k_ir to platform driver.
        MIPS: Alchemy: remove unused board headers
        MTD: nand: make au1550nd.c a platform_driver
        MIPS: Netlogic: Mark Netlogic chips as SMT capable
        MIPS: Netlogic: Add support for XLP 3XX cores
        MIPS: Netlogic: Merge some of XLR/XLP wakup code
        MIPS: Netlogic: Add default XLP config.
        ...
      
      Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
      traps.c} and drivers/tty/serial/Makefile
      4964e066
    • L
      Merge tag 'for-linus' of git://github.com/rustyrussell/linux · 0a80939b
      Linus Torvalds 提交于
      Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1
      
      * tag 'for-linus' of git://github.com/rustyrussell/linux:
        module_param: check that bool parameters really are bool.
        intelfbdrv.c: bailearly is an int module_param
        paride/pcd: fix bool verbose module parameter.
        module_param: make bool parameters really bool (drivers & misc)
        module_param: make bool parameters really bool (arch)
        module_param: make bool parameters really bool (core code)
        kernel/async: remove redundant declaration.
        printk: fix unnecessary module_param_name.
        lirc_parallel: fix module parameter description.
        module_param: avoid bool abuse, add bint for special cases.
        module_param: check type correctness for module_param_array
        modpost: use linker section to generate table.
        modpost: use a table rather than a giant if/else statement.
        modules: sysfs - export: taint, coresize, initsize
        kernel/params: replace DEBUGP with pr_debug
        module: replace DEBUGP with pr_debug
        module: struct module_ref should contains long fields
        module: Fix performance regression on modules with large symbol tables
        module: Add comments describing how the "strmap" logic works
      
      Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
      generated table approach to adding __mod_*_device_table entries.  The
      ARM sa11x0 mcp bus needed to be converted to that too.
      0a80939b
    • L
      Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux · 0b48d422
      Linus Torvalds 提交于
      * 'for-3.3' of git://linux-nfs.org/~bfields/linux: (31 commits)
        nfsd4: nfsd4_create_clid_dir return value is unused
        NFSD: Change name of extended attribute containing junction
        svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
        svcrpc: fix double-free on shutdown of nfsd after changing pool mode
        nfsd4: be forgiving in the absence of the recovery directory
        nfsd4: fix spurious 4.1 post-reboot failures
        NFSD: forget_delegations should use list_for_each_entry_safe
        NFSD: Only reinitilize the recall_lru list under the recall lock
        nfsd4: initialize special stateid's at compile time
        NFSd: use network-namespace-aware cache registering routines
        SUNRPC: create svc_xprt in proper network namespace
        svcrpc: update outdated BKL comment
        nfsd41: allow non-reclaim open-by-fh's in 4.1
        svcrpc: avoid memory-corruption on pool shutdown
        svcrpc: destroy server sockets all at once
        svcrpc: make svc_delete_xprt static
        nfsd: Fix oops when parsing a 0 length export
        nfsd4: Use kmemdup rather than duplicating its implementation
        nfsd4: add a separate (lockowner, inode) lookup
        nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error
        ...
      0b48d422
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 8e63dd6e
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit
        powerpc: Fix RCU idle and hcall tracing
      8e63dd6e
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · f88609a0
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        MAINTAINERS: List i2c-omap and i2c-davinci drivers
        MAINTAINERS: i2c: Add third maintainer
        i2c/gpio-i2cmux: Convert to use module_platform_driver()
        i2c/busses: Use module_platform_driver()
        i2c-dev: Use memdup_user
        i2c: Convert to DEFINE_PCI_DEVICE_TABLE
        i2c-ali1535: enable SPARC support
        i2c: Fix error value returned by several bus drivers
      f88609a0
  3. 14 1月, 2012 14 次提交
  4. 13 1月, 2012 4 次提交