1. 08 8月, 2013 2 次提交
    • L
      Merge tag 'trace-fixes-3.11-rc3' of... · b7bc9e7d
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Oleg Nesterov has been working hard in closing all the holes that can
        lead to race conditions between deleting an event and accessing an
        event debugfs file.  This included a fix to the debugfs system (acked
        by Greg Kroah-Hartman).  We think that all the holes have been patched
        and hopefully we don't find more.  I haven't marked all of them for
        stable because I need to examine them more to figure out how far back
        some of the changes need to go.
      
        Along the way, some other fixes have been made.  Alexander Z Lam fixed
        some logic where the wrong buffer was being modifed.
      
        Andrew Vagin found a possible corruption for machines that actually
        allocate cpumask, as a reference to one was being zeroed out by
        mistake.
      
        Dhaval Giani found a bad prototype when tracing is not configured.
      
        And I not only had some changes to help Oleg, but also finally fixed a
        long standing bug that Dave Jones and others have been hitting, where
        a module unload and reload can cause the function tracing accounting
        to get screwed up"
      
      * tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix reset of time stamps during trace_clock changes
        tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer
        tracing: Fix trace_dump_stack() proto when CONFIG_TRACING is not set
        tracing: Fix fields of struct trace_iterator that are zeroed by mistake
        tracing/uprobes: Fail to unregister if probe event files are in use
        tracing/kprobes: Fail to unregister if probe event files are in use
        tracing: Add comment to describe special break case in probe_remove_event_call()
        tracing: trace_remove_event_call() should fail if call/file is in use
        debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
        ftrace: Check module functions being traced on reload
        ftrace: Consolidate some duplicate code for updating ftrace ops
        tracing: Change remove_event_file_dir() to clear "d_subdirs"->i_private
        tracing: Introduce remove_event_file_dir()
        tracing: Change f_start() to take event_mutex and verify i_private != NULL
        tracing: Change event_filter_read/write to verify i_private != NULL
        tracing: Change event_enable/disable_read() to verify i_private != NULL
        tracing: Turn event/id->i_private into call->event.type
      b7bc9e7d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 8ef9c292
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vfs: add missing check for __O_TMPFILE in fcntl_init()
        fs: Allow unprivileged linkat(..., AT_EMPTY_PATH) aka flink
        fs: Fix file mode for O_TMPFILE
        reiserfs: fix deadlock in umount
      8ef9c292
  2. 07 8月, 2013 9 次提交
  3. 05 8月, 2013 12 次提交
    • Z
      vfs: add missing check for __O_TMPFILE in fcntl_init() · 3d62c45b
      Zheng Liu 提交于
      As comment in include/uapi/asm-generic/fcntl.h described, when
      introducing new O_* bits, we need to check its uniqueness in
      fcntl_init().  But __O_TMPFILE bit is missing.  So fix it.
      Signed-off-by: NZheng Liu <wenqing.lz@taobao.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      3d62c45b
    • A
      fs: Allow unprivileged linkat(..., AT_EMPTY_PATH) aka flink · bb2314b4
      Andy Lutomirski 提交于
      Every now and then someone proposes a new flink syscall, and this spawns
      a long discussion of whether it would be a security problem.  I think
      that this is missing the point: flink is *already* allowed without
      privilege as long as /proc is mounted -- it's called AT_SYMLINK_FOLLOW.
      
      Now that O_TMPFILE is here, the ability to create a file with O_TMPFILE,
      write it, and link it in is very convenient.  The only problem is that
      it requires that /proc be mounted so that you can do:
      
      linkat(AT_FDCWD, "/proc/self/fd/<tmpfd>", dfd, path, AT_SYMLINK_NOFOLLOW)
      
      This sucks -- it's much nicer to do:
      
      linkat(tmpfd, "", dfd, path, AT_EMPTY_PATH)
      
      Let's allow it.
      
      If this turns out to be excessively scary, it we could instead require
      that the inode in question be I_LINKABLE, but this seems pointless given
      the /proc situation
      Signed-off-by: NAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      bb2314b4
    • A
      fs: Fix file mode for O_TMPFILE · e305f48b
      Andy Lutomirski 提交于
      O_TMPFILE, like O_CREAT, should respect the requested mode and should
      create regular files.
      
      This fixes two bugs: O_TMPFILE required privilege (because the mode
      ended up as 000) and it produced bogus inodes with no type.
      Signed-off-by: NAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      e305f48b
    • A
      reiserfs: fix deadlock in umount · 672fe15d
      Al Viro 提交于
      Since remove_proc_entry() started to wait for IO in progress (i.e.
      since 2007 or so), the locking in fs/reiserfs/proc.c became wrong;
      if procfs read happens between the moment when umount() locks the
      victim superblock and removal of /proc/fs/reiserfs/<device>/*,
      we'll get a deadlock - read will wait for s_umount (in sget(),
      called by r_start()), while umount will wait in remove_proc_entry()
      for that read to finish, holding s_umount all along.
      
      Fortunately, the same change allows a much simpler race avoidance -
      all we need to do is remove the procfs entries in the very beginning
      of reiserfs ->kill_sb(); that'll guarantee that pointer to superblock
      will remain valid for the duration for procfs IO, so we don't need
      sget() to keep the sucker alive.  As the matter of fact, we can
      get rid of the home-grown iterator completely, and use single_open()
      instead.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      672fe15d
    • F
      MIPS: BMIPS: fix hardware interrupt routing for boot CPU != 0 · fcfa66de
      Florian Fainelli 提交于
      The hardware interrupt routing for boot CPU != 0 is wrong because it
      will route all the hardware interrupts to TP0 which is not the one we
      booted from. Fix this by properly checking which boot CPU we are booting
      from and updating the right interrupt mask for the boot CPU. This fixes
      booting on BCM3368 with bmips_smp_emabled = 0.
      Signed-off-by: NFlorian Fainelli <florian@openwrt.org>
      Cc: linux-mips@linux-mips.org
      Cc: blogic@openwrt.org
      Cc: jogo@openwrt.org
      Cc: cernekee@gmail.com
      Patchwork: https://patchwork.linux-mips.org/patch/5650/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      fcfa66de
    • R
      MIPS: oprofile: Fix BUG due to smp_processor_id() in preemptible code. · cf5b2d23
      Ralf Baechle 提交于
      current_cpu_type() is not preemption-safe.
      If CONFIG_PREEMPT is enabled then mipsxx_reg_setup() can be called from preemptible state.
      Added get_cpu()/put_cpu() pair to make it preemption-safe.
      
      This was found while testing oprofile with CONFIG_DEBUG_PREEMPT enable.
      
      /usr/zntestsuite # opcontrol --init
      /usr/zntestsuite # opcontrol --setup --event=L2_CACHE_ACCESSES:500 --event=L2_CACHE_MISSES:500 --no-vmlinux
      /usr/zntestsuite # opcontrol --start
      Using 2.6+ OProfile kernel interface.
      BUG: using smp_processor_id() in preemptible [00000000] code: oprofiled/1362
      caller is mipsxx_reg_setup+0x11c/0x164
      CPU: 0 PID: 1362 Comm: oprofiled Not tainted 3.10.4 #18
      Stack : 00000006 70757465 00000000 00000000 00000000 00000000 80b173f6 00000037
                80b10000 00000000 80b21614 88f5a220 00000000 00000000 00000000 00000000
                00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
                00000000 00000000 00000000 89c49c00 89c49c2c 80721254 807b7927 8012c1d0
                80b10000 80721254 00000000 00000552 88f5a220 80b1335c 807b78e6 89c49ba8
                ...
      Call Trace:
      [<801099a4>] show_stack+0x64/0x7c
      [<80665520>] dump_stack+0x20/0x2c
      [<803a2250>] debug_smp_processor_id+0xe0/0xf0
      [<8052df24>] mipsxx_reg_setup+0x11c/0x164
      [<8052cd70>] op_mips_setup+0x24/0x4c
      [<80529cfc>] oprofile_setup+0x5c/0x12c
      [<8052b9f8>] event_buffer_open+0x78/0xf8
      [<801c3150>] do_dentry_open.isra.15+0x2b8/0x3b0
      [<801c3270>] finish_open+0x28/0x4c
      [<801d49b8>] do_last.isra.41+0x2cc/0xd00
      [<801d54a0>] path_openat+0xb4/0x4c4
      [<801d5c44>] do_filp_open+0x3c/0xac
      [<801c4744>] do_sys_open+0x110/0x1f4
      [<8010f47c>] stack_done+0x20/0x44
      
      Bug reported and original patch by Jerin Jacob <jerinjacobk@gmail.com>.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: NJerin Jacob <jerinjacobk@gmail.com>
      cf5b2d23
    • M
      MIPS: PNX833x: PNX8335_PCI_ETHERNET_INT depends on CONFIG_SOC_PNX8335 · 3ac3bcb9
      Markos Chandras 提交于
      The PNX8335_PCI_ETHERNET_INT macro is defined in
      arch/mips/include/asm/mach-pnx833x/irq-mapping.h
      only if CONFIG_SOC_PNX8335 is selected.
      
      Fixes the following randconfig problem:
      arch/mips/pnx833x/common/platform.c:210:12:
      error: 'PNX8335_PIC_ETHERNET_INT' undeclared here
      (not in a function)
      Signed-off-by: NMarkos Chandras <markos.chandras@imgtec.com>
      Acked-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5585/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      3ac3bcb9
    • L
      Linux 3.11-rc4 · c095ba72
      Linus Torvalds 提交于
      c095ba72
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · e56c7561
      Linus Torvalds 提交于
      Pull dmaengine fixes from Vinod Koul:
       "Two fixes for slave dmaengine.  The first fixes cyclic dma transfers
        for pl330 and the second one makes us return the correct error code on
        probe"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: pl330: Fix cyclic transfers
        pch_dma: fix error return code in pch_dma_probe()
      e56c7561
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 3d90268f
      Linus Torvalds 提交于
      Pull drm fix from Dave Airlie:
       "Just a quick fix that a few people have reported, be nice to have in
        asap"
      
      The drm tree seems to be very confused about 64-bit divides.  Here it
      uses a slow 64-by-64 bit divide to divide by a small constant.  Oh well.
      Doesn't look performance-critical, just stupid.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: fix 64 bit divide in SI spm code
      3d90268f
    • H
      tmpfs: fix SEEK_DATA/SEEK_HOLE regression · 387aae6f
      Hugh Dickins 提交于
      Commit 46a1c2c7 ("vfs: export lseek_execute() to modules") broke the
      tmpfs SEEK_DATA/SEEK_HOLE implementation, because vfs_setpos() converts
      the carefully prepared -ENXIO to -EINVAL.  Other filesystems avoid it in
      error cases: do the same in tmpfs.
      Signed-off-by: NHugh Dickins <hughd@google.com>
      Cc: Jie Liu <jeff.liu@oracle.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      387aae6f
    • L
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 2f853991
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "All small regression or small fixes, nothing surprising at this stage.
      
         - regression fix for intel Mac Mini quirk
         - compress ioctl error fix
         - ASoC fixes for control change notifications, some UI fixes,
           driver-specific fixes (resource leak, build errors, etc)"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix missing fixup for Mac Mini with STAC9221
        ASoC: wm0010: Fix resource leak
        ASoC: au1x: Fix build
        ASoC: bf5xx-ac97: Fix compile error with SND_BF5XX_HAVE_COLD_RESET
        ASoC: bfin-ac97: Fix prototype error following AC'97 refactoring
        ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
        ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
      2f853991
  4. 04 8月, 2013 14 次提交
  5. 03 8月, 2013 3 次提交