1. 24 11月, 2017 7 次提交
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 06c94400
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Two basic fixes: one for the sparse problem with the blacklist flags
        and another for a hang forever in bnx2i"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: Use 'blist_flags_t' for scsi_devinfo flags
        scsi: bnx2fc: Fix hung task messages when a cleanup response is not received during abort
      06c94400
    • L
      Merge tag 'sound-fix-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b64f26c6
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "All commits found here are small fixes for regression or stable:
      
         - PCM timestamp behavior fix that could be seen as a regression
      
         - Remove spurious WARN_ON() from ALSA timer 32bit compat ioctl
      
         - HD-audio HDMI/DP channel mapping fix for 32bit archs
      
         - Fix the previous fix for HD-audio initialization code
      
         - More hardening USB-audio against malicious USB descriptors
      
         - HD-audio quirks/fixes (Realtek codec, AMD controller)
      
         - Missing help text for the recent Intel SST kconfig change"
      
      * tag 'sound-fix-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda: Add Raven PCI ID
        ALSA: hda/realtek - Fix ALC700 family no sound issue
        ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization
        ALSA: usb-audio: Add sanity checks in v2 clock parsers
        ALSA: usb-audio: Fix potential zero-division at parsing FU
        ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
        ALSA: usb-audio: Add sanity checks to FE parser
        ALSA: timer: Remove kernel warning at compat ioctl error paths
        ALSA: pcm: update tstamp only if audio_tstamp changed
        ALSA: hda/realtek: Add headset mic support for Intel NUC Skull Canyon
        ALSA: hda: Fix too short HDMI/DP chmap reporting
        ALSA: usb-audio: uac1: Invalidate ctl on interrupt
        ALSA: hda/realtek - Fix ALC275 no sound issue
        ASoC: Intel: Add help text for SND_SOC_INTEL_SST_TOPLEVEL
      b64f26c6
    • L
      Merge tag 'drm-for-v4.15-part2' of git://people.freedesktop.org/~airlied/linux · c353bfc6
      Linus Torvalds 提交于
      Pull more drm updates from Dave Airlie:
       "Fixes/cleanups for rc1, non-desktop flags for VR
      
         - remove the MSM dt-bindings file Rob managed to push in the previous
           pull.
      
         - add a property/edid quirk to denote HMD devices, I had these
           hanging around for a few weeks and Keith had done some work on
           them, they are fairly self contained and small, and only affect
           people using HTC Vive VR headsets so far.
      
         - amdgpu, tegra, tilcdc, fsl fixes
      
         - some imx-drm cleanups I missed, these seemed pretty small, and no
           reason to hold off.
      
        I have one TTM regression fix (fixes bochs-vga in qemu) sitting
        locally awaiting review I'll probably send that in a separate pull
        request tomorrow"
      
      * tag 'drm-for-v4.15-part2' of git://people.freedesktop.org/~airlied/linux: (33 commits)
        dt-bindings: remove file that was added accidentally
        drm/edid: quirk HTC vive headset as non-desktop. [v2]
        drm/fb: add support for not enabling fbcon on non-desktop displays [v2]
        drm: add connector info/property for non-desktop displays [v2]
        drm/amdgpu: fix rmmod KCQ disable failed error
        drm/amdgpu: fix kernel hang when starting VNC server
        drm/amdgpu: don't skip attributes when powerplay is enabled
        drm/amd/pp: fix typecast error in powerplay.
        drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support
        drm/tegra: sor: Reimplement pad clock
        Revert "drm/radeon: dont switch vt on suspend"
        drm/amd/amdgpu: fix over-bound accessing in amdgpu_cs_wait_any_fence
        drm/amd/powerplay: fix unfreeze level smc message for smu7
        drm/amdgpu:fix memleak
        drm/amdgpu:fix memleak in takedown
        drm/amd/pp: fix dpm randomly failed on Vega10
        drm/amdgpu: set f_mapping on exported DMA-bufs
        drm/amdgpu: Properly allocate VM invalidate eng v2
        drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume()
        drm/fsl-dcu: avoid disabling pixel clock twice on suspend
        ...
      c353bfc6
    • L
      Merge tag 'docs-4.15-2' of git://git.lwn.net/linux · 1d3bc636
      Linus Torvalds 提交于
      Pull documentation updates from Jonathan Corbet:
       "A few late-arriving docs updates that have no real reason to wait.
      
        There's a new "Co-Developed-by" tag described by Greg, and a build
        enhancement from Willy to generate docs warnings during a kernel build
        (but only when additional warnings have been requested in general)"
      
      * tag 'docs-4.15-2' of git://git.lwn.net/linux:
        Add optional check for bad kernel-doc comments
        Documentation: fix profile= options in kernel-parameters.txt
        documentation/svga.txt: update outdated file
        kokr/memory-barriers.txt: Fix typo in paring example
        kokr/memory-barriers/txt: Replace uses of "transitive"
        Documentation/process: add Co-Developed-by: tag for patches with multiple authors
      1d3bc636
    • L
      Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · dab0badc
      Linus Torvalds 提交于
      Pull keys update from James Morris:
       "There's nothing too controversial here:
      
         - Doc fix for keyctl_read().
      
         - time_t -> time64_t replacement.
      
         - Set the module licence on things to prevent tainting"
      
      * 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        pkcs7: Set the module licence to prevent tainting
        security: keys: Replace time_t with time64_t for struct key_preparsed_payload
        security: keys: Replace time_t/timespec with time64_t
        KEYS: fix in-kernel documentation for keyctl_read()
      dab0badc
    • L
      Merge tag 'apparmor-pr-2017-11-21' of... · 26064dea
      Linus Torvalds 提交于
      Merge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
      
      Pull apparmor updates from John Johansen:
       "No features this time, just minor cleanups and bug fixes.
      
        Cleanups:
         - fix spelling mistake: "resoure" -> "resource"
         - remove unused redundant variable stop
         - Fix bool initialization/comparison
      
        Bug Fixes:
         - initialized returned struct aa_perms
         - fix leak of null profile name if profile allocation fails
         - ensure that undecidable profile attachments fail
         - fix profile attachment for special unconfined profiles
         - fix locking when creating a new complain profile.
         - fix possible recursive lock warning in __aa_create_ns"
      
      * tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
        apparmor: fix possible recursive lock warning in __aa_create_ns
        apparmor: fix locking when creating a new complain profile.
        apparmor: fix profile attachment for special unconfined profiles
        apparmor: ensure that undecidable profile attachments fail
        apparmor: fix leak of null profile name if profile allocation fails
        apparmor: remove unused redundant variable stop
        apparmor: Fix bool initialization/comparison
        apparmor: initialized returned struct aa_perms
        apparmor: fix spelling mistake: "resoure" -> "resource"
      26064dea
    • J
      Merge tag 'keys-next-20171123' of... · ce44cd8d
      James Morris 提交于
      Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next-keys
      
      Merge keys subsystem changes from David Howells, for v4.15.
      ce44cd8d
  2. 23 11月, 2017 16 次提交
    • V
      ALSA: hda: Add Raven PCI ID · 9ceace3c
      Vijendar Mukunda 提交于
      This commit adds PCI ID for Raven platform
      Signed-off-by: NVijendar Mukunda <Vijendar.Mukunda@amd.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      9ceace3c
    • K
      ALSA: hda/realtek - Fix ALC700 family no sound issue · 2d7fe618
      Kailang Yang 提交于
      It maybe the typo for ALC700 support patch.
      To fix the bit value on this patch.
      
      Fixes: 6fbae35a ("ALSA: hda/realtek - Add support for new codecs ALC700/ALC701/ALC703")
      Signed-off-by: NKailang Yang <kailang@realtek.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      2d7fe618
    • L
      Merge tag 'pwm/for-4.15-rc1' of... · 5a787756
      Linus Torvalds 提交于
      Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "The changes for this release include power management improvements for
        the pwm-img driver, support for the backup mode on pwm-atmel-tcb as
        well as support for more hardware with the R-Car and Mediatek drivers.
      
        To round things off there's a bit of cleanup for sunxi and stm32-lp"
      
      * tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: stm32-lp: Remove pwm_is_enabled() check before calling pwm_disable()
        pwm: mediatek: Add MT2712/MT7622 support
        pwm: sunxi: Use of_device_get_match_data()
        pwm: atmel-tcb: Support backup mode
        dt-bindings: pwm: Add R-Car D3 device tree bindings
        pwm: img: Add runtime PM
        pwm: img: Add suspend / resume handling
      5a787756
    • L
      Merge tag 'rtc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 1b8c5cd8
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "There is nothing scary this cycle, mostly driver fixes and updates.
      
        The core fix has been in for a while and has been tested on multiple
        kernel revisions by multiple teams.
      
        Core:
         - Fix setting the alarm to the next expiring timer
      
        New drivers:
         - Mediatek MT7622 RTC
         - NXP PCF85363
         - Spreadtrum SC27xx PMIC RTC
      
        Drivers updates:
         - Use generic nvmem to expose the Non volatile ram for ds1305,
           ds1511, m48t86 and omap
         - abx80x: solve possible race condition at probe
         - armada38x: support trimming the RTC oscillator
         - at91rm9200: fix reading the alarm value at boot
         - ds1511: allow waking platform
         - m41t80: rework square wave output
         - pcf8523: support trimming the RTC oscillator
         - pcf8563: fix clock output rate
         - pl031: make interrupt optional
         - xgene: fix suspend/resume"
      
      * tag 'rtc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (50 commits)
        dt-bindings: rtc: imxdi: Improve the bindings text
        rtc: sc27xx: Add Spreadtrum SC27xx PMIC RTC driver
        dt-bindings: rtc: Add Spreadtrum SC27xx RTC documentation
        rtc: at91rm9200: fix reading alarm value
        rtc: at91rm9200: stop calculating yday in at91_rtc_readalarm
        rtc: sysfs: Use time64_t variables to set time/alarm
        rtc: xgene: mark PM functions as __maybe_unused
        rtc: xgene: Fix suspend/resume
        rtc: pcf8563: don't alway enable the alarm
        rtc: pcf8563: fix output clock rate
        rtc: rx8010: Fix for incorrect return value
        rtc: rx8010: Specify correct address for RX8010_RESV31
        rtc: rx8010: Remove duplicate define
        rtc: m41t80: remove unneeded checks from m41t80_sqw_set_rate
        rtc: m41t80: avoid i2c read in m41t80_sqw_is_prepared
        rtc: m41t80: avoid i2c read in m41t80_sqw_recalc_rate
        rtc: m41t80: fix m41t80_sqw_round_rate return value
        rtc: m41t80: m41t80_sqw_set_rate should return 0 on success
        rtc: add support for NXP PCF85363 real-time clock
        rtc: omap: Support scratch registers
        ...
      1b8c5cd8
    • L
      Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd · 14b661eb
      Linus Torvalds 提交于
      Pull MTD updates from Richard Weinberger:
       "General changes:
         -  Unconfuse get_unmapped_area and point/unpoint driver methods
         -  New partition parser: sharpslpart
         -  Kill GENERIC_IO
         -  Various fixes
      
        NAND changes:
         -  Add a flag to mark NANDs that require 3 address cycles to encode a
            page address
         -  Set a default ECC/free layout when NAND_ECC_NONE is requested
         -  Fix a bug in panic_nand_write()
         -  Another batch of cleanups for the denali driver
         -  Fix PM support in the atmel driver
         -  Remove support for platform data in the omap driver
         -  Fix subpage write in the omap driver
         -  Fix irq handling in the mtk driver
         -  Change link order of mtk_ecc and mtk_nand drivers to speed up boot
            time
         -  Change log level of ECC error messages in the mxc driver
         -  Patch the pxa3xx driver to support Armada 8k platforms
         -  Add BAM DMA support to the qcom driver
         -  Convert gpio-nand to the GPIO desc API
         -  Fix ECC handling in the mt29f driver
      
        SPI-NOR changes:
         -  Introduce system power management support
         -  New mechanism to select the proper .quad_enable() hook by JEDEC
            ID, when needed, instead of only by manufacturer ID
         -  Add support to new memory parts from Gigadevice, Winbond, Macronix
            and Everspin
         -  Maintainance for Cadence, Intel, Mediatek and STM32 drivers"
      
      *  tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd: (85 commits)
        mtd: Avoid probe failures when mtd->dbg.dfs_dir is invalid
        mtd: sharpslpart: Add sharpslpart partition parser
        mtd: Add sanity checks in mtd_write/read_oob()
        mtd: remove the get_unmapped_area method
        mtd: implement mtd_get_unmapped_area() using the point method
        mtd: chips/map_rom.c: implement point and unpoint methods
        mtd: chips/map_ram.c: implement point and unpoint methods
        mtd: mtdram: properly handle the phys argument in the point method
        mtd: mtdswap: fix spelling mistake: 'TRESHOLD' -> 'THRESHOLD'
        mtd: slram: use memremap() instead of ioremap()
        kconfig: kill off GENERIC_IO option
        mtd: Fix C++ comment in include/linux/mtd/mtd.h
        mtd: constify mtd_partition
        mtd: plat-ram: Replace manual resource management by devm
        mtd: nand: Fix writing mtdoops to nand flash.
        mtd: intel-spi: Add Intel Lewisburg PCH SPI super SKU PCI ID
        mtd: nand: mtk: fix infinite ECC decode IRQ issue
        mtd: spi-nor: Add support for mr25h128
        mtd: nand: mtk: change the compile sequence of mtk_nand.o and mtk_ecc.o
        mtd: spi-nor: enable 4B opcodes for mx66l51235l
        ...
      14b661eb
    • L
      Merge tag 'xfs-4.15-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 3f3211e7
      Linus Torvalds 提交于
      Pull xfs fixes from Darrick Wong:
      
       - Fix a memory leak in the new in-core extent map
      
       - Refactor the xfs_dev_t conversions for easier xfsprogs porting
      
      * tag 'xfs-4.15-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: abstract out dev_t conversions
        xfs: fix memory leak in xfs_iext_free_last_leaf
      3f3211e7
    • L
      Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 27532785
      Linus Torvalds 提交于
      Pull mode_t whack-a-mole from Al Viro:
       "For all internal uses we want umode_t, which is arch-independent;
        mode_t (or __kernel_mode_t, for that matter) is wrong outside of
        userland ABI.
      
        Unfortunately, that crap keeps coming back and needs to be put down
        from time to time..."
      
      * 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        mode_t whack-a-mole: task_dump_owner()
      27532785
    • L
      Merge branch '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d18bee42
      Linus Torvalds 提交于
      Pull 9p filesystemfixes from Al Viro:
       "Several 9p fixes"
      
      * '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        9p: Fix missing commas in mount options
        net/9p: Switch to wait_event_killable()
        fs/9p: Compare qid.path in v9fs_test_inode
      d18bee42
    • R
      dt-bindings: remove file that was added accidentally · 98ecf1a3
      Rob Clark 提交于
      I think this snuck in when I applied the patch for f97decac (didn't
      apply cleanly, required some manual applying + git-add).  It is unused
      and shouldn't be here.  My bad.
      
      Fixes: f97decac "drm/msm: Support multiple ringbuffers"
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      Acked-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      98ecf1a3
    • D
      drm/edid: quirk HTC vive headset as non-desktop. [v2] · acb1d8ee
      Dave Airlie 提交于
      This uses the EDID info from my HTC Vive to mark it as
      non-desktop.
      
      v2: Change description from non-standard to non-desktop
      Reviewed-by: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      acb1d8ee
    • D
      drm/fb: add support for not enabling fbcon on non-desktop displays [v2] · b5f05388
      Dave Airlie 提交于
      We don't want fbcon to get used on non-desktop dislays,
      don't pass them as enabled connectors to the fb helper setup.
      
      This prevents my HMD from getting disorted fbcon, and from
      affecting other displays console.
      
      v2: Change description from non-standard to non-desktop
      Reviewed-by: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b5f05388
    • D
      drm: add connector info/property for non-desktop displays [v2] · 66660d4c
      Dave Airlie 提交于
      This adds the infrastructure needed to quirk displays
      using edid and to mark them a non-desktop.
      
      A non-desktop display is one which shouldn't normally be included
      as a part of a desktop environment.
      
      This is meant to cover head mounted devices like HTC Vive.
      
      v2: Change description from non-standard to non-desktop, add docs
      Reviewed-by: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      
      fixup docs
      66660d4c
    • D
      Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux into drm-next · 1cee3bce
      Dave Airlie 提交于
      tilcdc fixes for v4.15
      
      * tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux:
        drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support
      1cee3bce
    • D
      Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next · 9cae7751
      Dave Airlie 提交于
      more misc amdgpu fixes.
      
      * 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: fix rmmod KCQ disable failed error
        drm/amdgpu: fix kernel hang when starting VNC server
        drm/amdgpu: don't skip attributes when powerplay is enabled
        drm/amd/pp: fix typecast error in powerplay.
        Revert "drm/radeon: dont switch vt on suspend"
        drm/amd/amdgpu: fix over-bound accessing in amdgpu_cs_wait_any_fence
        drm/amd/powerplay: fix unfreeze level smc message for smu7
        drm/amdgpu:fix memleak
        drm/amdgpu:fix memleak in takedown
      9cae7751
    • D
      Merge tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux into drm-next · af5ecb53
      Dave Airlie 提交于
      drm/imx: various cleanups
      
      - Switch to drm_*_get/put() helpers
      - Use correct parallel-display connector enum: DPI instead of VGA
      - Remove incorrect unit name from device tree binding documentation example
      - Remove an unused variable
      
      * tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux:
        gpu: ipu-v3: ipu-dc: Remove unused 'di' variable
        dt-bindings: fsl-imx-drm: Remove incorrect "@di0" usage
        drm/imx: parallel-display: use correct connector enum
        drm/imx: switch to drm_*_get(), drm_*_put() helpers
      af5ecb53
    • D
      Merge tag 'drm/tegra/for-4.15-rc1-fixes' of git://anongit.freedesktop.org/tegra/linux into drm-next · 2d561310
      Dave Airlie 提交于
      drm/tegra: Fixes for v4.15-rc1
      
      This includes an update to the SOR pad clock programming needed because
      of some changes that went in through the clock tree.
      
      * tag 'drm/tegra/for-4.15-rc1-fixes' of git://anongit.freedesktop.org/tegra/linux:
        drm/tegra: sor: Reimplement pad clock
      2d561310
  3. 22 11月, 2017 5 次提交
    • T
      ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization · d6c0615f
      Takashi Iwai 提交于
      The previous fix for addressing the breakage in vmaster slave
      initialization, commit a91d6612 ("ALSA: hda - Fix incorrect TLV
      callback check introduced during set_fs() removal"), introduced a new
      helper to process over each slave kctl.  However, this helper passes
      only the original kctl, not the virtual slave kctl.  As a result,
      HD-audio driver (which is the only user so far) couldn't initialize
      the slave correctly because it's trying to update the value directly
      with the original kctl, not with the mapped kctl.
      
      This patch fixes the situation again by passing both the mapped slaved
      and original slave kctls to the function.  Luckily there is a single
      caller as of now, so changing the call signature is no big matter.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197959
      Fixes: a91d6612 ("ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d6c0615f
    • T
      ALSA: usb-audio: Add sanity checks in v2 clock parsers · 0a62d6c9
      Takashi Iwai 提交于
      The helper functions to parse and look for the clock source, selector
      and multiplier unit may return the descriptor with a too short length
      than required, while there is no sanity check in the caller side.
      Add some sanity checks in the parsers, at least, to guarantee the
      given descriptor size, for avoiding the potential crashes.
      
      Fixes: 79f920fb ("ALSA: usb-audio: parse clock topology of UAC2 devices")
      Reported-by: NAndrey Konovalov <andreyknvl@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      0a62d6c9
    • T
      ALSA: usb-audio: Fix potential zero-division at parsing FU · 8428a8eb
      Takashi Iwai 提交于
      parse_audio_feature_unit() contains a code dividing potentially with
      zero when a malformed FU descriptor is passed.  Although there is
      already a sanity check, it checks only the value zero, hence it can
      still lead to a zero-division when a value 1 is passed there.
      
      Fix it by correcting the sanity check (and the error message
      thereof).
      
      Fixes: 23caaf19 ("ALSA: usb-mixer: Add support for Audio Class v2.0")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      8428a8eb
    • T
      ALSA: usb-audio: Fix potential out-of-bound access at parsing SU · f658f17b
      Takashi Iwai 提交于
      The usb-audio driver may trigger an out-of-bound access at parsing a
      malformed selector unit, as it checks the header length only after
      evaluating bNrInPins field, which can be already above the given
      length.  Fix it by adding the length check beforehand.
      
      Fixes: 99fc8645 ("ALSA: usb-mixer: parse descriptors with structs")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      f658f17b
    • T
      ALSA: usb-audio: Add sanity checks to FE parser · d937cd67
      Takashi Iwai 提交于
      When the usb-audio descriptor contains the malformed feature unit
      description with a too short length, the driver may access
      out-of-bounds.  Add a sanity check of the header size at the beginning
      of parse_audio_feature_unit().
      
      Fixes: 23caaf19 ("ALSA: usb-mixer: Add support for Audio Class v2.0")
      Reported-by: NAndrey Konovalov <andreyknvl@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d937cd67
  4. 21 11月, 2017 12 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0c86a6bd
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix a reference to a module parameter which was lost during the
          GREv6 receive path rewrite, from Alexey Kodanev.
      
       2) Fix deref before NULL check in ipheth, from Gustavo A. R. Silva.
      
       3) RCU read lock imbalance in tun_build_skb(), from Xin Long.
      
       4) Some stragglers from the mac80211 folks:
      
            a) Timer conversions from Kees Cook
      
            b) Fix some sequencing issue when cfg80211 is built statically,
               from Johannes Berg
      
            c) Memory leak in mac80211_hwsim, from Ben Hutchings.
      
       5) Add new qmi_wwan device ID, from Sebastian Sjoholm.
      
       6) Fix use after free in tipc, from Jon Maloy.
      
       7) Missing kdoc in nfp driver, from Jakub Kicinski.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        nfp: flower: add missing kdoc
        tipc: fix access of released memory
        net: qmi_wwan: add Quectel BG96 2c7c:0296
        mlxsw: spectrum: Do not try to create non-existing ports during unsplit
        mac80211: properly free requested-but-not-started TX agg sessions
        mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
        cfg80211: initialize regulatory keys/database later
        mac80211: aggregation: Convert timers to use timer_setup()
        nl80211: don't expose wdev->ssid for most interfaces
        mac80211: Convert timers to use timer_setup()
        net: vxge: Fix some indentation issues
        net: ena: fix race condition between device reset and link up setup
        r8169: use same RTL8111EVL green settings as in vendor driver
        r8169: fix RTL8111EVL EEE and green settings
        tun: fix rcu_read_lock imbalance in tun_build_skb
        tcp: when scheduling TLP, time of RTO should account for current ACK
        usbnet: ipheth: fix potential null pointer dereference in ipheth_carrier_set
        gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
      0c86a6bd
    • W
      drm/amdgpu: fix rmmod KCQ disable failed error · 446947b4
      Wang Hongcheng 提交于
      If  gfx_v8_0_hw_fini is called after amdgpu_ucode_fini_bo, we will
      hit KCQ disabled failed. Let amdgpu_ucode_fini_bo run after
      gfx_v8_0_hw_fini.
      
      BUG: SWDEV-135547
      Reviewed-by: NRex Zhu <Rex.Zhu@amd.com>
      Signed-off-by: NWang Hongcheng <Annie.Wang@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      446947b4
    • X
      drm/amdgpu: fix kernel hang when starting VNC server · d5a480b4
      Xiangliang.Yu 提交于
      After starting VNC server or running CTS test, kernel will hang and
      can see below call trace:
      
      [961816] INFO: task khugepaged:42 blocked for more than 120 seconds.
      [968581]       Tainted: G           OE   4.13.0 #1
      [973495] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables
                this message.
      [980962] khugepaged      D    0    42      2 0x00000000
      [980967] Call Trace:
      [980977]  __schedule+0x28d/0x890
      [980982]  schedule+0x36/0x80
      [980986]  rwsem_down_read_failed+0x139/0x1c0
      [980991]  ? update_curr+0x100/0x1c0
      [981004]  call_rwsem_down_read_failed+0x18/0x30
      [981007]  down_read+0x20/0x40
      [981012]  khugepaged_scan_mm_slot+0x78/0x1ac0
      [981018]  ? __switch_to+0x23e/0x4a0
      [981022]  ? finish_task_switch+0x79/0x240
      [981026]  khugepaged+0x146/0x480
      [981031]  ? remove_wait_queue+0x60/0x60
      [981035]  kthread+0x109/0x140
      [981037]  ? khugepaged_scan_mm_slot+0x1ac0/0x1ac0
      [981039]  ? kthread_park+0x60/0x60
      [981044]  ret_from_fork+0x25/0x30
      
      After checking code and found 'commit b72cf4fc ("drm/amdgpu: move
      taking mmap_sem into get_user_pages v2")' forget to drop one case of
      up_read.
      Signed-off-by: NXiangliang.Yu <Xiangliang.Yu@amd.com>
      Reviewed-by: NChristian König <christian.koenig@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      d5a480b4
    • L
      Merge tag 'for-linus-4.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · b620fd2d
      Linus Torvalds 提交于
      Pull orangefs updates from Mike Marshall:
       "Fix:
      
         - stop setting atime on inode dirty (Martin Brandenburg)
      
        Cleanups:
      
         - remove initialization of i_version (Jeff Layton)
      
         - use ARRAY_SIZE (Jérémy Lefaure)
      
         - call op_release sooner when creating inodes (Mike MarshallMartin
           Brandenburg)"
      
      * tag 'for-linus-4.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: call op_release sooner when creating inodes
        orangefs: stop setting atime on inode dirty
        orangefs: use ARRAY_SIZE
        orangefs: remove initialization of i_version
      b620fd2d
    • L
      Merge tag 'ceph-for-4.15-rc1' of git://github.com/ceph/ceph-client · adb072d3
      Linus Torvalds 提交于
      Pull ceph updates from Ilya Dryomov:
       "We have a set of file locking improvements from Zheng, rbd rw/ro state
        handling code cleanup from myself and some assorted CephFS fixes from
        Jeff.
      
        rbd now defaults to single-major=Y, lifting the limit of ~240 rbd
        images per host for everyone"
      
      * tag 'ceph-for-4.15-rc1' of git://github.com/ceph/ceph-client:
        rbd: default to single-major device number scheme
        libceph: don't WARN() if user tries to add invalid key
        rbd: set discard_alignment to zero
        ceph: silence sparse endianness warning in encode_caps_cb
        ceph: remove the bump of i_version
        ceph: present consistent fsid, regardless of arch endianness
        ceph: clean up spinlocking and list handling around cleanup_cap_releases()
        rbd: get rid of rbd_mapping::read_only
        rbd: fix and simplify rbd_ioctl_set_ro()
        ceph: remove unused and redundant variable dropping
        ceph: mark expected switch fall-throughs
        ceph: -EINVAL on decoding failure in ceph_mdsc_handle_fsmap()
        ceph: disable cached readdir after dropping positive dentry
        ceph: fix bool initialization/comparison
        ceph: handle 'session get evicted while there are file locks'
        ceph: optimize flock encoding during reconnect
        ceph: make lock_to_ceph_filelock() static
        ceph: keep auth cap when inode has flocks or posix locks
      adb072d3
    • T
      ALSA: timer: Remove kernel warning at compat ioctl error paths · 3d4e8303
      Takashi Iwai 提交于
      Some timer compat ioctls have NULL checks of timer instance with
      snd_BUG_ON() that bring up WARN_ON() when the debug option is set.
      Actually the condition can be met in the normal situation and it's
      confusing and bad to spew kernel warnings with stack trace there.
      Let's remove snd_BUG_ON() invocation and replace with the simple
      checks.  Also, correct the error code to EBADFD to follow the native
      ioctl error handling.
      Reported-by: Nsyzbot <syzkaller@googlegroups.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      3d4e8303
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · 11ca75d2
      Linus Torvalds 提交于
      Pull printk updates from Petr Mladek:
      
       - print the warning about dropped messages on consoles on a separate
         line.   It makes it more legible.
      
       - one typo fix and small code clean up.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
        added new line symbol after warning about dropped messages
        printk: fix typo in printk_safe.c
        printk: simplify no_printk()
      11ca75d2
    • H
      ALSA: pcm: update tstamp only if audio_tstamp changed · 20e3f985
      Henrik Eriksson 提交于
      commit 3179f620 ("ALSA: core: add .get_time_info") had a side effect
      of changing the behaviour of the PCM runtime tstamp.  Prior to this
      change tstamp was not updated by snd_pcm_update_hw_ptr0() unless the
      hw_ptr had moved, after this change tstamp was always updated.
      
      For an application using alsa-lib, doing snd_pcm_readi() followed by
      snd_pcm_status() to estimate the age of the read samples by subtracting
      status->avail * [sample rate] from status->tstamp this change degraded
      the accuracy of the estimate on devices where the pcm hw does not
      provide a granular hw_ptr, e.g., devices using
      soc-generic-dmaengine-pcm.c and a dma-engine with residue_granularity
      DMA_RESIDUE_GRANULARITY_DESCRIPTOR.  The accuracy of the estimate
      depended on the latency between the PCM hw completing a period and the
      driver called snd_pcm_period_elapsed() to notify ALSA core, typically
      determined by interrupt handling latency.  After the change the accuracy
      of the estimate depended on the latency between the PCM hw completing a
      period and the application calling snd_pcm_status(), determined by the
      scheduling of the application process.  The maximum error of the
      estimate is one period length in both cases, but the error average and
      variance is smaller when it depends on interrupt latency.
      
      Instead of always updating tstamp, update it only if audio_tstamp
      changed.
      
      Fixes: 3179f620 ("ALSA: core: add .get_time_info")
      Suggested-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
      Signed-off-by: NHenrik Eriksson <henrik.eriksson@axis.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      20e3f985
    • D
      Merge tag 'mac80211-for-davem-2017-11-20' of... · a13e8d41
      David S. Miller 提交于
      Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
      
      Johannes Berg says:
      
      ====================
      A few things:
       * straggler timer conversions from Kees
       * memory leak fix in hwsim
       * fix some fallout from regdb changes if wireless is built-in
       * also free aggregation sessions in startup state when station
         goes away, to avoid crashing the timer
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a13e8d41
    • J
      nfp: flower: add missing kdoc · b48b1f7a
      Jakub Kicinski 提交于
      Commit 0115552e ("nfp: remove false positive offloads
      in flower vxlan") missed adding kdoc for a new parameter
      of nfp_flower_add_offload().
      Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>
      Reviewed-by: NSimon Horman <simon.horman@netronome.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b48b1f7a
    • J
      tipc: fix access of released memory · e0e853ac
      Jon Maloy 提交于
      When the function tipc_group_filter_msg() finds that a member event
      indicates that the member is leaving the group, it first deletes the
      member instance, and then purges the message queue being handled
      by the call. But the message queue is an aggregated field in the
      just deleted item, leading the purge call to access freed memory.
      
      We fix this by swapping the order of the two actions.
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e0e853ac
    • S
      net: qmi_wwan: add Quectel BG96 2c7c:0296 · f9409e7f
      Sebastian Sjoholm 提交于
      Quectel BG96 is an Qualcomm MDM9206 based IoT modem, supporting both
      CAT-M and NB-IoT. Tested hardware is BG96 mounted on Quectel development
      board (EVB). The USB id is added to qmi_wwan.c to allow QMI
      communication with the BG96.
      Signed-off-by: NSebastian Sjoholm <ssjoholm@mac.com>
      Acked-by: NBjørn Mork <bjorn@mork.no>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f9409e7f