- Linux-stable-mirror - lists.linaro.org

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.17.3 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Tue Jun 26 14:27:20 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.17.3-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.17.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.17.3-rc1 Vlastimil Babka <vbabka(a)suse.cz> mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: report attributes_mask and attributes for statx Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: harden page loading code Sean Young <sean(a)mess.org> media: rc: ensure input/lirc device can be opened after register Kieran Bingham <kieran.bingham(a)ideasonboard.com> media: uvcvideo: Prevent setting unavailable flags Tony Luck <tony.luck(a)intel.com> x86/intel_rdt: Enable CMT and MBM on new Skylake stepping Thomas Gleixner <tglx(a)linutronix.de> genirq/migration: Avoid out of line call if pending is not set Thomas Gleixner <tglx(a)linutronix.de> genirq/affinity: Defer affinity setting if irq chip is busy Thomas Gleixner <tglx(a)linutronix.de> genirq/generic_pending: Do not lose pending affinity update Thomas Gleixner <tglx(a)linutronix.de> irq_remapping: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/platform/uv: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/ioapic: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Provide apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Prevent hlist corruption and leaks Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/vector: Fix the args of vector_alloc tracepoint Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Keith Busch <keith.busch(a)intel.com> nvme/pci: Sync controller reset for AER slot_reset Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Chen Yu <yu.c.chen(a)intel.com> cpufreq: governors: Fix long idle detection logic in load calculation Suman Anna <s-anna(a)ti.com> cpufreq: ti-cpufreq: Fix an incorrect error return value Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Tejun Heo <tj(a)kernel.org> bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue Roman Pen <roman.penyaev(a)profitbricks.com> blk-mq: reinit q->tag_set_list entry only after grace period Josef Bacik <jbacik(a)fb.com> nbd: use bd_set_size when updating disk size Josef Bacik <jbacik(a)fb.com> nbd: update size when connected Josef Bacik <jbacik(a)fb.com> nbd: fix nbd device deletion Shirish Pargaonkar <shirishpargaonkar(a)gmail.com> cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class Mark Syms <mark.syms(a)citrix.com> CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Steve French <stfrench(a)microsoft.com> smb3: fix various xid leaks Tony Luck <tony.luck(a)intel.com> x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable the quirk for Nura headset Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: return error value if create_io_em failed in cow_file_range Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Omar Sandoval <osandov(a)fb.com> Btrfs: allow empty subvol= again Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Theodore Ts'o <tytso(a)mit.edu> ext4: correctly handle a zero-length xattr with a non-zero e_value_offs Theodore Ts'o <tytso(a)mit.edu> ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget() Theodore Ts'o <tytso(a)mit.edu> ext4: do not allow external inodes for inline data Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Erik Schmauss <erik.schmauss(a)intel.com> ACPICA: AML parser: attempt to continue loading table after error Dexuan Cui <decui(a)microsoft.com> hv_netvsc: Fix a network regression after ifdown/ifup Willem de Bruijn <willemb(a)google.com> net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Paolo Abeni <pabeni(a)redhat.com> udp: fix rx queue len reported by diag and proc interface Cong Wang <xiyou.wangcong(a)gmail.com> socket: close race condition between sock_close() and sockfs_setattr() Daniel Borkmann <daniel(a)iogearbox.net> tls: fix waitall behavior in tls_sw_recvmsg Daniel Borkmann <daniel(a)iogearbox.net> tls: fix use-after-free in tls_push_record Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Alvaro Gamez Machado <alvaro.gamez(a)hazent.com> net: phy: dp83822: use BMCR_ANENABLE instead of BMSR_ANEGCAPABLE for DP83620 Zhouyang Jia <jiazhouyang09(a)gmail.com> net: dsa: add error handling for pskb_trim_rcsum Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Bjørn Mork <bjorn(a)mork.no> cdc_ncm: avoid padding beyond end of skb Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes Colin Ian King <colin.king(a)canonical.com> net: aquantia: fix unsigned numvecs comparison with less than zero ------------- Diffstat: Makefile | 4 +- arch/um/drivers/vector_transports.c | 3 +- arch/x86/include/asm/apic.h | 2 + arch/x86/include/asm/trace/irq_vectors.h | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 18 +++++- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- arch/x86/platform/uv/uv_irq.c | 7 +-- block/blk-mq.c | 3 +- drivers/acpi/acpica/psloop.c | 51 +++++++++++++++- drivers/acpi/acpica/psobject.c | 30 ++++++++++ drivers/acpi/acpica/uterror.c | 10 ++-- drivers/ata/libata-core.c | 3 - drivers/ata/libata-zpodd.c | 2 +- drivers/base/core.c | 14 ++++- drivers/block/nbd.c | 17 +++++- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/cpufreq_governor.c | 12 ++-- drivers/cpufreq/ti-cpufreq.c | 2 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++---- drivers/hid/wacom_sys.c | 8 +++ drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/iommu/irq_remapping.c | 5 -- drivers/iommu/irq_remapping.h | 2 - drivers/media/rc/rc-main.c | 4 +- drivers/media/usb/uvc/uvc_ctrl.c | 17 +++--- drivers/net/bonding/bond_options.c | 1 + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 11 ++-- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/phy/dp83848.c | 35 +++++++++-- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wireless/intel/iwlwifi/fw/paging.c | 49 +++++++++++++--- drivers/nvme/host/pci.c | 11 +++- drivers/vhost/vhost.c | 3 + drivers/w1/masters/mxc_w1.c | 20 ++++--- fs/binfmt_misc.c | 12 +++- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 18 +++--- fs/btrfs/scrub.c | 2 +- fs/btrfs/super.c | 3 + fs/cifs/cifsacl.h | 14 +++++ fs/cifs/smb2ops.c | 68 +++++++++++++++------- fs/cifs/smb2pdu.c | 4 +- fs/ext4/indirect.c | 14 +++-- fs/ext4/inline.c | 6 ++ fs/ext4/inode.c | 46 ++++++++------- fs/ext4/resize.c | 2 +- fs/ext4/xattr.c | 2 +- fs/orangefs/inode.c | 7 +++ fs/orangefs/namei.c | 7 +++ include/linux/irq.h | 7 ++- include/linux/virtio_net.h | 11 ++-- include/net/transp_v6.h | 11 +++- include/net/udp.h | 5 ++ kernel/irq/manage.c | 37 +++++++++++- kernel/irq/migration.c | 31 ++++++---- mm/backing-dev.c | 18 +++++- mm/page_alloc.c | 1 - net/dsa/tag_trailer.c | 3 +- net/ipv4/tcp_ipv4.c | 4 ++ net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +- net/ipv6/route.c | 3 - net/ipv6/tcp_ipv6.c | 4 ++ net/ipv6/udp.c | 3 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 ++--- net/socket.c | 18 +++++- net/tls/tls_sw.c | 32 +++++----- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 3 + sound/pci/hda/patch_realtek.c | 6 +- sound/usb/quirks-table.h | 5 ++ 79 files changed, 609 insertions(+), 234 deletions(-)

7 years, 2 months

3
74
0 0

patch "iio: mma8452: Fix ignoring MMA8452_INT_DRDY" added to staging-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: mma8452: Fix ignoring MMA8452_INT_DRDY to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From b02ec67a8e38875cdc5f9214be885022f11c0017 Mon Sep 17 00:00:00 2001 From: Leonard Crestez <leonard.crestez(a)nxp.com> Date: Thu, 7 Jun 2018 21:52:50 +0300 Subject: iio: mma8452: Fix ignoring MMA8452_INT_DRDY Interrupts are ignored if no event bit is set in the status status register and this breaks the buffer interface. No data is shown when running "iio_generic_buffer -n mma8451 -a" and interrupt counts go crazy. Fix by not returning IRQ_NONE if DRDY is set. Fixes: 605f72de137a ("iio: accel: mma8452: improvements to handle multiple events") Signed-off-by: Leonard Crestez <leonard.crestez(a)nxp.com> cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/accel/mma8452.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 7e3d82cff3d5..c149c9c360fc 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -1053,7 +1053,7 @@ static irqreturn_t mma8452_interrupt(int irq, void *p) if (src < 0) return IRQ_NONE; - if (!(src & data->chip_info->enabled_events)) + if (!(src & (data->chip_info->enabled_events | MMA8452_INT_DRDY))) return IRQ_NONE; if (src & MMA8452_INT_DRDY) { -- 2.18.0

7 years, 2 months

1
0
0 0

[PATCH] clk: davinci: fix a typo (which leads to build failures)

by Bartosz Golaszewski

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> This should have been DM365, not DM356. Fixes: 4eff0bebf4ed5 ("clk: davinci: Fix link errors when not all SoCs are enabled") Cc: stable(a)vger.kernel.org Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> --- drivers/clk/davinci/psc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h index 6a42529d31a9..cc5614567a70 100644 --- a/drivers/clk/davinci/psc.h +++ b/drivers/clk/davinci/psc.h @@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data; #ifdef CONFIG_ARCH_DAVINCI_DM355 extern const struct davinci_psc_init_data dm355_psc_init_data; #endif -#ifdef CONFIG_ARCH_DAVINCI_DM356 +#ifdef CONFIG_ARCH_DAVINCI_DM365 extern const struct davinci_psc_init_data dm365_psc_init_data; #endif #ifdef CONFIG_ARCH_DAVINCI_DM644x -- 2.17.1

7 years, 2 months

2
1
0 0

[PATCH] RDMA/rxe: Set wqe->status correctly if an unexpected response is received

by Bart Van Assche

Every function that returns COMPST_ERROR must set wqe->status to another value than IB_WC_SUCCESS before returning COMPST_ERROR. Fix the only code path for which this is not yet the case. Signed-off-by: Bart Van Assche <bart.vanassche(a)wdc.com> Cc: Zhu Yanjun <yanjun.zhu(a)oracle.com> Cc: Jianchao Wang <jianchao.w.wang(a)oracle.com> Cc: Yuval Shaia <yuval.shaia(a)oracle.com> Cc: <stable(a)vger.kernel.org> --- drivers/infiniband/sw/rxe/rxe_comp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c index 98d470d1f3fc..5bc62c0cc802 100644 --- a/drivers/infiniband/sw/rxe/rxe_comp.c +++ b/drivers/infiniband/sw/rxe/rxe_comp.c @@ -276,6 +276,9 @@ static inline enum comp_state check_ack(struct rxe_qp *qp, case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE: if (wqe->wr.opcode != IB_WR_RDMA_READ && wqe->wr.opcode != IB_WR_RDMA_READ_WITH_INV) { + pr_err("%s: opcode wr %d <> pkt %d\n", __func__, + wqe->wr.opcode, pkt->opcode); + wqe->status = IB_WC_FATAL_ERR; return COMPST_ERROR; } reset_retry_counters(qp); -- 2.17.1

7 years, 2 months

2
1
0 0

[PATCH v6] tpm: separate cmd_ready/go_idle from runtime_pm

by Tomas Winkler

We cannot use go_idle cmd_ready commands via runtime_pm handles as with the introduction of localities this is no longer an optional feature, while runtime pm can be not enabled. Though cmd_ready/go_idle provides a power saving, it's also a part of TPM2 protocol and should be called explicitly. This patch exposes cmd_read/go_idle via tpm class ops and removes runtime pm support as it is not used by any driver. A new tpm transmit flag is added TPM_TRANSMIT_NESTED, which implies TPM_TRANSMIT_UNLOCKED and TPM_TRANSMIT_RAW. Both are needed to resolve tpm spaces and locality request recursive calls to tpm_transmit(). New wrappers are added tpm_cmd_ready() and tpm_go_idle() to streamline tpm_try_transmit code. tpm_crb no longer needs own power saving functions and can drop using tpm_pm_suspend/resume. This patch cannot be really separated from the locality fix. Fixes: 888d867df441 (tpm: cmd_ready command can be issued only after granting locality) Cc: stable(a)vger.kernel.org Fixes: 888d867df441 (tpm: cmd_ready command can be issued only after granting locality) Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> --- V2-3:resent V4: 1. Use tpm_pm_suspend/resume in tpm_crb 2. Drop cmd_ready/go_idle around tpm_chip_register, as there is no usage counter like in runtime_pm. V5: 1. add tpm_cmd_ready and tpm_go_idle wrappers. 2. Abuse TPM_TRANSMIT_UNLOCKED flag to resolve tpm space recursion. V6: 1. Add new flags TPM_TRANSMIT_NESTED which implies TPM_TRANSMIT_UNLOCKED and TPM_TRANSMIT_RAW, as not all unlocked flows are recursive i.e. tpm2_unseal_trusted. drivers/char/tpm/tpm-interface.c | 51 +++++++++++++++---- drivers/char/tpm/tpm.h | 13 ++++- drivers/char/tpm/tpm2-space.c | 12 ++--- drivers/char/tpm/tpm_crb.c | 101 ++++++++++---------------------------- drivers/char/tpm/tpm_vtpm_proxy.c | 2 +- include/linux/tpm.h | 2 + 6 files changed, 88 insertions(+), 93 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index e32f6e85dc6d..1abd8261651b 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -29,7 +29,6 @@ #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/freezer.h> -#include <linux/pm_runtime.h> #include <linux/tpm_eventlog.h> #include "tpm.h" @@ -369,10 +368,13 @@ static int tpm_validate_command(struct tpm_chip *chip, return -EINVAL; } -static int tpm_request_locality(struct tpm_chip *chip) +static int tpm_request_locality(struct tpm_chip *chip, unsigned int flags) { int rc; + if (flags & __TPM_TRANSMIT_RAW) + return 0; + if (!chip->ops->request_locality) return 0; @@ -385,10 +387,13 @@ static int tpm_request_locality(struct tpm_chip *chip) return 0; } -static void tpm_relinquish_locality(struct tpm_chip *chip) +static void tpm_relinquish_locality(struct tpm_chip *chip, unsigned int flags) { int rc; + if (flags & __TPM_TRANSMIT_RAW) + return; + if (!chip->ops->relinquish_locality) return; @@ -399,6 +404,28 @@ static void tpm_relinquish_locality(struct tpm_chip *chip) chip->locality = -1; } +static int tpm_cmd_ready(struct tpm_chip *chip, unsigned int flags) +{ + if (flags & __TPM_TRANSMIT_RAW) + return 0; + + if (!chip->ops->cmd_ready) + return 0; + + return chip->ops->cmd_ready(chip); +} + +static int tpm_go_idle(struct tpm_chip *chip, unsigned int flags) +{ + if (flags & __TPM_TRANSMIT_RAW) + return 0; + + if (!chip->ops->go_idle) + return 0; + + return chip->ops->go_idle(chip); +} + static ssize_t tpm_try_transmit(struct tpm_chip *chip, struct tpm_space *space, u8 *buf, size_t bufsiz, @@ -449,14 +476,15 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, /* Store the decision as chip->locality will be changed. */ need_locality = chip->locality == -1; - if (!(flags & TPM_TRANSMIT_RAW) && need_locality) { - rc = tpm_request_locality(chip); + if (need_locality) { + rc = tpm_request_locality(chip, flags); if (rc < 0) goto out_no_locality; } - if (chip->dev.parent) - pm_runtime_get_sync(chip->dev.parent); + rc = tpm_cmd_ready(chip, flags); + if (rc) + goto out; rc = tpm2_prepare_space(chip, space, ordinal, buf); if (rc) @@ -516,13 +544,16 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, } rc = tpm2_commit_space(chip, space, ordinal, buf, &len); + if (rc) + dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc); out: - if (chip->dev.parent) - pm_runtime_put_sync(chip->dev.parent); + rc = tpm_go_idle(chip, flags); + if (rc) + goto out; if (need_locality) - tpm_relinquish_locality(chip); + tpm_relinquish_locality(chip, flags); out_no_locality: if (chip->ops->clk_enable != NULL) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 4426649e431c..beb0a763016c 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -511,9 +511,18 @@ extern const struct file_operations tpm_fops; extern const struct file_operations tpmrm_fops; extern struct idr dev_nums_idr; +/** + * enum tpm_transmit_flags + * + * @TPM_TRANSMIT_UNLOCKED: used to lock sequence of tpm_transmit calls. + * @__TPM_TRANSMIT_RAW: prevent recursive calls into setup steps + * (go idle, locality,..). Don't use directly. + * @TPM_TRANSMIT_NESTED: Use from nested tpm_transmit calls + */ enum tpm_transmit_flags { - TPM_TRANSMIT_UNLOCKED = BIT(0), - TPM_TRANSMIT_RAW = BIT(1), + TPM_TRANSMIT_UNLOCKED = BIT(0), + __TPM_TRANSMIT_RAW = BIT(1), + TPM_TRANSMIT_NESTED = TPM_TRANSMIT_UNLOCKED | __TPM_TRANSMIT_RAW, }; ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c index 6122d3276f72..d2e101b32482 100644 --- a/drivers/char/tpm/tpm2-space.c +++ b/drivers/char/tpm/tpm2-space.c @@ -39,7 +39,7 @@ static void tpm2_flush_sessions(struct tpm_chip *chip, struct tpm_space *space) for (i = 0; i < ARRAY_SIZE(space->session_tbl); i++) { if (space->session_tbl[i]) tpm2_flush_context_cmd(chip, space->session_tbl[i], - TPM_TRANSMIT_UNLOCKED); + TPM_TRANSMIT_NESTED); } } @@ -84,7 +84,7 @@ static int tpm2_load_context(struct tpm_chip *chip, u8 *buf, tpm_buf_append(&tbuf, &buf[*offset], body_size); rc = tpm_transmit_cmd(chip, NULL, tbuf.data, PAGE_SIZE, 4, - TPM_TRANSMIT_UNLOCKED, NULL); + TPM_TRANSMIT_NESTED, NULL); if (rc < 0) { dev_warn(&chip->dev, "%s: failed with a system error %d\n", __func__, rc); @@ -133,7 +133,7 @@ static int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf, tpm_buf_append_u32(&tbuf, handle); rc = tpm_transmit_cmd(chip, NULL, tbuf.data, PAGE_SIZE, 0, - TPM_TRANSMIT_UNLOCKED, NULL); + TPM_TRANSMIT_NESTED, NULL); if (rc < 0) { dev_warn(&chip->dev, "%s: failed with a system error %d\n", __func__, rc); @@ -170,7 +170,7 @@ static void tpm2_flush_space(struct tpm_chip *chip) for (i = 0; i < ARRAY_SIZE(space->context_tbl); i++) if (space->context_tbl[i] && ~space->context_tbl[i]) tpm2_flush_context_cmd(chip, space->context_tbl[i], - TPM_TRANSMIT_UNLOCKED); + TPM_TRANSMIT_NESTED); tpm2_flush_sessions(chip, space); } @@ -377,7 +377,7 @@ static int tpm2_map_response_header(struct tpm_chip *chip, u32 cc, u8 *rsp, return 0; out_no_slots: - tpm2_flush_context_cmd(chip, phandle, TPM_TRANSMIT_UNLOCKED); + tpm2_flush_context_cmd(chip, phandle, TPM_TRANSMIT_NESTED); dev_warn(&chip->dev, "%s: out of slots for 0x%08X\n", __func__, phandle); return -ENOMEM; @@ -465,7 +465,7 @@ static int tpm2_save_space(struct tpm_chip *chip) return rc; tpm2_flush_context_cmd(chip, space->context_tbl[i], - TPM_TRANSMIT_UNLOCKED); + TPM_TRANSMIT_NESTED); space->context_tbl[i] = ~0; } diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 34fbc6cb097b..36952ef98f90 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -132,7 +132,7 @@ static bool crb_wait_for_reg_32(u32 __iomem *reg, u32 mask, u32 value, } /** - * crb_go_idle - request tpm crb device to go the idle state + * __crb_go_idle - request tpm crb device to go the idle state * * @dev: crb device * @priv: crb private data @@ -147,7 +147,7 @@ static bool crb_wait_for_reg_32(u32 __iomem *reg, u32 mask, u32 value, * * Return: 0 always */ -static int crb_go_idle(struct device *dev, struct crb_priv *priv) +static int __crb_go_idle(struct device *dev, struct crb_priv *priv) { if ((priv->sm == ACPI_TPM2_START_METHOD) || (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) || @@ -163,11 +163,20 @@ static int crb_go_idle(struct device *dev, struct crb_priv *priv) dev_warn(dev, "goIdle timed out\n"); return -ETIME; } + return 0; } +static int crb_go_idle(struct tpm_chip *chip) +{ + struct device *dev = &chip->dev; + struct crb_priv *priv = dev_get_drvdata(dev); + + return __crb_go_idle(dev, priv); +} + /** - * crb_cmd_ready - request tpm crb device to enter ready state + * __crb_cmd_ready - request tpm crb device to enter ready state * * @dev: crb device * @priv: crb private data @@ -181,7 +190,7 @@ static int crb_go_idle(struct device *dev, struct crb_priv *priv) * * Return: 0 on success -ETIME on timeout; */ -static int crb_cmd_ready(struct device *dev, struct crb_priv *priv) +static int __crb_cmd_ready(struct device *dev, struct crb_priv *priv) { if ((priv->sm == ACPI_TPM2_START_METHOD) || (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) || @@ -200,6 +209,14 @@ static int crb_cmd_ready(struct device *dev, struct crb_priv *priv) return 0; } +static int crb_cmd_ready(struct tpm_chip *chip) +{ + struct device *dev = &chip->dev; + struct crb_priv *priv = dev_get_drvdata(dev); + + return __crb_cmd_ready(dev, priv); +} + static int __crb_request_locality(struct device *dev, struct crb_priv *priv, int loc) { @@ -401,6 +418,8 @@ static const struct tpm_class_ops tpm_crb = { .send = crb_send, .cancel = crb_cancel, .req_canceled = crb_req_canceled, + .go_idle = crb_go_idle, + .cmd_ready = crb_cmd_ready, .request_locality = crb_request_locality, .relinquish_locality = crb_relinquish_locality, .req_complete_mask = CRB_DRV_STS_COMPLETE, @@ -520,7 +539,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, * PTT HW bug w/a: wake up the device to access * possibly not retained registers. */ - ret = crb_cmd_ready(dev, priv); + ret = __crb_cmd_ready(dev, priv); if (ret) goto out_relinquish_locality; @@ -565,7 +584,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, if (!ret) priv->cmd_size = cmd_size; - crb_go_idle(dev, priv); + __crb_go_idle(dev, priv); out_relinquish_locality: @@ -628,32 +647,7 @@ static int crb_acpi_add(struct acpi_device *device) chip->acpi_dev_handle = device->handle; chip->flags = TPM_CHIP_FLAG_TPM2; - rc = __crb_request_locality(dev, priv, 0); - if (rc) - return rc; - - rc = crb_cmd_ready(dev, priv); - if (rc) - goto out; - - pm_runtime_get_noresume(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - - rc = tpm_chip_register(chip); - if (rc) { - crb_go_idle(dev, priv); - pm_runtime_put_noidle(dev); - pm_runtime_disable(dev); - goto out; - } - - pm_runtime_put_sync(dev); - -out: - __crb_relinquish_locality(dev, priv, 0); - - return rc; + return tpm_chip_register(chip); } static int crb_acpi_remove(struct acpi_device *device) @@ -663,52 +657,11 @@ static int crb_acpi_remove(struct acpi_device *device) tpm_chip_unregister(chip); - pm_runtime_disable(dev); - return 0; } -static int __maybe_unused crb_pm_runtime_suspend(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_go_idle(dev, priv); -} - -static int __maybe_unused crb_pm_runtime_resume(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_cmd_ready(dev, priv); -} - -static int __maybe_unused crb_pm_suspend(struct device *dev) -{ - int ret; - - ret = tpm_pm_suspend(dev); - if (ret) - return ret; - - return crb_pm_runtime_suspend(dev); -} - -static int __maybe_unused crb_pm_resume(struct device *dev) -{ - int ret; - - ret = crb_pm_runtime_resume(dev); - if (ret) - return ret; - - return tpm_pm_resume(dev); -} - static const struct dev_pm_ops crb_pm = { - SET_SYSTEM_SLEEP_PM_OPS(crb_pm_suspend, crb_pm_resume) - SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume) }; static const struct acpi_device_id crb_device_ids[] = { diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c index e4f79f920450..87a0ce47f201 100644 --- a/drivers/char/tpm/tpm_vtpm_proxy.c +++ b/drivers/char/tpm/tpm_vtpm_proxy.c @@ -418,7 +418,7 @@ static int vtpm_proxy_request_locality(struct tpm_chip *chip, int locality) proxy_dev->state |= STATE_DRIVER_COMMAND; rc = tpm_transmit_cmd(chip, NULL, buf.data, tpm_buf_length(&buf), 0, - TPM_TRANSMIT_UNLOCKED | TPM_TRANSMIT_RAW, + TPM_TRANSMIT_NESTED, "attempting to set locality"); proxy_dev->state &= ~STATE_DRIVER_COMMAND; diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 06639fb6ab85..8eb5e5ebe136 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -43,6 +43,8 @@ struct tpm_class_ops { u8 (*status) (struct tpm_chip *chip); bool (*update_timeouts)(struct tpm_chip *chip, unsigned long *timeout_cap); + int (*go_idle)(struct tpm_chip *chip); + int (*cmd_ready)(struct tpm_chip *chip); int (*request_locality)(struct tpm_chip *chip, int loc); int (*relinquish_locality)(struct tpm_chip *chip, int loc); void (*clk_enable)(struct tpm_chip *chip, bool value); -- 2.14.4

7 years, 2 months

3
6
0 0

[PATCH v2] drm/etnaviv: Fix driver unregistering

by Fabio Estevam

From: Fabio Estevam <fabio.estevam(a)nxp.com> Russell King reported: "When removing and reloading the etnaviv module, the following splat occurs: sysfs: cannot create duplicate filename '/devices/platform/etnaviv' CPU: 0 PID: 1471 Comm: modprobe Not tainted 4.17.0+ #1608 Hardware name: Marvell Dove (Cubox) Backtrace: [<c00157d4>] (dump_backtrace) from [<c0015b8c>] (show_stack+0x18/0x1c) r6:ef033e38 r5:ee07b340 r4:edb9d000 r3:00000000 [<c0015b74>] (show_stack) from [<c0620784>] (dump_stack+0x20/0x28) [<c0620764>] (dump_stack) from [<c01bcd24>] (sysfs_warn_dup+0x5c/0x70) [<c01bccc8>] (sysfs_warn_dup) from [<c01bce14>] (sysfs_create_dir_ns+0x90/0x98) ..." Commit 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") introduced DRM registration via platform_device_register_simple(), but missed to call platform_device_unregister() inside etnaviv_exit(). Fix the problem by calling platform_device_unregister() inside etnaviv_exit(). While at it, also rearrange the function calls in the exit path to make them happen in the opposite order of registration. Tested on a imx6-sabresd board. Cc: <stable(a)vger.kernel.org> Fixes: 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") Reported-by: Russell King <linux(a)armlinux.org.uk> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Make the exit path symmetrical to the init path by calling platform_device_unregister() inside for_each_compatible_node() drivers/gpu/drm/etnaviv/etnaviv_drv.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index e5013a9..626ad8b 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -631,6 +631,8 @@ static struct platform_driver etnaviv_platform_driver = { }, }; +static struct platform_device *etnaviv_drm; + static int __init etnaviv_init(void) { int ret; @@ -654,7 +656,8 @@ static int __init etnaviv_init(void) if (!of_device_is_available(np)) continue; - platform_device_register_simple("etnaviv", -1, NULL, 0); + etnaviv_drm = platform_device_register_simple("etnaviv", -1, + NULL, 0); of_node_put(np); break; } @@ -665,8 +668,19 @@ module_init(etnaviv_init); static void __exit etnaviv_exit(void) { - platform_driver_unregister(&etnaviv_gpu_driver); + struct device_node *np; + + for_each_compatible_node(np, NULL, "vivante,gc") { + if (!of_device_is_available(np)) + continue; + + platform_device_unregister(etnaviv_drm); + of_node_put(np); + break; + } + platform_driver_unregister(&etnaviv_platform_driver); + platform_driver_unregister(&etnaviv_gpu_driver); } module_exit(etnaviv_exit); -- 2.7.4

7 years, 2 months

2
2
0 0

[PATCH 4.16 00/64] 4.16.18-stable review

by Greg Kroah-Hartman

---------------- NOTE: This will be the last 4.16.y release. After this release, this tree will be end-of-life. You should have moved to the 4.17.y tree by now. ---------------- This is the start of the stable review cycle for the 4.16.18 release. There are 64 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Tue Jun 26 14:27:22 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.18-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.16.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.16.18-rc1 Vlastimil Babka <vbabka(a)suse.cz> mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: report attributes_mask and attributes for statx Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: harden page loading code Tony Luck <tony.luck(a)intel.com> x86/intel_rdt: Enable CMT and MBM on new Skylake stepping Thomas Gleixner <tglx(a)linutronix.de> genirq/migration: Avoid out of line call if pending is not set Thomas Gleixner <tglx(a)linutronix.de> genirq/affinity: Defer affinity setting if irq chip is busy Thomas Gleixner <tglx(a)linutronix.de> genirq/generic_pending: Do not lose pending affinity update Thomas Gleixner <tglx(a)linutronix.de> irq_remapping: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/platform/uv: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/ioapic: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Provide apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Prevent hlist corruption and leaks Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/vector: Fix the args of vector_alloc tracepoint Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Keith Busch <keith.busch(a)intel.com> nvme/pci: Sync controller reset for AER slot_reset Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Chen Yu <yu.c.chen(a)intel.com> cpufreq: governors: Fix long idle detection logic in load calculation Suman Anna <s-anna(a)ti.com> cpufreq: ti-cpufreq: Fix an incorrect error return value Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Tejun Heo <tj(a)kernel.org> bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue Roman Pen <roman.penyaev(a)profitbricks.com> blk-mq: reinit q->tag_set_list entry only after grace period Josef Bacik <jbacik(a)fb.com> nbd: use bd_set_size when updating disk size Josef Bacik <jbacik(a)fb.com> nbd: update size when connected Josef Bacik <jbacik(a)fb.com> nbd: fix nbd device deletion Shirish Pargaonkar <shirishpargaonkar(a)gmail.com> cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class Mark Syms <mark.syms(a)citrix.com> CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Steve French <stfrench(a)microsoft.com> smb3: fix various xid leaks Tony Luck <tony.luck(a)intel.com> x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable the quirk for Nura headset Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: return error value if create_io_em failed in cow_file_range Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Theodore Ts'o <tytso(a)mit.edu> ext4: correctly handle a zero-length xattr with a non-zero e_value_offs Theodore Ts'o <tytso(a)mit.edu> ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget() Theodore Ts'o <tytso(a)mit.edu> ext4: do not allow external inodes for inline data Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Daniel Borkmann <daniel(a)iogearbox.net> tls: fix use-after-free in tls_push_record Dexuan Cui <decui(a)microsoft.com> hv_netvsc: Fix a network regression after ifdown/ifup Willem de Bruijn <willemb(a)google.com> net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Paolo Abeni <pabeni(a)redhat.com> udp: fix rx queue len reported by diag and proc interface Cong Wang <xiyou.wangcong(a)gmail.com> socket: close race condition between sock_close() and sockfs_setattr() Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Alvaro Gamez Machado <alvaro.gamez(a)hazent.com> net: phy: dp83822: use BMCR_ANENABLE instead of BMSR_ANEGCAPABLE for DP83620 Zhouyang Jia <jiazhouyang09(a)gmail.com> net: dsa: add error handling for pskb_trim_rcsum Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Bjørn Mork <bjorn(a)mork.no> cdc_ncm: avoid padding beyond end of skb Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes ------------- Diffstat: Makefile | 4 +- arch/x86/include/asm/apic.h | 2 + arch/x86/include/asm/trace/irq_vectors.h | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 18 ++++++- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- arch/x86/platform/uv/uv_irq.c | 7 +-- block/blk-mq.c | 3 +- drivers/ata/libata-core.c | 3 -- drivers/ata/libata-zpodd.c | 2 +- drivers/base/core.c | 14 +++++- drivers/block/nbd.c | 17 ++++++- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/cpufreq_governor.c | 12 ++--- drivers/cpufreq/ti-cpufreq.c | 2 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++------ drivers/hid/wacom_sys.c | 8 +++ drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/iommu/irq_remapping.c | 5 -- drivers/iommu/irq_remapping.h | 2 - drivers/net/bonding/bond_options.c | 1 + drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/phy/dp83848.c | 35 ++++++++++--- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wireless/intel/iwlwifi/fw/paging.c | 49 ++++++++++++++++--- drivers/nvme/host/pci.c | 11 ++++- drivers/vhost/vhost.c | 3 ++ drivers/w1/masters/mxc_w1.c | 20 +++++--- fs/binfmt_misc.c | 12 +++-- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 18 ++++--- fs/btrfs/scrub.c | 2 +- fs/cifs/cifsacl.h | 14 ++++++ fs/cifs/smb2ops.c | 68 ++++++++++++++++++-------- fs/cifs/smb2pdu.c | 4 +- fs/ext4/indirect.c | 14 ++++-- fs/ext4/inline.c | 6 +++ fs/ext4/inode.c | 46 +++++++++-------- fs/ext4/resize.c | 2 +- fs/ext4/xattr.c | 2 +- fs/orangefs/inode.c | 7 +++ fs/orangefs/namei.c | 7 +++ include/linux/irq.h | 7 ++- include/linux/virtio_net.h | 11 ++--- include/net/transp_v6.h | 11 ++++- include/net/udp.h | 5 ++ kernel/irq/manage.c | 37 +++++++++++++- kernel/irq/migration.c | 31 +++++++----- mm/backing-dev.c | 18 ++++++- mm/page_alloc.c | 1 - net/dsa/tag_trailer.c | 3 +- net/ipv4/tcp_ipv4.c | 4 ++ net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +-- net/ipv6/route.c | 3 -- net/ipv6/tcp_ipv6.c | 4 ++ net/ipv6/udp.c | 3 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 +++--- net/socket.c | 18 +++++-- net/tls/tls_sw.c | 26 +++++----- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 3 ++ sound/pci/hda/patch_realtek.c | 6 ++- sound/usb/quirks-table.h | 5 ++ 71 files changed, 498 insertions(+), 210 deletions(-)

7 years, 2 months

3
65
0 0

[PATCH 4.14 00/52] 4.14.52-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.52 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Tue Jun 26 14:27:24 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.52-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.52-rc1 Vlastimil Babka <vbabka(a)suse.cz> mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: report attributes_mask and attributes for statx Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: harden page loading code Tony Luck <tony.luck(a)intel.com> x86/intel_rdt: Enable CMT and MBM on new Skylake stepping Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Chen Yu <yu.c.chen(a)intel.com> cpufreq: governors: Fix long idle detection logic in load calculation Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Tejun Heo <tj(a)kernel.org> bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue Roman Pen <roman.penyaev(a)profitbricks.com> blk-mq: reinit q->tag_set_list entry only after grace period Josef Bacik <jbacik(a)fb.com> nbd: use bd_set_size when updating disk size Josef Bacik <jbacik(a)fb.com> nbd: update size when connected Josef Bacik <jbacik(a)fb.com> nbd: fix nbd device deletion Shirish Pargaonkar <shirishpargaonkar(a)gmail.com> cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class Mark Syms <mark.syms(a)citrix.com> CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Steve French <stfrench(a)microsoft.com> smb3: fix various xid leaks Tony Luck <tony.luck(a)intel.com> x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: return error value if create_io_em failed in cow_file_range Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Theodore Ts'o <tytso(a)mit.edu> ext4: correctly handle a zero-length xattr with a non-zero e_value_offs Theodore Ts'o <tytso(a)mit.edu> ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget() Theodore Ts'o <tytso(a)mit.edu> ext4: do not allow external inodes for inline data Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Trond Myklebust <trond.myklebust(a)primarydata.com> NFSv4.1: Fix up replays of interrupted requests Daniel Borkmann <daniel(a)iogearbox.net> tls: fix use-after-free in tls_push_record Dexuan Cui <decui(a)microsoft.com> hv_netvsc: Fix a network regression after ifdown/ifup Willem de Bruijn <willemb(a)google.com> net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Paolo Abeni <pabeni(a)redhat.com> udp: fix rx queue len reported by diag and proc interface Cong Wang <xiyou.wangcong(a)gmail.com> socket: close race condition between sock_close() and sockfs_setattr() Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Zhouyang Jia <jiazhouyang09(a)gmail.com> net: dsa: add error handling for pskb_trim_rcsum Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Bjørn Mork <bjorn(a)mork.no> cdc_ncm: avoid padding beyond end of skb Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes ------------- Diffstat: Makefile | 4 +- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- block/blk-mq.c | 3 +- drivers/ata/libata-core.c | 3 - drivers/ata/libata-zpodd.c | 2 +- drivers/base/core.c | 14 ++- drivers/block/nbd.c | 17 ++- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/cpufreq_governor.c | 12 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 ++-- drivers/hid/wacom_sys.c | 8 ++ drivers/net/bonding/bond_options.c | 1 + drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wireless/intel/iwlwifi/fw/paging.c | 49 ++++++-- drivers/vhost/vhost.c | 3 + drivers/w1/masters/mxc_w1.c | 20 ++-- fs/binfmt_misc.c | 12 +- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 18 +-- fs/btrfs/scrub.c | 2 +- fs/cifs/cifsacl.h | 14 +++ fs/cifs/smb2ops.c | 68 ++++++++---- fs/cifs/smb2pdu.c | 4 +- fs/ext4/indirect.c | 14 ++- fs/ext4/inline.c | 6 + fs/ext4/inode.c | 46 ++++---- fs/ext4/resize.c | 2 +- fs/ext4/xattr.c | 2 +- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4proc.c | 148 +++++++++++++++++-------- fs/orangefs/inode.c | 7 ++ fs/orangefs/namei.c | 7 ++ include/linux/virtio_net.h | 11 +- include/net/transp_v6.h | 11 +- include/net/udp.h | 5 + mm/backing-dev.c | 18 ++- mm/page_alloc.c | 1 - net/dsa/tag_trailer.c | 3 +- net/ipv4/tcp_ipv4.c | 4 + net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +- net/ipv6/route.c | 3 - net/ipv6/tcp_ipv6.c | 4 + net/ipv6/udp.c | 3 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 +-- net/socket.c | 18 ++- net/tls/tls_sw.c | 26 ++--- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 3 + sound/pci/hda/patch_realtek.c | 6 +- 57 files changed, 473 insertions(+), 215 deletions(-)

7 years, 2 months

3
53
0 0

[PATCH 4.9 00/39] 4.9.110-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.110 release. There are 39 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Tue Jun 26 15:23:25 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.110-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.110-rc1 Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Colin Ian King <colin.king(a)canonical.com> libata: zpodd: make arrays cdb static, reduces object code size Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - New codec support for ALC257 Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend Liu Bo <bo.li.liu(a)oracle.com> Btrfs: make raid6 rebuild retry more Eric Dumazet <edumazet(a)google.com> tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Sasha Levin <Alexander.Levin(a)microsoft.com> Revert "Btrfs: fix scrub to repair raid6 corruption" Damien Thébault <damien.thebault(a)vitec.com> net: dsa: b53: Add BCM5389 support Finn Thain <fthain(a)telegraphics.com.au> net/sonic: Use dma_mapping_error() João Paulo Rechi Vita <jprvita(a)gmail.com> platform/x86: asus-wmi: Fix NULL pointer dereference Josh Hill <josh(a)joshuajhill.com> net: qmi_wwan: Add Netgear Aircard 779S Ivan Bornyakov <brnkv.i1(a)gmail.com> atm: zatm: fix memcmp casting Hao Wei Tee <angelsl(a)in04.sg> iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs Julian Anastasov <ja(a)ssi.bg> ipvs: fix buffer overflow with sync daemon and service Paolo Abeni <pabeni(a)redhat.com> netfilter: ebtables: handle string from userspace with care Eric Dumazet <edumazet(a)google.com> xfrm6: avoid potential infinite loop in _decode_session6() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> objtool: update .gitignore file ------------- Diffstat: Documentation/devicetree/bindings/net/dsa/b53.txt | 1 + Makefile | 4 +-- drivers/ata/libata-core.c | 3 -- drivers/ata/libata-zpodd.c | 4 +-- drivers/atm/zatm.c | 4 +-- drivers/base/core.c | 14 +++++++-- drivers/cpufreq/cpufreq.c | 2 ++ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++++--------- drivers/net/bonding/bond_options.c | 1 + drivers/net/dsa/b53/b53_common.c | 13 ++++++++ drivers/net/dsa/b53/b53_mdio.c | 5 +++- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/ethernet/natsemi/sonic.c | 2 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 +++---- drivers/platform/x86/asus-wmi.c | 23 ++++++++------- drivers/usb/musb/musb_host.c | 5 +++- drivers/usb/musb/musb_host.h | 7 +++-- drivers/usb/musb/musb_virthub.c | 25 +++++++++------- drivers/vhost/vhost.c | 3 ++ drivers/w1/masters/mxc_w1.c | 20 ++++++++----- fs/binfmt_misc.c | 12 ++++++-- fs/btrfs/ioctl.c | 18 +++++++----- fs/btrfs/scrub.c | 2 +- fs/cifs/smb2pdu.c | 1 + fs/ext4/indirect.c | 14 ++++++--- fs/ext4/inode.c | 36 +++++++++++------------ fs/ext4/resize.c | 2 +- fs/orangefs/namei.c | 7 +++++ net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +++ net/ipv6/route.c | 3 -- net/ipv6/tcp_ipv6.c | 4 +++ net/ipv6/xfrm6_policy.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 21 +++++++++---- net/sched/act_simple.c | 15 ++++------ sound/pci/hda/hda_controller.c | 4 ++- sound/pci/hda/patch_conexant.c | 2 ++ sound/pci/hda/patch_realtek.c | 8 +++++ tools/objtool/.gitignore | 2 +- 41 files changed, 212 insertions(+), 120 deletions(-)

7 years, 2 months

4
38
0 0

[PATCH v3 03/17] arm64: dts: marvell: fix CP110 ICU node size

by Miquel Raynal

ICU size in CP110 is not 0x10 but at least 0x440 bytes long (from the specification). Fixes: 6ef84a827c37 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 7dabe25f6774..1c6ff8197a88 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -149,7 +149,7 @@ CP110_LABEL(icu): interrupt-controller@1e0000 { compatible = "marvell,cp110-icu"; - reg = <0x1e0000 0x10>; + reg = <0x1e0000 0x440>; #interrupt-cells = <3>; interrupt-controller; msi-parent = <&gicp>; -- 2.14.1

7 years, 2 months

2
2
0 0

[PATCH] Revert "mm: page_alloc: skip over regions of invalid pfns where possible"

by Daniel Vacek

This reverts commit b92df1de5d289c0b5d653e72414bf0850b8511e0. The commit is meant to be a boot init speed up skipping the loop in memmap_init_zone() for invalid pfns. But given some specific memory mapping on x86_64 (or more generally theoretically anywhere but on arm with CONFIG_HAVE_ARCH_PFN_VALID) the implementation also skips valid pfns which is plain wrong and causes 'kernel BUG at mm/page_alloc.c:1389!' crash> log | grep -e BUG -e RIP -e Call.Trace -e move_freepages_block -e rmqueue -e freelist -A1 kernel BUG at mm/page_alloc.c:1389! invalid opcode: 0000 [#1] SMP -- RIP: 0010:[<ffffffff8118833e>] [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP: 0018:ffff88054d727688 EFLAGS: 00010087 -- Call Trace: [<ffffffff811883b3>] move_freepages_block+0x73/0x80 [<ffffffff81189e63>] __rmqueue+0x263/0x460 [<ffffffff8118c781>] get_page_from_freelist+0x7e1/0x9e0 [<ffffffff8118caf6>] __alloc_pages_nodemask+0x176/0x420 -- RIP [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP <ffff88054d727688> crash> page_init_bug -v | grep RAM <struct resource 0xffff88067fffd2f8> 1000 - 9bfff System RAM (620.00 KiB) <struct resource 0xffff88067fffd3a0> 100000 - 430bffff System RAM ( 1.05 GiB = 1071.75 MiB = 1097472.00 KiB) <struct resource 0xffff88067fffd410> 4b0c8000 - 4bf9cfff System RAM ( 14.83 MiB = 15188.00 KiB) <struct resource 0xffff88067fffd480> 4bfac000 - 646b1fff System RAM (391.02 MiB = 400408.00 KiB) <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct resource 0xffff88067fffd640> 100000000 - 67fffffff System RAM ( 22.00 GiB) crash> page_init_bug | head -6 <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct page 0xffffea0001ede200> 1fffff00000000 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 <struct page 0xffffea0001ede200> 505736 505344 <struct page 0xffffea0001ed8000> 505855 <struct page 0xffffea0001edffc0> <struct page 0xffffea0001ed8000> 0 0 <struct pglist_data 0xffff88047ffd9000> 0 <struct zone 0xffff88047ffd9000> DMA 1 4095 <struct page 0xffffea0001edffc0> 1fffff00000400 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 BUG, zones differ! crash> kmem -p 77fff000 78000000 7b5ff000 7b600000 7b787000 7b788000 PAGE PHYSICAL MAPPING INDEX CNT FLAGS ffffea0001e00000 78000000 0 0 0 0 ffffea0001ed7fc0 7b5ff000 0 0 0 0 ffffea0001ed8000 7b600000 0 0 0 0 <<<< ffffea0001ede1c0 7b787000 0 0 0 0 ffffea0001ede200 7b788000 0 0 1 1fffff00000000 Fixes: b92df1de5d28 ("mm: page_alloc: skip over regions of invalid pfns where possible") Signed-off-by: Daniel Vacek <neelx(a)redhat.com> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Pavel Tatashin <pasha.tatashin(a)oracle.com> Cc: Paul Burton <paul.burton(a)imgtec.com> Cc: stable(a)vger.kernel.org --- include/linux/memblock.h | 1 - mm/memblock.c | 28 ---------------------------- mm/page_alloc.c | 11 +---------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 8be5077efb5f..f92ea7783652 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -187,7 +187,6 @@ int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn); void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, unsigned long *out_end_pfn, int *out_nid); -unsigned long memblock_next_valid_pfn(unsigned long pfn, unsigned long max_pfn); /** * for_each_mem_pfn_range - early memory pfn range iterator diff --git a/mm/memblock.c b/mm/memblock.c index b6ba6b7adadc..48376bd33274 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1101,34 +1101,6 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid, *out_nid = r->nid; } -unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn, - unsigned long max_pfn) -{ - struct memblock_type *type = &memblock.memory; - unsigned int right = type->cnt; - unsigned int mid, left = 0; - phys_addr_t addr = PFN_PHYS(++pfn); - - do { - mid = (right + left) / 2; - - if (addr < type->regions[mid].base) - right = mid; - else if (addr >= (type->regions[mid].base + - type->regions[mid].size)) - left = mid + 1; - else { - /* addr is within the region, so pfn is valid */ - return pfn; - } - } while (left < right); - - if (right == type->cnt) - return -1UL; - else - return PHYS_PFN(type->regions[right].base); -} - /** * memblock_set_node - set node ID on memblock regions * @base: base of area to set node ID for diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 635d7dd29d7f..e4566a3f8083 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5356,17 +5356,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, if (context != MEMMAP_EARLY) goto not_early; - if (!early_pfn_valid(pfn)) { -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP - /* - * Skip to the pfn preceding the next valid one (or - * end_pfn), such that we hit a valid pfn (or end_pfn) - * on our next iteration of the loop. - */ - pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1; -#endif + if (!early_pfn_valid(pfn)) continue; - } if (!early_pfn_in_nid(pfn, nid)) continue; if (!update_defer_init(pgdat, pfn, end_pfn, &nr_initialised)) -- 2.16.2

7 years, 2 months

3
4
0 0

patch "staging: android: ion: Return an ERR_PTR in ion_map_kernel" added to staging-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: android: ion: Return an ERR_PTR in ion_map_kernel to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 0a2bc00341dcfcc793c0dbf4f8d43adf60458b05 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott(a)redhat.com> Date: Mon, 11 Jun 2018 11:06:53 -0700 Subject: staging: android: ion: Return an ERR_PTR in ion_map_kernel The expected return value from ion_map_kernel is an ERR_PTR. The error path for a vmalloc failure currently just returns NULL, triggering a warning in ion_buffer_kmap_get. Encode the vmalloc failure as an ERR_PTR. Reported-by: syzbot+55b1d9f811650de944c6(a)syzkaller.appspotmail.com Signed-off-by: Laura Abbott <labbott(a)redhat.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/android/ion/ion_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index e8c440329708..31db510018a9 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, struct page **tmp = pages; if (!pages) - return NULL; + return ERR_PTR(-ENOMEM); if (buffer->flags & ION_FLAG_CACHED) pgprot = PAGE_KERNEL; -- 2.18.0

7 years, 2 months

1
0
0 0

patch "usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d5a4f93511b7000183c0d528739b824752139f79 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen(a)nxp.com> Date: Tue, 12 Jun 2018 09:53:01 +0800 Subject: usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is re-entered The port->logbuffer_head may be wrong if the two processes enters _tcpm_log at the mostly same time. The 2nd process enters _tcpm_log before the 1st process update the index, then the 2nd process will not allocate logbuffer, when the 2nd process tries to use log buffer, the index has already updated by the 1st process, so it will get NULL pointer for updated logbuffer, the error message like below: tcpci 0-0050: Log buffer index 6 is NULL Cc: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: Guenter Roeck <linux(a)roeck-us.net> Cc: Jun Li <jun.li(a)nxp.com> Signed-off-by: Peter Chen <peter.chen(a)nxp.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 0dfd755020f4..d961f1ec0e08 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -418,17 +418,18 @@ static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args) u64 ts_nsec = local_clock(); unsigned long rem_nsec; + mutex_lock(&port->logbuffer_lock); if (!port->logbuffer[port->logbuffer_head]) { port->logbuffer[port->logbuffer_head] = kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL); - if (!port->logbuffer[port->logbuffer_head]) + if (!port->logbuffer[port->logbuffer_head]) { + mutex_unlock(&port->logbuffer_lock); return; + } } vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args); - mutex_lock(&port->logbuffer_lock); - if (tcpm_log_full(port)) { port->logbuffer_head = max(port->logbuffer_head - 1, 0); strcpy(tmpbuffer, "overflow"); -- 2.18.0

7 years, 2 months

1
0
0 0

patch "usb: cdc_acm: Add quirk for Uniden UBC125 scanner" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: cdc_acm: Add quirk for Uniden UBC125 scanner to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 4a762569a2722b8a48066c7bacf0e1dc67d17fa1 Mon Sep 17 00:00:00 2001 From: Houston Yaroschoff <hstn(a)4ever3.net> Date: Mon, 11 Jun 2018 12:39:09 +0200 Subject: usb: cdc_acm: Add quirk for Uniden UBC125 scanner Uniden UBC125 radio scanner has USB interface which fails to work with cdc_acm driver: usb 1-1.5: new full-speed USB device number 4 using xhci_hcd cdc_acm 1-1.5:1.0: Zero length descriptor references cdc_acm: probe of 1-1.5:1.0 failed with error -22 Adding the NO_UNION_NORMAL quirk for the device fixes the issue: usb 1-4: new full-speed USB device number 15 using xhci_hcd usb 1-4: New USB device found, idVendor=1965, idProduct=0018 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: UBC125XLT usb 1-4: Manufacturer: Uniden Corp. usb 1-4: SerialNumber: 0001 cdc_acm 1-4:1.0: ttyACM0: USB ACM device `lsusb -v` of the device: Bus 001 Device 015: ID 1965:0018 Uniden Corporation Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 2 Communications bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x1965 Uniden Corporation idProduct 0x0018 bcdDevice 0.01 iManufacturer 1 Uniden Corp. iProduct 2 UBC125XLT iSerial 3 0001 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 48 bNumInterfaces 2 bConfigurationValue 1 iConfiguration 0 bmAttributes 0x80 (Bus Powered) MaxPower 500mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 2 Communications bInterfaceSubClass 2 Abstract (modem) bInterfaceProtocol 0 None iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x87 EP 7 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0008 1x 8 bytes bInterval 10 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 10 CDC Data bInterfaceSubClass 0 Unused bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0040 1x 64 bytes bInterval 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x02 EP 2 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0040 1x 64 bytes bInterval 0 Device Status: 0x0000 (Bus Powered) Signed-off-by: Houston Yaroschoff <hstn(a)4ever3.net> Cc: stable <stable(a)vger.kernel.org> Acked-by: Oliver Neukum <oneukum(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/class/cdc-acm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7b366a6c0b49..998b32d0167e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1758,6 +1758,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */ .driver_info = SINGLE_RX_URB, }, + { USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, -- 2.18.0

7 years, 2 months

1
0
0 0

patch "usb: typec: ucsi: Fix for incorrect status data issue" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: ucsi: Fix for incorrect status data issue to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 68816e16b4789f2d05e77b6dcb77564cf5d6a8d8 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:43:19 +0300 Subject: usb: typec: ucsi: Fix for incorrect status data issue According to UCSI Specification, Connector Change Event only means a change in the Connector Status and Operation Mode fields of the STATUS data structure. So any other change should create another event. Unfortunately on some platforms the firmware acting as PPM (platform policy manager - usually embedded controller firmware) still does not report any other status changes if there is a connector change event. So if the connector power or data role was changed when a device was plugged to the connector, the driver does not get any indication about that. The port will show wrong roles if that happens. To fix the issue, always checking the data and power role together with a connector change event. Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface") Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/ucsi/ucsi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index bd5cca5632b3..8d0a6fe748bd 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -350,6 +350,19 @@ static void ucsi_connector_change(struct work_struct *work) } if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) { + typec_set_pwr_role(con->port, con->status.pwr_dir); + + switch (con->status.partner_type) { + case UCSI_CONSTAT_PARTNER_TYPE_UFP: + typec_set_data_role(con->port, TYPEC_HOST); + break; + case UCSI_CONSTAT_PARTNER_TYPE_DFP: + typec_set_data_role(con->port, TYPEC_DEVICE); + break; + default: + break; + } + if (con->status.connected) ucsi_register_partner(con); else -- 2.18.0

7 years, 2 months

1
0
0 0

patch "xhci: Fix kernel oops in trace_xhci_free_virt_device" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled xhci: Fix kernel oops in trace_xhci_free_virt_device to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d850c1658328e757635a46763783c6fd56390dcb Mon Sep 17 00:00:00 2001 From: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:19:42 +0300 Subject: xhci: Fix kernel oops in trace_xhci_free_virt_device commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") set dev->udev pointer to NULL in xhci_free_dev(), it will cause kernel panic in trace_xhci_free_virt_device. This patch reimplement the trace function trace_xhci_free_virt_device, remove dev->udev dereference and added more useful parameters to show in the trace function,it also makes sure dev->udev is not NULL before calling trace_xhci_free_virt_device. This issue happened when xhci-hcd trace is enabled and USB devices hot plug test. Original use-after-free patch went to stable so this needs so be applied there as well. [ 1092.022457] usb 2-4: USB disconnect, device number 6 [ 1092.092772] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 1092.101694] PGD 0 P4D 0 [ 1092.104601] Oops: 0000 [#1] SMP [ 1092.207734] Workqueue: usb_hub_wq hub_event [ 1092.212507] RIP: 0010:trace_event_raw_event_xhci_log_virt_dev+0x6c/0xf0 [ 1092.220050] RSP: 0018:ffff8c252e883d28 EFLAGS: 00010086 [ 1092.226024] RAX: ffff8c24af86fa84 RBX: 0000000000000003 RCX: ffff8c25255c2a01 [ 1092.234130] RDX: 0000000000000000 RSI: 00000000aef55009 RDI: ffff8c252e883d28 [ 1092.242242] RBP: ffff8c252550e2c0 R08: ffff8c24af86fa84 R09: 0000000000000a70 [ 1092.250364] R10: 0000000000000a70 R11: 0000000000000000 R12: ffff8c251f21a000 [ 1092.258468] R13: 000000000000000c R14: ffff8c251f21a000 R15: ffff8c251f432f60 [ 1092.266572] FS: 0000000000000000(0000) GS:ffff8c252e880000(0000) knlGS:0000000000000000 [ 1092.275757] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1092.282281] CR2: 0000000000000000 CR3: 0000000154209001 CR4: 00000000003606e0 [ 1092.290384] Call Trace: [ 1092.293156] <IRQ> [ 1092.295439] xhci_free_virt_device.part.34+0x182/0x1a0 [ 1092.301288] handle_cmd_completion+0x7ac/0xfa0 [ 1092.306336] ? trace_event_raw_event_xhci_log_trb+0x6e/0xa0 [ 1092.312661] xhci_irq+0x3e8/0x1f60 [ 1092.316524] __handle_irq_event_percpu+0x75/0x180 [ 1092.321876] handle_irq_event_percpu+0x20/0x50 [ 1092.326922] handle_irq_event+0x36/0x60 [ 1092.331273] handle_edge_irq+0x6d/0x180 [ 1092.335644] handle_irq+0x16/0x20 [ 1092.339417] do_IRQ+0x41/0xc0 [ 1092.342782] common_interrupt+0xf/0xf [ 1092.346955] </IRQ> Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci-trace.h | 36 ++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index acbd3d7b8828..8a62eee9eee1 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -886,12 +886,12 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) dev = xhci->devs[slot_id]; - trace_xhci_free_virt_device(dev); - xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; + trace_xhci_free_virt_device(dev); + if (dev->tt_info) old_active_eps = dev->tt_info->active_eps; diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h index 410544ffe78f..88b427434bd8 100644 --- a/drivers/usb/host/xhci-trace.h +++ b/drivers/usb/host/xhci-trace.h @@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue, TP_ARGS(ring, trb) ); +DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev), + TP_STRUCT__entry( + __field(void *, vdev) + __field(unsigned long long, out_ctx) + __field(unsigned long long, in_ctx) + __field(u8, fake_port) + __field(u8, real_port) + __field(u16, current_mel) + + ), + TP_fast_assign( + __entry->vdev = vdev; + __entry->in_ctx = (unsigned long long) vdev->in_ctx->dma; + __entry->out_ctx = (unsigned long long) vdev->out_ctx->dma; + __entry->fake_port = (u8) vdev->fake_port; + __entry->real_port = (u8) vdev->real_port; + __entry->current_mel = (u16) vdev->current_mel; + ), + TP_printk("vdev %p ctx %llx | %llx fake_port %d real_port %d current_mel %d", + __entry->vdev, __entry->in_ctx, __entry->out_ctx, + __entry->fake_port, __entry->real_port, __entry->current_mel + ) +); + +DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev) +); + DECLARE_EVENT_CLASS(xhci_log_virt_dev, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev), @@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device, TP_ARGS(vdev) ); -DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device, - TP_PROTO(struct xhci_virt_device *vdev), - TP_ARGS(vdev) -); - DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev) -- 2.18.0

7 years, 2 months

1
0
0 0

patch "xhci: Fix perceived dead host due to runtime suspend race with event" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled xhci: Fix perceived dead host due to runtime suspend race with event to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 229bc19fd7aca4f37964af06e3583c1c8f36b5d6 Mon Sep 17 00:00:00 2001 From: Mathias Nyman <mathias.nyman(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:19:41 +0300 Subject: xhci: Fix perceived dead host due to runtime suspend race with event handler Don't rely on event interrupt (EINT) bit alone to detect pending port change in resume. If no change event is detected the host may be suspended again, oterwise roothubs are resumed. There is a lag in xHC setting EINT. If we don't notice the pending change in resume, and the controller is runtime suspeded again, it causes the event handler to assume host is dead as it will fail to read xHC registers once PCI puts the controller to D3 state. [ 268.520969] xhci_hcd: xhci_resume: starting port polling. [ 268.520985] xhci_hcd: xhci_hub_status_data: stopping port polling. [ 268.521030] xhci_hcd: xhci_suspend: stopping port polling. [ 268.521040] xhci_hcd: // Setting command ring address to 0x349bd001 [ 268.521139] xhci_hcd: Port Status Change Event for port 3 [ 268.521149] xhci_hcd: resume root hub [ 268.521163] xhci_hcd: port resume event for port 3 [ 268.521168] xhci_hcd: xHC is not running. [ 268.521174] xhci_hcd: handle_port_status: starting port polling. [ 268.596322] xhci_hcd: xhci_hc_died: xHCI host controller not responding, assume dead The EINT lag is described in a additional note in xhci specs 4.19.2: "Due to internal xHC scheduling and system delays, there will be a lag between a change bit being set and the Port Status Change Event that it generated being written to the Event Ring. If SW reads the PORTSC and sees a change bit set, there is no guarantee that the corresponding Port Status Change Event has already been written into the Event Ring." Cc: <stable(a)vger.kernel.org> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/xhci.c | 40 +++++++++++++++++++++++++++++++++++++--- drivers/usb/host/xhci.h | 4 ++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 8c8da2d657fa..f11ec61bcc7d 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -908,6 +908,41 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci) spin_unlock_irqrestore(&xhci->lock, flags); } +static bool xhci_pending_portevent(struct xhci_hcd *xhci) +{ + struct xhci_port **ports; + int port_index; + u32 status; + u32 portsc; + + status = readl(&xhci->op_regs->status); + if (status & STS_EINT) + return true; + /* + * Checking STS_EINT is not enough as there is a lag between a change + * bit being set and the Port Status Change Event that it generated + * being written to the Event Ring. See note in xhci 1.1 section 4.19.2. + */ + + port_index = xhci->usb2_rhub.num_ports; + ports = xhci->usb2_rhub.ports; + while (port_index--) { + portsc = readl(ports[port_index]->addr); + if (portsc & PORT_CHANGE_MASK || + (portsc & PORT_PLS_MASK) == XDEV_RESUME) + return true; + } + port_index = xhci->usb3_rhub.num_ports; + ports = xhci->usb3_rhub.ports; + while (port_index--) { + portsc = readl(ports[port_index]->addr); + if (portsc & PORT_CHANGE_MASK || + (portsc & PORT_PLS_MASK) == XDEV_RESUME) + return true; + } + return false; +} + /* * Stop HC (not bus-specific) * @@ -1009,7 +1044,7 @@ EXPORT_SYMBOL_GPL(xhci_suspend); */ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) { - u32 command, temp = 0, status; + u32 command, temp = 0; struct usb_hcd *hcd = xhci_to_hcd(xhci); struct usb_hcd *secondary_hcd; int retval = 0; @@ -1134,8 +1169,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) done: if (retval == 0) { /* Resume root hubs only when have pending events. */ - status = readl(&xhci->op_regs->status); - if (status & STS_EINT) { + if (xhci_pending_portevent(xhci)) { usb_hcd_resume_root_hub(xhci->shared_hcd); usb_hcd_resume_root_hub(hcd); } diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 939e2f86b595..841e89ffe2e9 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -382,6 +382,10 @@ struct xhci_op_regs { #define PORT_PLC (1 << 22) /* port configure error change - port failed to configure its link partner */ #define PORT_CEC (1 << 23) +#define PORT_CHANGE_MASK (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \ + PORT_RC | PORT_PLC | PORT_CEC) + + /* Cold Attach Status - xHC can set this bit to report device attached during * Sx state. Warm port reset should be perfomed to clear this bit and move port * to connected state. -- 2.18.0

7 years, 2 months

1
0
0 0

patch "usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 8760675932ddb614e83702117d36ea644050c609 Mon Sep 17 00:00:00 2001 From: William Wu <william.wu(a)rock-chips.com> Date: Mon, 21 May 2018 18:12:00 +0800 Subject: usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub The dwc2_get_ls_map() use ttport to reference into the bitmap if we're on a multi_tt hub. But the bitmaps index from 0 to (hub->maxchild - 1), while the ttport index from 1 to hub->maxchild. This will cause invalid memory access when the number of ttport is hub->maxchild. Without this patch, I can easily meet a Kernel panic issue if connect a low-speed USB mouse with the max port of FE2.1 multi-tt hub (1a40:0201) on rk3288 platform. Fixes: 9f9f09b048f5 ("usb: dwc2: host: Totally redo the microframe scheduler") Cc: <stable(a)vger.kernel.org> Reviewed-by: Douglas Anderson <dianders(a)chromium.org> Acked-by: Minas Harutyunyan hminas(a)synopsys.com> Signed-off-by: William Wu <william.wu(a)rock-chips.com> Signed-off-by: Felipe Balbi <felipe.balbi(a)linux.intel.com> --- drivers/usb/dwc2/hcd_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c index d7c3d6c776d8..9c55d1addba9 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -383,7 +383,7 @@ static unsigned long *dwc2_get_ls_map(struct dwc2_hsotg *hsotg, /* Get the map and adjust if this is a multi_tt hub */ map = qh->dwc_tt->periodic_bitmaps; if (qh->dwc_tt->usb_tt->multi) - map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport; + map += DWC2_ELEMENTS_PER_LS_BITMAP * (qh->ttport - 1); return map; } -- 2.18.0

7 years, 2 months

1
0
0 0

[PATCH V2] clk: ti: omap3: Fix am3517 mdio clock alias

by Adam Ford

A previous patch removed OMAP clock aliases that were perceived to be unnecessary. Unfortunately, it broke the ethernet on the am3517-evm. This patch enables the MDIO clock and EMAC clock. Fixes: 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") Cc: stable(a)vger.kernel.org #4.16+ Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Instead of modifying clk-3xxx.c, this patch modifie the device tree to work like the original patch intended. diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi index ca294914bbb1..4b6062b631b1 100644 --- a/arch/arm/boot/dts/am3517.dtsi +++ b/arch/arm/boot/dts/am3517.dtsi @@ -39,6 +39,8 @@ ti,davinci-ctrl-ram-size = <0x2000>; ti,davinci-rmii-en = /bits/ 8 <1>; local-mac-address = [ 00 00 00 00 00 00 ]; + clocks = <&emac_ick>; + clock-names = "ick"; }; davinci_mdio: ethernet@5c030000 { @@ -49,6 +51,8 @@ bus_freq = <1000000>; #address-cells = <1>; #size-cells = <0>; + clocks = <&emac_fck>; + clock-names = "fck"; }; uart4: serial@4809e000 { -- 2.17.1

7 years, 2 months

2
1
0 0

[PATCH] x86/efi: Fix efi_call_phys_epilog() with CONFIG_X86_5LEVEL=y

by Kirill A. Shutemov

Open-coded page table entry checks don't work correctly when we fold the page table level at runtime. pgd_present() on 4-level paging machine always returns true, but open-coded version of the check may return false-negative result and we silently skip the rest of the loop body in efi_call_phys_epilog(). Replace open-coded checks with proper helpers. Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Fixes: 94133e46a0f5 ("x86/efi: Correct EFI identity mapping under 'efi=old_map' when KASLR is enabled") Cc: stable(a)vger.kernel.org # 4.12+ Cc: Baoquan He <bhe(a)redhat.com> Cc: Matt Fleming <matt(a)codeblueprint.co.uk> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> --- arch/x86/platform/efi/efi_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index e01f7ceb9e7a..77873ce700ae 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -166,14 +166,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd) pgd = pgd_offset_k(pgd_idx * PGDIR_SIZE); set_pgd(pgd_offset_k(pgd_idx * PGDIR_SIZE), save_pgd[pgd_idx]); - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) + if (!pgd_present(*pgd)) continue; for (i = 0; i < PTRS_PER_P4D; i++) { p4d = p4d_offset(pgd, pgd_idx * PGDIR_SIZE + i * P4D_SIZE); - if (!(p4d_val(*p4d) & _PAGE_PRESENT)) + if (!p4d_present(*p4d)) continue; pud = (pud_t *)p4d_page_vaddr(*p4d); -- 2.18.0

7 years, 2 months

1
0
0 0

[PATCH 6/8] mpt3sas: Fix _transport_smp_handler() error path

by Bart Van Assche

This patch avoids that smatch complains about a double unlock on ioc->transport_cmds.mutex. Fixes: 651a01364994 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough") Signed-off-by: Bart Van Assche <bart.vanassche(a)wdc.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: Sathya Prakash <sathya.prakash(a)broadcom.com> Cc: Chaitra P B <chaitra.basappa(a)broadcom.com> Cc: Suganath Prabu Subramani <suganath-prabu.subramani(a)broadcom.com> Cc: stable(a)vger.kernel.org --- drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index 77a8ec401461..53224d97f6c1 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c @@ -1938,12 +1938,12 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, pr_info(MPT3SAS_FMT "%s: host reset in progress!\n", __func__, ioc->name); rc = -EFAULT; - goto out; + goto job_done; } rc = mutex_lock_interruptible(&ioc->transport_cmds.mutex); if (rc) - goto out; + goto job_done; if (ioc->transport_cmds.status != MPT3_CMD_NOT_USED) { pr_err(MPT3SAS_FMT "%s: transport_cmds in use\n", ioc->name, @@ -2068,6 +2068,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, out: ioc->transport_cmds.status = MPT3_CMD_NOT_USED; mutex_unlock(&ioc->transport_cmds.mutex); +job_done: bsg_job_done(job, rc, reslen); } -- 2.17.0

7 years, 2 months

2
1
0 0

[PATCH] clk: ti: omap3: Fix am3517 mdio clock alias

by Adam Ford

A previous patch removed OMAP clock aliases that were perceived to be unnecessary. Unfortunately, it broke the ethernet on the am3517-evm. This patch renables the MDIO clock. Fixes: 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") Cc: stable(a)vger.kernel.org #4.16+ Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index 8aa5f5793835..f84734bd0aa7 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -254,6 +254,8 @@ static struct ti_dt_clk omap36xx_am35xx_omap3430es2plus_clks[] = { }; static struct ti_dt_clk am35xx_clks[] = { + DT_CLK("davinci_emac.0", NULL, "emac_ick"), + DT_CLK("davinci_mdio.0", NULL, "emac_fck"), DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_am35xx"), DT_CLK(NULL, "hsotgusb_fck", "hsotgusb_fck_am35xx"), DT_CLK(NULL, "uart4_ick", "uart4_ick_am35xx"), -- 2.17.1

7 years, 2 months

3
3
0 0

[PATCH 4.4 00/37] 4.4.136-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.136 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu Jun 7 17:00:49 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.136-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.136-rc1 David S. Miller <davem(a)davemloft.net> sparc64: Fix build warnings with gcc 7. David S. Miller <davem(a)davemloft.net> sparc64: Don't clibber fixed registers in __multi4. David S. Miller <davem(a)davemloft.net> sparc64: Add __multi3 for gcc 7.x and later. Hugh Dickins <hughd(a)google.com> mm: fix the NULL mapping case in __isolate_lru_page() Al Viro <viro(a)zeniv.linux.org.uk> fix io_destroy()/aio_complete() race Arnd Bergmann <arnd(a)arndb.de> Kbuild: change CC_OPTIMIZE_FOR_SIZE definition Ondrej Zary <linux(a)rainbow-software.org> drm/i915: Disable LVDS on Radiant P845 Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> hwtracing: stm: fix build error on some arches Alexander Shishkin <alexander.shishkin(a)linux.intel.com> stm class: Use vmalloc for the master map Bart Van Assche <bart.vanassche(a)wdc.com> scsi: scsi_transport_srp: Fix shost to rport translation Maciej W. Rozycki <macro(a)mips.com> MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests Maciej W. Rozycki <macro(a)mips.com> MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs Martin Kelly <mkelly(a)xevo.com> iio:kfifo_buf: check for uint overflow Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> dmaengine: usb-dmac: fix endless loop in usb_dmac_chan_terminate_all() Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: revoke START request early Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: check master irqs before slave irqs Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: don't issue stop when HW does it automatically Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: init new messages in irq Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: refactor setup of a msg Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: remove spinlock Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: remove unused IOERROR state Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: rework hw init Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: make sure clocks are on when doing clock calculation Eric Dumazet <edumazet(a)google.com> tcp: avoid integer overflows in tcp_rcv_space_adjust() Arnd Bergmann <arnd(a)arndb.de> irda: fix overly long udelay() Colin Ian King <colin.king(a)canonical.com> ASoC: Intel: sst: remove redundant variable dma_dev_name Matthias Kaehlcke <mka(a)chromium.org> rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c Eric Biggers <ebiggers(a)google.com> cfg80211: further limit wiphy names to 64 bytes Sachin Grover <sgrover(a)codeaurora.org> selinux: KASAN: slab-out-of-bounds in xattr_getsecurity Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Fix crash when freeing instances with event triggers Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Input: elan_i2c_smbus - fix corrupted stack Mimi Zohar <zohar(a)linux.vnet.ibm.com> Revert "ima: limit file hash setting by user to fix and log modes" Brian Foster <bfoster(a)redhat.com> xfs: detect agfl count corruption and reset agfl Yoshinori Sato <ysato(a)users.sourceforge.jp> sh: New gcc support Geert Uytterhoeven <geert(a)linux-m68k.org> USB: serial: cp210x: use tcflag_t to fix incompatible pointer type Michael Neuling <mikey(a)neuling.org> powerpc/64s: Clear PCR on boot Will Deacon <will.deacon(a)arm.com> arm64: lse: Add early clobbers to some input/output asm operands ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/atomic_lse.h | 14 +- arch/mips/kernel/process.c | 4 + arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/ptrace32.c | 2 +- arch/powerpc/kernel/cpu_setup_power.S | 4 + arch/sh/kernel/sh_ksyms_32.c | 3 + arch/sh/lib/ashlsi3.S | 35 +++- arch/sh/lib/ashrsi3.S | 33 +++- arch/sh/lib/lshrsi3.S | 34 +++- arch/sparc/kernel/ds.c | 2 +- arch/sparc/lib/Makefile | 1 + arch/sparc/lib/multi3.S | 35 ++++ drivers/dma/sh/usb-dmac.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 8 + drivers/hwtracing/stm/core.c | 7 +- drivers/i2c/busses/i2c-rcar.c | 202 +++++++++------------ drivers/iio/buffer/kfifo_buf.c | 7 + drivers/input/mouse/elan_i2c_smbus.c | 22 +-- drivers/net/irda/w83977af_ir.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 - drivers/scsi/scsi_transport_srp.c | 22 ++- drivers/usb/serial/cp210x.c | 9 +- fs/aio.c | 3 +- fs/xfs/libxfs/xfs_alloc.c | 94 ++++++++++ fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_trace.h | 9 +- include/linux/tcp.h | 2 +- include/uapi/linux/nl80211.h | 2 +- init/Kconfig | 13 ++ kernel/trace/trace_events_trigger.c | 5 +- mm/vmscan.c | 2 +- net/ipv4/tcp_input.c | 10 +- security/integrity/ima/ima_appraise.c | 8 +- security/selinux/ss/services.c | 2 +- sound/soc/intel/common/sst-firmware.c | 2 - 36 files changed, 410 insertions(+), 204 deletions(-)

7 years, 2 months

7
46
0 0

[PATCH] ALSA: hda/realtek - Fix the problem of two front mics on more machines

by Hui Wang

We have 3 more Lenovo machines, they all have 2 front mics on them, so they need the fixup to change the location for one of two mics. Among these 3 Lenovo machines, one of them has the same pin cfg as the machine with subid 0x17aa3138, so use the pin cfg table to apply fixup for them. The rest machines don't share the same pin cfg, so far use the subid to apply fixup for them. Fixes: a3dafb2200bf ("ALSA: hda/realtek - adjust the location of one mic") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4834847..418f27b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6594,8 +6594,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), + SND_PCI_QUIRK(0x17aa, 0x312a, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), + SND_PCI_QUIRK(0x17aa, 0x3136, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), @@ -6773,6 +6774,12 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x19, 0x02a11030}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x1a, 0x02a11040}, + {0x1b, 0x01014020}, + {0x21, 0x0221101f}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110}, -- 2.7.4

7 years, 2 months

2
1
0 0

FAILED: patch "[PATCH] media: rc: ensure input/lirc device can be opened after" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d7832cd2a3c87eb6ae1e802c88b6fc56c5823f6d Mon Sep 17 00:00:00 2001 From: Sean Young <sean(a)mess.org> Date: Thu, 24 May 2018 05:47:17 -0400 Subject: [PATCH] media: rc: ensure input/lirc device can be opened after register Since commit cb84343fced1 ("media: lirc: do not call close() or open() on unregistered devices") rc_open() will return -ENODEV if rcdev->registered is false. Ensure this is set before we register the input device and the lirc device, else we have a short window where the neither the lirc or input device can be opened. Fixes: cb84343fced1 ("media: lirc: do not call close() or open() on unregistered devices") Cc: stable(a)vger.kernel.org # v4.16+ Signed-off-by: Sean Young <sean(a)mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index b7071bde670a..2e222d9ee01f 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -1862,6 +1862,8 @@ int rc_register_device(struct rc_dev *dev) dev->device_name ?: "Unspecified device", path ?: "N/A"); kfree(path); + dev->registered = true; + if (dev->driver_type != RC_DRIVER_IR_RAW_TX) { rc = rc_setup_rx_device(dev); if (rc) @@ -1881,8 +1883,6 @@ int rc_register_device(struct rc_dev *dev) goto out_lirc; } - dev->registered = true; - dev_dbg(&dev->dev, "Registered rc%u (driver: %s)\n", dev->minor, dev->driver_name ? dev->driver_name : "unknown");

7 years, 2 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror