4.14.118-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 25/42 drm/mediatek: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 2ae2c3316fb77dcf64275d011596b60104c45426 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/mediatek/mtk_hdmi.c:1521:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function. drivers/gpu/drm/mediatek/mtk_hdmi.c:1524:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_hdmi.c +1 -0
@@ -1508,6 +1508,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,of_node_put (remote); hdmi->ddc_adpt =of_find_i2c_adapter_by_node (i2c_np); +of_node_put (i2c_np);if (!hdmi->ddc_adpt) {dev_err (dev,"Failed to get ddc i2c adapter by node\n" );return -EINVAL ;
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 10/42 ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
In reply to Greg Kroah-Hartman[ Upstream commit a2225a6d155fcb247fe4c6d87f7c91807462966d ]
Best to lock across handling the bus error to ensure the DSP doesn't change power state as we are reading the status registers.
--- sound/soc/codecs/wm_adsp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +8 -3
@@ -3711,11 +3711,13 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)struct regmap *regmap = dsp->regmap;int ret =0 ; +mutex_lock (&dsp->pwr_lock); + ret =regmap_read (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL , &val);if (ret) {adsp_err (dsp,"Failed to read Region Lock Ctrl register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; }if (val &ADSP2_WDT_TIMEOUT_STS_MASK ) {
@@ -3734,7 +3736,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Bus Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "bus error address = 0x%x\n",
@@ -3747,7 +3749,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Pmem Xmem Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "xmem error address = 0x%x\n",
@@ -3760,6 +3762,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)regmap_update_bits (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL ,ADSP2_CTRL_ERR_EINT ,ADSP2_CTRL_ERR_EINT ); +error: +mutex_unlock (&dsp->pwr_lock); +return IRQ_HANDLED ; }EXPORT_SYMBOL_GPL (wm_adsp2_bus_error);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/42 MIPS: KGDB: fix kgdb support for SMP platforms.
In reply to Greg Kroah-Hartman[ Upstream commit ab8a6d821179ab9bea1a9179f535ccba6330c1ed ]
KGDB_call_nmi_hook is called by other cpu through smp call. MIPS smp call is processed in ipi irq handler and regs is saved in
handle_int.
So kgdb_call_nmi_hook get regs by get_irq_regs and regs will be passed
to kgdb_cpu_enter.
--- arch/mips/kernel/kgdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/kgdb.c +2 -1
@@ -33,6 +33,7 @@#include <asm/processor.h> #include <asm/sigcontext.h> #include <linux/uaccess.h> +#include <asm/irq_regs.h> static struct hard_trap_info { unsigned char tt; /* Trap type code for MIPS R3xxx and R4xxx */
@@ -214,7 +215,7 @@ static void kgdb_call_nmi_hook(void *ignored) old_fs =get_fs ();set_fs (get_ds ()); -kgdb_nmicallback (raw_smp_processor_id (),NULL ); +kgdb_nmicallback (raw_smp_processor_id (),get_irq_regs ());set_fs (old_fs); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/42 ASoC: tlv320aic32x4: Fix Common Pins
In reply to Greg Kroah-Hartman[ Upstream commit c63adb28f6d913310430f14c69f0a2ea55eed0cc ]
The common pins were mistakenly not added to the DAPM graph. Adding these pins will allow valid graphs to be created.
--- sound/soc/codecs/tlv320aic32x4.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/tlv320aic32x4.c +2 -0
@@ -462,6 +462,8 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {SND_SOC_DAPM_INPUT ("IN2_R" ),SND_SOC_DAPM_INPUT ("IN3_L" ),SND_SOC_DAPM_INPUT ("IN3_R" ), +SND_SOC_DAPM_INPUT ("CM_L" ), + SND_SOC_DAPM_INPUT("CM_R"), }; static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/42 perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
In reply to Greg Kroah-Hartman[ Upstream commit 583feb08e7f7ac9d533b446882eb3a54737a6dbb ]
When an event is programmed with attr.wakeup_events=N (N>0), it means the caller is interested in getting a user level notification after N samples have been recorded in the kernel sampling buffer.
With precise events on Intel processors, the kernel uses PEBS. The kernel tries minimize sampling overhead by verifying
if the event configuration is compatible with multi-entry PEBS mode. If so, the kernel is notified only when the buffer has reached its threshold. Other PEBS operates in single-entry mode, the kenrel is notified for each PEBS sample.
The problem is that the current implementation look at frequency mode and event sample_type but ignores the wakeup_events field. Thus, it may not be possible to receive a notification after each precise event.
This patch fixes this problem by disabling multi-entry PEBS if wakeup_events is non-zero.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -3051,7 +3051,7 @@ static int intel_pmu_hw_config(struct perf_event *event)return ret;if (event->attr.precise_ip) { -if (!event->attr.freq) { +if (!(event->attr.freq || event->attr.wakeup_events)) { event->hw.flags |=PERF_X86_EVENT_AUTO_RELOAD ;if (!(event->attr.sample_type & ~intel_pmu_free_running_flags (event)))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/42 perf/x86/intel: Initialize TFA MSR
In reply to Greg Kroah-Hartman[ Upstream commit d7262457e35dbe239659e62654e56f8ddb814bed ]
Stephane reported that the TFA MSR is not initialized by the kernel, but the TFA bit could set by firmware or as a leftover from a kexec, which makes the state inconsistent.
--- arch/x86/events/intel/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/events/intel/core.c +6 -0
@@ -3427,6 +3427,12 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; +if (x86_pmu.flags &PMU_FL_TFA ) { +WARN_ON_ONCE (cpuc->tfa_shadow); + cpuc->tfa_shadow = ~0ULL ; +intel_set_tfa (cpuc, false); + } +if (x86_pmu.version >1 )flip_smm_bit (&x86_pmu.attr_freeze_on_smi);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/42 xtensa: fix initialization of pt_regs::syscall in start_thread
In reply to Greg Kroah-Hartman[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ]
New pt_regs should indicate that there's no syscall, not that there's syscall #0. While at it wrap macro body in do/while and parenthesize macro arguments.
--- arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/xtensa/include/asm/processor.h +12 -9
@@ -195,15 +195,18 @@ struct thread_struct {/* Clearing a0 terminates the backtrace. */ #define start_thread (regs, new_pc, new_sp) \ - memset(regs, 0, sizeof(*regs)); \ - regs->pc = new_pc; \ - regs->ps = USER_PS_VALUE; \ - regs->areg[1] = new_sp; \ - regs->areg[0] = 0; \ - regs->wmask = 1; \ - regs->depc = 0; \ - regs->windowbase = 0; \ - regs->windowstart = 1; + do { \ + memset((regs), 0, sizeof(*(regs))); \ + (regs)->pc = (new_pc); \ + (regs)->ps = USER_PS_VALUE; \ + (regs)->areg[1] = (new_sp); \ + (regs)->areg[0] = 0; \ + (regs)->wmask = 1; \ + (regs)->depc = 0; \ + (regs)->windowbase = 0; \ + (regs)->windowstart = 1; \ + (regs)->syscall = NO_SYSCALL; \ + } while (0)/* Forward declaration */ struct task_struct ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/42 ASoC: rockchip: pdm: fix regmap_ops hang issue
In reply to Greg Kroah-Hartman[ Upstream commit c85064435fe7a216ec0f0238ef2b8f7cd850a450 ]
This is because set_fmt ops maybe called when PD is off, and in such case, regmap_ops will lead system hang. enale PD before doing regmap_ops.
--- sound/soc/rockchip/rockchip_pdm.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/rockchip/rockchip_pdm.c +2 -0
@@ -208,7 +208,9 @@ static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai,return -EINVAL ; } +pm_runtime_get_sync (cpu_dai->dev);regmap_update_bits (pdm->regmap,PDM_CLK_CTRL , mask, val); +pm_runtime_put (cpu_dai->dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/42 slab: fix a crash by reading /proc/slab_allocators
In reply to Greg Kroah-Hartman[ Upstream commit fcf88917dd435c6a4cb2830cb086ee58605a1d85 ]
The commit 510ded33e075 ("slab: implement slab_root_caches list") changes the name of the list node within "struct kmem_cache" from "list" to "root_caches_node", but leaks_show() still use the "list" which causes a crash when reading /proc/slab_allocators.
You need to have CONFIG_SLAB=y and CONFIG_MEMCG=y to see the problem, because without MEMCG all slab caches are root caches, and the "list" node happens to be the right one.
--- mm/slab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/slab.c +2 -1
@@ -4299,7 +4299,8 @@ static void show_symbol(struct seq_file *m, unsigned long address)static int leaks_show (struct seq_file *m,void *p) { - struct kmem_cache *cachep = list_entry(p, struct kmem_cache, list); + struct kmem_cache *cachep = list_entry(p, struct kmem_cache, + root_caches_node);struct page *page;struct kmem_cache_node *n;const char *name;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/42 virtio_pci: fix a NULL pointer reference in vp_del_vqs
In reply to Greg Kroah-Hartman[ Upstream commit 6a8aae68c87349dbbcd46eac380bc43cdb98a13b ]
If the msix_affinity_masks is alloced failed, then we'll try to free some resources in vp_free_vectors() that may access it directly.
We met the following stack in our production:
[ 29.296767] BUG: unable to handle kernel NULL pointer dereference at (null) [ 29.311151] IP: [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.324787] PGD 0 [ 29.333224] Oops: 0000 [#1] SMP [...] [ 29.425175] RIP: 0010:[<ffffffffc04fe35a>] [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.441405] RSP: 0018:ffff9a55c2dcfa10 EFLAGS: 00010206 [ 29.453491] RAX: 0000000000000000 RBX: ffff9a55c322c400 RCX: 0000000000000000 [ 29.467488] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9a55c322c400 [ 29.481461] RBP: ffff9a55c2dcfa20 R08: 0000000000000000 R09: ffffc1b6806ff020 [ 29.495427] R10: 0000000000000e95 R11: 0000000000aaaaaa R12: 0000000000000000 [ 29.509414] R13: 0000000000010000 R14: ffff9a55bd2d9e98 R15: ffff9a55c322c400 [ 29.523407] FS: 00007fdcba69f8c0(0000) GS:ffff9a55c2840000(0000) knlGS:0000000000000000 [ 29.538472] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.551621] CR2: 0000000000000000 CR3: 000000003ce52000 CR4: 00000000003607a0 [ 29.565886] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.580055] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.594122] Call Trace: [ 29.603446] [<ffffffffc04fe8a2>] vp_request_msix_vectors+0xe2/0x260 [virtio_pci] [ 29.618017] [<ffffffffc04fedc5>] vp_try_to_find_vqs+0x95/0x3b0 [virtio_pci] [ 29.632152] [<ffffffffc04ff117>] vp_find_vqs+0x37/0xb0 [virtio_pci] [ 29.645582] [<ffffffffc057bf63>] init_vq+0x153/0x260 [virtio_blk] [ 29.658831] [<ffffffffc057c1e8>] virtblk_probe+0xe8/0x87f [virtio_blk]
[...]
--- drivers/virtio/virtio_pci_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci_common.c +5 -3
@@ -254,9 +254,11 @@ void vp_del_vqs(struct virtio_device *vdev)for (i =0 ; i < vp_dev->msix_used_vectors; ++i)free_irq (pci_irq_vector (vp_dev->pci_dev, i), vp_dev); -for (i =0 ; i < vp_dev->msix_vectors; i++) -if (vp_dev->msix_affinity_masks[i]) -free_cpumask_var (vp_dev->msix_affinity_masks[i]); +if (vp_dev->msix_affinity_masks) { +for (i =0 ; i < vp_dev->msix_vectors; i++) +if (vp_dev->msix_affinity_masks[i]) +free_cpumask_var (vp_dev->msix_affinity_masks[i]); + }if (vp_dev->msix_enabled) {/* Disable the vector used for configuration */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/42 RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
In reply to Greg Kroah-Hartman[ Upstream commit ea7a5c706fa49273cf6d1d9def053ecb50db2076 ]
Make sure to free the DSR on pvrdma_pci_remove() to avoid the memory leak.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +2 -0
@@ -1055,6 +1055,8 @@ static void pvrdma_pci_remove(struct pci_dev *pdev)pvrdma_page_dir_cleanup (dev, &dev->cq_pdir);pvrdma_page_dir_cleanup (dev, &dev->async_pdir);pvrdma_free_slots (dev); +dma_free_coherent (&pdev->dev,sizeof (*dev->dsr), dev->dsr, + dev->dsrbase);iounmap (dev->regs);kfree (dev->sgid_tbl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/42 ASoC: Intel: kbl: fix wrong number of channels
In reply to Greg Kroah-Hartman[ Upstream commit d6ba3f815bc5f3c4249d15c8bc5fbb012651b4a4 ]
Fix wrong setting on number of channels. The context wants to set constraint to 2 channels instead of 4.
--- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
@@ -405,7 +405,7 @@ static const struct snd_pcm_hw_constraint_list constraints_dmic_channels = { };static const unsigned int dmic_2ch[] = { -4 , +2 , };static const struct snd_pcm_hw_constraint_list constraints_dmic_2ch = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/42 virtio-blk: limit number of hw queues by nr_cpu_ids
In reply to Greg Kroah-Hartman[ Upstream commit bf348f9b78d413e75bb079462751a1d86b6de36c ]
When tag_set->nr_maps is 1, the block layer limits the number of hw queues by nr_cpu_ids. No matter how many hw queues are used by virtio-blk, as it has (tag_set->nr_maps == 1), it can use at most nr_cpu_ids hw queues.
In addition, specifically for pci scenario, when the 'num-queues' specified by qemu is more than maxcpus, virtio-blk would not be able to allocate more than maxcpus vectors in order to have a vector for each queue. As a result, it falls back into MSI-X with one vector for config and one shared for queues.
Considering above reasons, this patch limits the number of hw queues used by virtio-blk by nr_cpu_ids.
--- drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/virtio_blk.c +2 -0
@@ -437,6 +437,8 @@ static int init_vq(struct virtio_blk *vblk)if (err) num_vqs =1 ; + num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs); + vblk->vqs =kmalloc_array (num_vqs,sizeof (*vblk->vqs),GFP_KERNEL );if (!vblk->vqs)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/42 platform/x86: pmc_atom: Drop __initconst on dmi table
In reply to Greg Kroah-Hartman[ Upstream commit b995dcca7cf12f208cfd95fd9d5768dca7cccec7 ]
It's used by probe and that isn't an init function. Drop this so that we don't get a section mismatch.
--- drivers/platform/x86/pmc_atom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/pmc_atom.c +1 -1
@@ -426,7 +426,7 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)* Some systems need one or more of their pmc_plt_clks to be * marked as critical. */ -static const struct dmi_system_id critclk_systems[]__initconst = { +static const struct dmi_system_id critclk_systems[] = { { .ident ="MPL CEC1x" , .matches = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/42 staging: greybus: power_supply: fix prop-descriptor request size
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 47830c1127ef166af787caf2f871f23089610a7f upstream.
Since moving the message buffers off the stack, the dynamically allocated get-prop-descriptor request buffer is incorrectly sized due to using the pointer rather than request-struct size when creating the operation.
Fortunately, the pointer size is always larger than this one-byte request, but this could still cause trouble on the remote end due to the unexpected message size.
--- drivers/staging/greybus/power_supply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/greybus/power_supply.c +1 -1
@@ -521,7 +521,7 @@ static int gb_power_supply_prop_descript op =gb_operation_create (connection,GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS , -sizeof (req),sizeof (*resp) + props_count * +sizeof (*req),sizeof (*resp) + props_count *sizeof (struct gb_power_supply_props_desc ),GFP_KERNEL );if (!op)
Greg Kroah-Hartman
maintainerPATCH 3/42 ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit f0996bc2978e02d2ea898101462b960f6119b18f upstream.
Building lib/ubsan.c with gcc-9 results in a ton of nasty warnings like this one:
lib/ubsan.c warning: conflicting types for built-in function
‘__ubsan_handle_negate_overflow’; expected ‘void(void *, void *)’ [-Wbuiltin-declaration-mismatch]
The kernel's declarations of __ubsan_handle_*() often uses 'unsigned long' types in parameters while GCC these parameters as 'void *' types, hence the mismatch.
Fix this by using 'void *' to match GCC's declarations.
--- lib/ubsan.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)
lib/ubsan.c +23 -26
@@ -86,11 +86,13 @@ static bool is_inline_int(struct type_dereturn bits <= inline_bits; } -static s_max get_signed_val (struct type_descriptor *type,unsigned long val) +static s_max get_signed_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) {unsigned extra_bits =sizeof (s_max)*8 -type_bit_width (type); -return ((s_max )val) << extra_bits >> extra_bits; +unsigned long ulong_val = (unsigned long )val; + +return ((s_max )ulong_val) << extra_bits >> extra_bits; }if (type_bit_width (type) ==64 )
@@ -99,15 +101,15 @@ static s_max get_signed_val(struct type_return *(s_max *)val; } -static bool val_is_negative (struct type_descriptor *type,unsigned long val) +static bool val_is_negative (struct type_descriptor *type,void *val) {return type_is_signed (type) &&get_signed_val (type, val) <0 ; } -static u_max get_unsigned_val (struct type_descriptor *type,unsigned long val) +static u_max get_unsigned_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) -return val; +return (unsigned long )val;if (type_bit_width (type) ==64 )return *(u64 *)val;
@@ -116,7 +118,7 @@ static u_max get_unsigned_val(struct typ }static void val_to_string (char *str,size_t size,struct type_descriptor *type, -unsigned long value) +void *value) {if (type_is_int (type)) {if (type_bit_width (type) ==128 ) {
@@ -168,8 +170,8 @@ static void ubsan_epilogue(unsigned long current->in_ubsan--; } -static void handle_overflow (struct overflow_data *data,unsigned long lhs, -unsigned long rhs,char op) +static void handle_overflow (struct overflow_data *data,void *lhs, +void *rhs,char op) {struct type_descriptor *type = data->type;
@@ -196,8 +198,7 @@ static void handle_overflow(struct overf }void __ubsan_handle_add_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'+' );
@@ -205,23 +206,21 @@ void __ubsan_handle_add_overflow(structEXPORT_SYMBOL (__ubsan_handle_add_overflow);void __ubsan_handle_sub_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'-' ); }EXPORT_SYMBOL (__ubsan_handle_sub_overflow);void __ubsan_handle_mul_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'*' ); }EXPORT_SYMBOL (__ubsan_handle_mul_overflow);void __ubsan_handle_negate_overflow (struct overflow_data *data, -unsigned long old_val) +void *old_val) {unsigned long flags;char old_val_str[VALUE_LENGTH ];
@@ -242,8 +241,7 @@ EXPORT_SYMBOL(__ubsan_handle_negate_overvoid __ubsan_handle_divrem_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;char rhs_val_str[VALUE_LENGTH ];
@@ -328,7 +326,7 @@ static void ubsan_type_mismatch_common(s }void __ubsan_handle_type_mismatch (struct type_mismatch_data *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = { .location = &data->location,
@@ -337,12 +335,12 @@ void __ubsan_handle_type_mismatch(struct .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch);void __ubsan_handle_type_mismatch_v1 (struct type_mismatch_data_v1 *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = {
@@ -352,7 +350,7 @@ void __ubsan_handle_type_mismatch_v1(str .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch_v1);
@@ -376,7 +374,7 @@ void __ubsan_handle_nonnull_return(strucEXPORT_SYMBOL (__ubsan_handle_nonnull_return);void __ubsan_handle_vla_bound_not_positive (struct vla_bound_data *data, -unsigned long bound) +void *bound) {unsigned long flags;char bound_str[VALUE_LENGTH ];
@@ -393,8 +391,7 @@ void __ubsan_handle_vla_bound_not_positi }EXPORT_SYMBOL (__ubsan_handle_vla_bound_not_positive); -void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data, -unsigned long index) +void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data,void *index) {unsigned long flags;char index_str[VALUE_LENGTH ];
@@ -412,7 +409,7 @@ void __ubsan_handle_out_of_bounds(structEXPORT_SYMBOL (__ubsan_handle_out_of_bounds);void __ubsan_handle_shift_out_of_bounds (struct shift_out_of_bounds_data *data, -unsigned long lhs,unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;struct type_descriptor *rhs_type = data->rhs_type;
@@ -463,7 +460,7 @@ void __ubsan_handle_builtin_unreachable(EXPORT_SYMBOL (__ubsan_handle_builtin_unreachable);void __ubsan_handle_load_invalid_value (struct invalid_value_data *data, -unsigned long val) +void *val) {unsigned long flags;char val_str[VALUE_LENGTH ];
Greg Kroah-Hartman
maintainerPATCH 6/42 ASoC:soc-pcm:fix a codec fixup issue in TDM case
In reply to Greg Kroah-Hartman[ Upstream commit 570f18b6a8d1f0e60e8caf30e66161b6438dcc91 ]
On HDaudio platforms, if playback is started when capture is working, there is no audible output.
This can be root-caused to the use of the rx|tx_mask to store an HDaudio stream tag.
If capture is stared before playback, rx_mask would be non-zero on HDaudio platform, then the channel number of playback, which is in the same codec dai with the capture, would be changed by soc_pcm_codec_params_fixup based on the tx_mask at first, then overwritten by this function based on rx_mask at last.
According to the author of tx|rx_mask, tx_mask is for playback and rx_mask is for capture. And stream direction is checked at all other references of tx|rx_mask in ASoC, so here should be an error. This patch checks stream direction for tx|rx_mask for fixup function.
This issue would affect not only HDaudio+ASoC, but also I2S codecs if the channel number based on rx_mask is not equal to the one for tx_mask. It could be rarely reproduecd because most drivers in kernel set the same channel number to tx|rx_mask or rx_mask is zero.
Tested on all platforms using stream_tag & HDaudio and intel I2S platforms.
--- sound/soc/soc-pcm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +5 -2
@@ -894,10 +894,13 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_params = *params;/* fixup params based on TDM slot masks */ -if (codec_dai->tx_mask) +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK && + codec_dai->tx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->tx_mask); -if (codec_dai->rx_mask) + +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE && + codec_dai->rx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->rx_mask);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/42 ASoC: nau8824: fix the issue of the widget with prefix name
In reply to Greg Kroah-Hartman[ Upstream commit 844a4a362dbec166b44d6b9b3dd45b08cb273703 ]
The driver has two issues when machine add prefix name for codec. (1)The stream name of DAI can't find the AIF widgets. (2)The drivr can enable/disalbe the MICBIAS and SAR widgets.
The patch will fix these issues caused by prefixed name added.
--- sound/soc/codecs/nau8824.c | 46 +++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-)
sound/soc/codecs/nau8824.c +38 -8
@@ -634,8 +634,8 @@ static const struct snd_soc_dapm_widget nau8824_dapm_widgets[] = {SND_SOC_DAPM_ADC ("ADCR" ,NULL ,NAU8824_REG_ANALOG_ADC_2 ,NAU8824_ADCR_EN_SFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"HiFi Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("AIFRX" ,"HiFi Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIFRX" ,"Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_DAC ("DACL" ,NULL ,NAU8824_REG_RDAC , NAU8824_DACL_EN_SFT, 0),
@@ -784,6 +784,36 @@ static void nau8824_int_status_clear_all(struct regmap *regmap) } } +static void nau8824_dapm_disable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_disable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_disable_pin (dapm, pin); + } +} + +static void nau8824_dapm_enable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_force_enable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_force_enable_pin (dapm, pin); + } +} +static void nau8824_eject_jack (struct nau8824 *nau8824) {struct snd_soc_dapm_context *dapm = nau8824->dapm;
@@ -792,8 +822,8 @@ static void nau8824_eject_jack(struct nau8824 *nau8824)/* Clear all interruption status */ nau8824_int_status_clear_all (regmap); -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm);/* Enable the insertion interruption, disable the ejection
@@ -822,8 +852,8 @@ static void nau8824_jdet_work(struct work_struct *work)struct regmap *regmap = nau8824->regmap;int adc_value, event =0 , event_mask =0 ; -snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); -snd_soc_dapm_force_enable_pin (dapm,"SAR" ); +nau8824_dapm_enable_pin (nau8824,"MICBIAS" ); +nau8824_dapm_enable_pin (nau8824,"SAR" );snd_soc_dapm_sync (dapm);msleep (100 );
@@ -834,8 +864,8 @@ static void nau8824_jdet_work(struct work_struct *work)if (adc_value <HEADSET_SARADC_THD ) { event |=SND_JACK_HEADPHONE ; -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm); }else { event |=SND_JACK_HEADSET ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/42 ASoC: nau8810: fix the issue of widget with prefixed name
In reply to Greg Kroah-Hartman[ Upstream commit 54d1cf78b0f4ba348a7c7fb8b7d0708d71b6cc8a ]
The driver changes the stream name of DAC and ADC to avoid the issue of widget with prefixed name. When the machine adds prefixed name for codec, the stream name of DAI may not find the widgets.
--- sound/soc/codecs/nau8810.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/nau8810.c +2 -2
@@ -414,9 +414,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = {SND_SOC_DAPM_MIXER ("Mono Mixer" ,NAU8810_REG_POWER3 ,NAU8810_MOUTMX_EN_SFT ,0 , &nau8810_mono_mixer_controls[0 ],ARRAY_SIZE (nau8810_mono_mixer_controls)), -SND_SOC_DAPM_DAC ("DAC" ,"HiFi Playback" ,NAU8810_REG_POWER3 , +SND_SOC_DAPM_DAC ("DAC" ,"Playback" ,NAU8810_REG_POWER3 ,NAU8810_DAC_EN_SFT ,0 ), -SND_SOC_DAPM_ADC ("ADC" ,"HiFi Capture" ,NAU8810_REG_POWER2 , +SND_SOC_DAPM_ADC ("ADC" ,"Capture" ,NAU8810_REG_POWER2 ,NAU8810_ADC_EN_SFT ,0 ),SND_SOC_DAPM_PGA ("SpkN Out" ,NAU8810_REG_POWER3 , NAU8810_NSPK_EN_SFT, 0, NULL, 0),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/42 ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
In reply to Greg Kroah-Hartman[ Upstream commit 2b13bee3884926cba22061efa75bd315e871de24 ]
After commit fbeec965b8d1c ("ASoC: samsung: odroid: Fix 32000 sample rate handling") the audio root clock frequency is configured improperly for 44100 sample rate. Due to clock rate rounding it's 20070401 Hz instead of 22579000 Hz. This results in a too low value of the PSR clock divider in the CPU DAI driver and too fast actual sample rate for fs=44100. E.g. 1 kHz tone has actual 1780 Hz frequency (1 kHz * 20070401/22579000 * 2).
Fix this by increasing the correction passed to clk_set_rate() to take into account inaccuracy of the EPLL frequency properly.
--- sound/soc/samsung/odroid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/samsung/odroid.c +2 -2
@@ -66,11 +66,11 @@ static int odroid_card_hw_params(struct snd_pcm_substream *substream,return ret;/* -* We add 1 to the rclk_freq value in order to avoid too low clock +* We add 2 to the rclk_freq value in order to avoid too low clock * frequency values due to the EPLL output frequency not being exact * multiple of the audio sampling rate. */ - rclk_freq =params_rate (params) * rfs +1 ; + rclk_freq =params_rate (params) * rfs +2 ; ret =clk_set_rate (priv->sclk_i2s, rclk_freq);if (ret <0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.14.118-stable review
This is the start of the stable review cycle for the 4.14.118 release. There are 42 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 Sat 11 May 2019 06:11:15 PM UTC. 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.118-rc1.gz
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 <[email protected]>
Linux 4.14.118-rc1
Will Deacon <[email protected]>
arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
Will Deacon <[email protected]>
locking/futex: Allow low-level atomic operations to return -EAGAIN
Ross Zwisler <[email protected]>
ASoC: Intel: avoid Oops if DMA setup fails
Oliver Neukum <[email protected]>
UAS: fix alignment of scatter/gather segments
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Young Xiao <[email protected]>
Bluetooth: hidp: fix buffer overflow
Andrew Vasquez <[email protected]>
scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
Alexander Shishkin <[email protected]>
intel_th: pci: Add Comet Lake support
Alan Stern <[email protected]>
usb-storage: Set virt_boundary_mask to avoid SG overflows
Johan Hovold <[email protected]>
USB: cdc-acm: fix unthrottle races
Ji-Ze Hong (Peter Hong) <[email protected]>
USB: serial: f81232: fix interrupt worker not stop
Thinh Nguyen <[email protected]>
usb: dwc3: Fix default lpm_nyet_threshold value
Prasad Sodagudi <[email protected]>
genirq: Prevent use-after-free and work list corruption
Joerg Roedel <[email protected]>
iommu/amd: Set exclusion range correctly
Stephen Boyd <[email protected]>
platform/x86: pmc_atom: Drop __initconst on dmi table
Dongli Zhang <[email protected]>
virtio-blk: limit number of hw queues by nr_cpu_ids
Tzung-Bi Shih <[email protected]>
ASoC: Intel: kbl: fix wrong number of channels
Wen Yang <[email protected]>
drm/mediatek: fix possible object reference leak
Varun Prakash <[email protected]>
scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
Kamal Heib <[email protected]>
RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
Longpeng <[email protected]>
virtio_pci: fix a NULL pointer reference in vp_del_vqs
Qian Cai <[email protected]>
slab: fix a crash by reading /proc/slab_allocators
Sugar Zhang <[email protected]>
ASoC: rockchip: pdm: fix regmap_ops hang issue
Max Filippov <[email protected]>
xtensa: fix initialization of pt_regs::syscall in start_thread
Jann Horn <[email protected]>
linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
Peter Zijlstra <[email protected]>
perf/x86/intel: Initialize TFA MSR
Stephane Eranian <[email protected]>
perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
Dan Carpenter <[email protected]>
drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
Annaliese McDermond <[email protected]>
ASoC: tlv320aic32x4: Fix Common Pins
Chong Qiao <[email protected]>
MIPS: KGDB: fix kgdb support for SMP platforms.
Kaike Wan <[email protected]>
IB/hfi1: Eliminate opcode tests on mr deref
Daniel Mack <[email protected]>
ASoC: cs4270: Set auto-increment bit for register writes
Charles Keepax <[email protected]>
ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
Sylwester Nawrocki <[email protected]>
ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
John Hsu <[email protected]>
ASoC: nau8810: fix the issue of widget with prefixed name
John Hsu <[email protected]>
ASoC: nau8824: fix the issue of the widget with prefix name
Rander Wang <[email protected]>
ASoC:soc-pcm:fix a codec fixup issue in TDM case
Russell King <[email protected]>
ASoC: hdmi-codec: fix S/PDIF DAI
Johan Hovold <[email protected]>
staging: greybus: power_supply: fix prop-descriptor request size
Andrey Ryabinin <[email protected]>
ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
Dexuan Cui <[email protected]>
Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
Jason Yan <[email protected]>
scsi: libsas: fix a race condition when smp task timeout
-------------
Diffstat:
Makefile | 4 +- arch/arm64/include/asm/futex.h | 55 +++--- arch/mips/kernel/kgdb.c | 3 +- arch/x86/events/intel/core.c | 8 +- arch/xtensa/include/asm/processor.h | 21 ++- drivers/block/virtio_blk.c | 2 + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/hv/hv.c | 1 - drivers/hwtracing/intel_th/pci.c | 5 + drivers/infiniband/hw/hfi1/rc.c | 4 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 + drivers/iommu/amd_iommu_init.c | 2 +- drivers/platform/x86/pmc_atom.c | 2 +- drivers/scsi/csiostor/csio_scsi.c | 5 +- drivers/scsi/libsas/sas_expander.c | 9 +- drivers/scsi/qla2xxx/qla_attr.c | 4 +- drivers/staging/greybus/power_supply.c | 2 +- drivers/usb/class/cdc-acm.c | 32 +++- drivers/usb/dwc3/core.c | 2 +- drivers/usb/serial/f81232.c | 39 +++++ drivers/usb/storage/scsiglue.c | 26 ++- drivers/usb/storage/uas.c | 35 ++-- drivers/virtio/virtio_pci_common.c | 8 +- include/linux/kernel.h | 4 +- include/net/bluetooth/hci_core.h | 3 + kernel/futex.c | 188 +++++++++++++-------- kernel/irq/manage.c | 4 +- lib/ubsan.c | 49 +++--- mm/slab.c | 3 +- net/bluetooth/hci_conn.c | 8 + net/bluetooth/hidp/sock.c | 1 + sound/soc/codecs/cs4270.c | 1 + sound/soc/codecs/hdmi-codec.c | 118 ++++++------- sound/soc/codecs/nau8810.c | 4 +- sound/soc/codecs/nau8824.c | 46 ++++- sound/soc/codecs/tlv320aic32x4.c | 2 + sound/soc/codecs/wm_adsp.c | 11 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/intel/common/sst-firmware.c | 8 +- sound/soc/rockchip/rockchip_pdm.c | 2 + sound/soc/samsung/odroid.c | 4 +- sound/soc/soc-pcm.c | 7 +- 42 files changed, 471 insertions(+), 267 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 30/42 genirq: Prevent use-after-free and work list corruption
[ Upstream commit 59c39840f5abf4a71e1810a8da71aaccd6c17d26 ]
When irq_set_affinity_notifier() replaces the notifier, then the reference count on the old notifier is dropped which causes it to be freed. But nothing ensures that the old notifier is not longer queued in the work list. If it is queued this results in a use after free and possibly in work list corruption.
Ensure that the work is canceled before the reference is dropped.
--- kernel/irq/manage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/irq/manage.c +3 -1
@@ -323,8 +323,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) desc->affinity_notify = notify;raw_spin_unlock_irqrestore (&desc->lock, flags); -if (old_notify) +if (old_notify) { +cancel_work_sync (&old_notify->work);kref_put (&old_notify->kref, old_notify->release); + }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/42 UAS: fix alignment of scatter/gather segments
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 3ae62a42090f1ed48e2313ed256a1182a85fb575 upstream.
This is the UAS version of
747668dbc061b3e62bc1982767a3a1f9815fcf0e
usb-storage: Set virt_boundary_mask to avoid SG overflows
We are not as likely to be vulnerable as storage, as it is unlikelier that UAS is run over a controller without native support for SG, but the issue exists.
The issue has been existing since the inception of the driver.
--- drivers/usb/storage/uas.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
drivers/usb/storage/uas.c +22 -13
@@ -796,24 +796,33 @@ static int uas_slave_alloc(struct scsi_d {struct uas_dev_info *devinfo = (struct uas_dev_info *)sdev->host->hostdata; +int maxp; sdev->hostdata = devinfo;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. +* We have two requirements here. We must satisfy the requirements +* of the physical HC and the demands of the protocol, as we +* definitely want no additional memory allocation in this path +* ruling out using bounce buffers. * -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* For a transmission on USB to continue we must never send +* a package that is smaller than maxpacket. Hence the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. +* If the HC does not ensure that through SG, +* the upper layer must do that. We must assume nothing +* about the capabilities off the HC, so we use the most +* pessimistic requirement. +*/ + + maxp =usb_maxpacket (devinfo->udev, devinfo->data_in_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* The protocol has no requirements on alignment in the strict sense. +* Controllers may or may not have alignment restrictions. +* As this is not exported, we use an extremely conservative guess. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 40/42 ASoC: Intel: avoid Oops if DMA setup fails
In reply to Greg Kroah-HartmanFrom: Ross Zwisler <[email protected]>
commit 0efa3334d65b7f421ba12382dfa58f6ff5bf83c4 upstream.
Currently in sst_dsp_new() if we get an error return from sst_dma_new() we just print an error message and then still complete the function successfully. This means that we are trying to run without sst->dma properly set up, which will result in NULL pointer dereference when sst->dma is later used. This was happening for me in sst_dsp_dma_get_channel():
struct sst_dma *dma = dsp->dma;
...
dma->ch = dma_request_channel(mask, dma_chan_filter, dsp);This resulted in:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: sst_dsp_dma_get_channel+0x4f/0x125 [snd_soc_sst_firmware]
Fix this by adding proper error handling for the case where we fail to set up DMA.
This change only affects Haswell and Broadwell systems. Baytrail systems explicilty opt-out of DMA via sst->pdata->resindex_dma_base being set to -1.
--- sound/soc/intel/common/sst-firmware.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/intel/common/sst-firmware.c +6 -2
@@ -1252,11 +1252,15 @@ struct sst_dsp *sst_dsp_new(struct devic goto irq_err; err =sst_dma_new (sst); -if (err) -dev_warn (dev,"sst_dma_new failed %d\n" , err); +if (err) { +dev_err (dev,"sst_dma_new failed %d\n" , err); + goto dma_err; + }return sst; +dma_err: +free_irq (sst->irq, sst); irq_err:if (sst->ops->free) sst->ops->free (sst);
Greg Kroah-Hartman
maintainerPATCH 41/42 locking/futex: Allow low-level atomic operations to return -EAGAIN
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 6b4f4bc9cb22875f97023984a625386f0c7cc1c0 upstream.
Some futex() operations, including FUTEX_WAKE_OP, require the kernel to perform an atomic read-modify-write of the futex word via the userspace mapping. These operations are implemented by each architecture in arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which are called in atomic context with the relevant hash bucket locks held.
Although these routines may return -EFAULT in response to a page fault generated when accessing userspace, they are expected to succeed (i.e. return 0) in all other cases. This poses a problem for architectures that do not provide bounded forward progress guarantees or fairness of contended atomic operations and can lead to starvation in some cases.
In these problematic scenarios, we must return back to the core futex code so that we can drop the hash bucket locks and reschedule if necessary, much like we do in the case of a page fault.
Allow architectures to return -EAGAIN from their implementations of arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which will cause the core futex code to reschedule if necessary and return back to the architecture code later on.
--- kernel/futex.c | 188 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 117 insertions(+), 71 deletions(-)
kernel/futex.c +117 -71
@@ -1324,13 +1324,15 @@ static int lookup_pi_state(u32 __user *ustatic int lock_pi_update_atomic (u32 __user *uaddr,u32 uval,u32 newval) { +int err;u32 uninitialized_var (curval );if (unlikely (should_fail_futex (true)))return -EFAULT ; -if (unlikely (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval))) -return -EFAULT ; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (unlikely (err)) +return err;/* If user space value changed, let the caller retry */ return curval != uval ? -EAGAIN :0 ;
@@ -1516,10 +1518,8 @@ static int wake_futex_pi(u32 __user *uadif (unlikely (should_fail_futex (true))) ret = -EFAULT ; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) { - ret = -EFAULT ; - - }else if (curval != uval) { + ret =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (!ret && (curval != uval)) {/* * If a unconditional UNLOCK_PI operation (user space did not * try the TID->0 transition) raced with a waiter setting the
@@ -1714,32 +1714,32 @@ retry_private:double_lock_hb (hb1, hb2); op_ret =futex_atomic_op_inuser (op, uaddr2);if (unlikely (op_ret <0 )) { -double_unlock_hb (hb1, hb2); -#ifndef CONFIG_MMU -/* -* we don't get EFAULT from MMU faults if we don't have an MMU, -* but we might get them from range checking -*/ - ret = op_ret; - goto out_put_keys; -#endif - -if (unlikely (op_ret != -EFAULT )) { +if (!IS_ENABLED (CONFIG_MMU ) || +unlikely (op_ret != -EFAULT && op_ret != -EAGAIN )) { +/* +* we don't get EFAULT from MMU faults if we don't have +* an MMU, but we might get them from range checking +*/ ret = op_ret; goto out_put_keys; } - ret =fault_in_user_writeable (uaddr2); -if (ret) - goto out_put_keys; +if (op_ret == -EFAULT ) { + ret =fault_in_user_writeable (uaddr2); +if (ret) + goto out_put_keys; + } -if (!(flags &FLAGS_SHARED )) +if (!(flags &FLAGS_SHARED )) { +cond_resched (); goto retry_private; + }put_futex_key (&key2);put_futex_key (&key1); +cond_resched (); goto retry; }
@@ -2364,7 +2364,7 @@ static int fixup_pi_state_owner(u32 __usu32 uval,uninitialized_var (curval ), newval;struct task_struct *oldowner, *newowner;u32 newtid; -int ret; +int ret, err =0 ;lockdep_assert_held (q->lock_ptr);
@@ -2435,14 +2435,17 @@ retry:if (!pi_state->owner) newtid |=FUTEX_OWNER_DIED ; -if (get_futex_value_locked (&uval, uaddr)) - goto handle_fault; + err =get_futex_value_locked (&uval, uaddr); +if (err) + goto handle_err;for (;;) { newval = (uval &FUTEX_OWNER_DIED ) | newtid; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) - goto handle_fault; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (err) + goto handle_err; +if (curval == uval)break ; uval = curval;
@@ -2470,23 +2473,37 @@ retry:return 0 ;/* -* To handle the page fault we need to drop the locks here. That gives -* the other task (either the highest priority waiter itself or the -* task which stole the rtmutex) the chance to try the fixup of the -* pi_state. So once we are back from handling the fault we need to -* check the pi_state after reacquiring the locks and before trying to -* do another fixup. When the fixup has been done already we simply -* return. +* In order to reschedule or handle a page fault, we need to drop the +* locks here. In the case of a fault, this gives the other task +* (either the highest priority waiter itself or the task which stole +* the rtmutex) the chance to try the fixup of the pi_state. So once we +* are back from handling the fault we need to check the pi_state after +* reacquiring the locks and before trying to do another fixup. When +* the fixup has been done already we simply return. * * Note: we hold both hb->lock and pi_mutex->wait_lock. We can safely * drop hb->lock since the caller owns the hb -> futex_q relation. * Dropping the pi_mutex->wait_lock requires the state revalidate. */ -handle_fault: +handle_err:raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (q->lock_ptr); - ret =fault_in_user_writeable (uaddr); +switch (err) { +case -EFAULT : + ret =fault_in_user_writeable (uaddr); +break ; + +case -EAGAIN : +cond_resched (); + ret =0 ; +break ; + +default : +WARN_ON_ONCE (1 ); + ret = err; +break ; + }spin_lock (q->lock_ptr);raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);
@@ -3055,10 +3072,8 @@ retry:* A unconditional UNLOCK_PI op raced against a waiter * setting the FUTEX_WAITERS bit. Try again. */ -if (ret == -EAGAIN ) { -put_futex_key (&key); - goto retry; - } +if (ret == -EAGAIN ) + goto pi_retry;/* * wake_futex_pi has detected invalid state. Tell user * space.
@@ -3073,9 +3088,19 @@ retry:* preserve the WAITERS bit not the OWNER_DIED one. We are the * owner. */ -if (cmpxchg_futex_value_locked (&curval, uaddr, uval,0 )) { +if ((ret =cmpxchg_futex_value_locked (&curval, uaddr, uval,0 ))) {spin_unlock (&hb->lock); - goto pi_faulted; +switch (ret) { +case -EFAULT : + goto pi_faulted; + +case -EAGAIN : + goto pi_retry; + +default : +WARN_ON_ONCE (1 ); + goto out_putkey; + } }/*
@@ -3089,6 +3114,11 @@ out_putkey:put_futex_key (&key);return ret; +pi_retry: +put_futex_key (&key); +cond_resched (); + goto retry; + pi_faulted:put_futex_key (&key);
@@ -3449,6 +3479,7 @@ err_unlock:int handle_futex_death (u32 __user *uaddr,struct task_struct *curr,int pi) {u32 uval,uninitialized_var (nval ), mval; +int err;/* Futex address must be 32bit aligned */ if ((((unsigned long )uaddr) %sizeof (*uaddr)) !=0 )
@@ -3458,42 +3489,57 @@ retry:if (get_user (uval, uaddr))return -1 ; -if ((uval &FUTEX_TID_MASK ) ==task_pid_vnr (curr)) { -/* -* Ok, this dying thread is truly holding a futex -* of interest. Set the OWNER_DIED bit atomically -* via cmpxchg, and if the value had FUTEX_WAITERS -* set, wake up a waiter (if any). (We have to do a -* futex_wake() even if OWNER_DIED is already set - -* to handle the rare but possible case of recursive -* thread-death.) The rest of the cleanup is done in -* userspace. -*/ - mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; -/* -* We are not holding a lock here, but we want to have -* the pagefault_disable/enable() protection because -* we want to handle the fault gracefully. If the -* access fails we try to fault in the futex with R/W -* verification via get_user_pages. get_user() above -* does not guarantee R/W access. If that fails we -* give up and leave the futex locked. -*/ -if (cmpxchg_futex_value_locked (&nval, uaddr, uval, mval)) { +if ((uval &FUTEX_TID_MASK ) !=task_pid_vnr (curr)) +return 0 ; + +/* +* Ok, this dying thread is truly holding a futex +* of interest. Set the OWNER_DIED bit atomically +* via cmpxchg, and if the value had FUTEX_WAITERS +* set, wake up a waiter (if any). (We have to do a +* futex_wake() even if OWNER_DIED is already set - +* to handle the rare but possible case of recursive +* thread-death.) The rest of the cleanup is done in +* userspace. +*/ + mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; + +/* +* We are not holding a lock here, but we want to have +* the pagefault_disable/enable() protection because +* we want to handle the fault gracefully. If the +* access fails we try to fault in the futex with R/W +* verification via get_user_pages. get_user() above +* does not guarantee R/W access. If that fails we +* give up and leave the futex locked. +*/ +if ((err =cmpxchg_futex_value_locked (&nval, uaddr, uval, mval))) { +switch (err) { +case -EFAULT :if (fault_in_user_writeable (uaddr))return -1 ; goto retry; - } -if (nval != uval) + +case -EAGAIN : +cond_resched (); goto retry; -/* -* Wake robust non-PI futexes here. The wakeup of -* PI futexes happens in exit_pi_state(): -*/ -if (!pi && (uval &FUTEX_WAITERS )) -futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +default : +WARN_ON_ONCE (1 ); +return err; + } } + +if (nval != uval) + goto retry; + +/* +* Wake robust non-PI futexes here. The wakeup of +* PI futexes happens in exit_pi_state(): +*/ +if (!pi && (uval &FUTEX_WAITERS )) +futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 42/42 arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 03110a5cb2161690ae5ac04994d47ed0cd6cef75 upstream.
Our futex implementation makes use of LDXR/STXR loops to perform atomic updates to user memory from atomic context. This can lead to latency problems if we end up spinning around the LL/SC sequence at the expense of doing something useful.
Rework our futex atomic operations so that we return -EAGAIN if we fail to update the futex word after 128 attempts. The core futex code will reschedule if necessary and we'll try again later.
--- arch/arm64/include/asm/futex.h | 55 +++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-)
arch/arm64/include/asm/futex.h +34 -21
@@ -23,26 +23,34 @@#include <asm/errno.h> +#define FUTEX_MAX_LOOPS 128/* What's the largest number you can think of? */ +#define __futex_atomic_op (insn, ret, oldval, uaddr, tmp, oparg) \ do { \ + unsigned int loops = FUTEX_MAX_LOOPS; \ + \ uaccess_enable(); \ asm volatile( \ " prfm pstl1strm, %2\n" \ "1: ldxr %w1, %2\n" \ insn "\n" \ "2: stlxr %w0, %w3, %2\n" \ -" cbnz %w0, 1b\n" \ -" dmb ish\n" \ +" cbz %w0, 3f\n" \ +" sub %w4, %w4, %w0\n" \ +" cbnz %w4, 1b\n" \ +" mov %w0, %w7\n" \ "3:\n" \ +" dmb ish\n" \ " .pushsection .fixup,\"ax\"\n" \ " .align 2\n" \ -"4: mov %w0, %w5\n" \ +"4: mov %w0, %w6\n" \ " b 3b\n" \ " .popsection\n" \ _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ - : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp) \ - : "r" (oparg), "Ir" (-EFAULT) \ + : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp), \ + "+r" (loops) \ + : "r" (oparg), "Ir" (-EFAULT), "Ir" (-EAGAIN) \ : "memory"); \ uaccess_disable(); \ } while (0)
@@ -57,23 +65,23 @@ arch_futex_atomic_op_inuser(int op, intswitch (op) {case FUTEX_OP_SET : -__futex_atomic_op ("mov %w3, %w4" , +__futex_atomic_op ("mov %w3, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ADD : -__futex_atomic_op ("add %w3, %w1, %w4" , +__futex_atomic_op ("add %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_OR : -__futex_atomic_op ("orr %w3, %w1, %w4" , +__futex_atomic_op ("orr %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ANDN : -__futex_atomic_op ("and %w3, %w1, %w4" , +__futex_atomic_op ("and %w3, %w1, %w5" , ret, oldval, uaddr, tmp, ~oparg);break ;case FUTEX_OP_XOR : -__futex_atomic_op ("eor %w3, %w1, %w4" , +__futex_atomic_op ("eor %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;default :
@@ -93,6 +101,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 oldval, u32 newval) {int ret =0 ; +unsigned int loops =FUTEX_MAX_LOOPS ;u32 val, tmp;u32 __user *uaddr;
@@ -104,20 +113,24 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, asmvolatile ("// futex_atomic_cmpxchg_inatomic\n" " prfm pstl1strm, %2\n" "1: ldxr %w1, %2\n" -" sub %w3, %w1, %w4\n" -" cbnz %w3, 3f\n" -"2: stlxr %w3, %w5, %2\n" -" cbnz %w3, 1b\n" -" dmb ish\n" +" sub %w3, %w1, %w5\n" +" cbnz %w3, 4f\n" +"2: stlxr %w3, %w6, %2\n" +" cbz %w3, 3f\n" +" sub %w4, %w4, %w3\n" +" cbnz %w4, 1b\n" +" mov %w0, %w8\n" "3:\n" +" dmb ish\n" +"4:\n" " .pushsection .fixup,\"ax\"\n" -"4: mov %w0, %w6\n" -" b 3b\n" +"5: mov %w0, %w7\n" +" b 4b\n" " .popsection\n" - _ASM_EXTABLE(1b, 4b) - _ASM_EXTABLE(2b, 4b) - : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp) - : "r" (oldval), "r" (newval), "Ir" (-EFAULT) + _ASM_EXTABLE(1b, 5b) + _ASM_EXTABLE(2b, 5b) + : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp), "+r" (loops) + : "r" (oldval), "r" (newval), "Ir" (-EFAULT), "Ir" (-EAGAIN) : "memory");uaccess_disable ();
Greg Kroah-Hartman
maintainerPATCH 32/42 USB: serial: f81232: fix interrupt worker not stop
In reply to Greg Kroah-HartmanFrom: Ji-Ze Hong (Peter Hong) <[email protected]>
commit 804dbee1e49774918339c1e5a87400988c0819e8 upstream.
The F81232 will use interrupt worker to handle MSR change. This patch will fix the issue that interrupt work should stop in close() and suspend().
This also fixes line-status events being disabled after a suspend cycle until the port is re-opened.
--- drivers/usb/serial/f81232.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/usb/serial/f81232.c +39 -0
@@ -560,9 +560,12 @@ static int f81232_open(struct tty_structstatic void f81232_close (struct usb_serial_port *port) { +struct f81232_private *port_priv =usb_get_serial_port_data (port); +f81232_port_disable (port);usb_serial_generic_close (port);usb_kill_urb (port->interrupt_in_urb); +flush_work (&port_priv->interrupt_work); }static void f81232_dtr_rts (struct usb_serial_port *port,int on)
@@ -656,6 +659,40 @@ static int f81232_port_remove(struct usbreturn 0 ; } +static int f81232_suspend (struct usb_serial *serial,pm_message_t message) +{ +struct usb_serial_port *port = serial->port[0 ]; +struct f81232_private *port_priv =usb_get_serial_port_data (port); +int i; + +for (i =0 ; i <ARRAY_SIZE (port->read_urbs); ++i) +usb_kill_urb (port->read_urbs[i]); + +usb_kill_urb (port->interrupt_in_urb); + +if (port_priv) +flush_work (&port_priv->interrupt_work); + +return 0 ; +} + +static int f81232_resume (struct usb_serial *serial) +{ +struct usb_serial_port *port = serial->port[0 ]; +int result; + +if (tty_port_initialized (&port->port)) { + result =usb_submit_urb (port->interrupt_in_urb,GFP_NOIO ); +if (result) { +dev_err (&port->dev,"submit interrupt urb failed: %d\n" , + result); +return result; + } + } + +return usb_serial_generic_resume (serial); +} +static struct usb_serial_driver f81232_device = { .driver = { .owner =THIS_MODULE ,
@@ -679,6 +716,8 @@ static struct usb_serial_driver f81232_d .read_int_callback = f81232_read_int_callback, .port_probe = f81232_port_probe, .port_remove = f81232_port_remove, + .suspend = f81232_suspend, + .resume = f81232_resume, };static struct usb_serial_driver *const serial_drivers[] = {
Greg Kroah-Hartman
maintainerPATCH 33/42 USB: cdc-acm: fix unthrottle races
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 764478f41130f1b8d8057575b89e69980a0f600d upstream.
Fix two long-standing bugs which could potentially lead to memory corruption or leave the port throttled until it is reopened (on weakly ordered systems), respectively, when read-URB completion races with unthrottle().
First, the URB must not be marked as free before processing is complete to prevent it from being submitted by unthrottle() on another CPU.
CPU 1 CPU 2 ================ ================ complete() unthrottle() process_urb(); smp_mb__before_atomic(); set_bit(i, free); if (test_and_clear_bit(i, free)) submit_urb();
Second, the URB must be marked as free before checking the throttled flag to prevent unthrottle() on another CPU from failing to observe that the URB needs to be submitted if complete() sees that the throttled flag is set.
CPU 1 CPU 2 ================ ================ complete() unthrottle() set_bit(i, free); throttled = 0; smp_mb__after_atomic(); smp_mb(); if (throttled) if (test_and_clear_bit(i, free)) return; submit_urb();
Note that test_and_clear_bit() only implies barriers when the test is successful. To handle the case where the URB is still in use an explicit barrier needs to be added to unthrottle() for the second race condition.
Also note that the first race was fixed by 36e59e0d70d6 ("cdc-acm: fix race between callback and unthrottle") back in 2015, but the bug was reintroduced a year later.
--- drivers/usb/class/cdc-acm.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/usb/class/cdc-acm.c +25 -7
@@ -482,12 +482,12 @@ static void acm_read_bulk_callback(strucstruct acm *acm = rb->instance;unsigned long flags;int status = urb->status; +bool stopped = false; +bool stalled = false;dev_vdbg (&acm->data->dev,"got urb %d, len %d, status %d\n" , rb->index, urb->actual_length, status); -set_bit (rb->index, &acm->read_urbs_free); -if (!acm->dev) {dev_dbg (&acm->data->dev,"%s - disconnected\n" , __func__);return ;
@@ -500,15 +500,16 @@ static void acm_read_bulk_callback(strucbreak ;case -EPIPE :set_bit (EVENT_RX_STALL , &acm->flags); -schedule_work (&acm->work); -return ; + stalled = true; +break ;case -ENOENT :case -ECONNRESET :case -ESHUTDOWN :dev_dbg (&acm->data->dev,"%s - urb shutting down with status: %d\n" , __func__, status); -return ; + stopped = true; +break ;default : dev_dbg(&acm->data->dev, "%s - nonzero urb status received: %d\n",
@@ -517,10 +518,24 @@ static void acm_read_bulk_callback(struc }/* -* Unthrottle may run on another CPU which needs to see events -* in the same order. Submission has an implict barrier +* Make sure URB processing is done before marking as free to avoid +* racing with unthrottle() on another CPU. Matches the barriers +* implied by the test_and_clear_bit() in acm_submit_read_urb(). */ smp_mb__before_atomic (); +set_bit (rb->index, &acm->read_urbs_free); +/* +* Make sure URB is marked as free before checking the throttled flag +* to avoid racing with unthrottle() on another CPU. Matches the +* smp_mb() in unthrottle(). +*/ +smp_mb__after_atomic (); + +if (stopped || stalled) { +if (stalled) +schedule_work (&acm->work); +return ; + }/* throttle device if requested by tty */ spin_lock_irqsave (&acm->read_lock, flags);
@@ -854,6 +869,9 @@ static void acm_tty_unthrottle(struct tt acm->throttle_req =0 ;spin_unlock_irq (&acm->read_lock); +/* Matches the smp_mb__after_atomic() in acm_read_bulk_callback(). */ +smp_mb (); +if (was_throttled)acm_submit_read_urbs (acm,GFP_KERNEL ); }
Greg Kroah-Hartman
maintainerPATCH 34/42 usb-storage: Set virt_boundary_mask to avoid SG overflows
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 747668dbc061b3e62bc1982767a3a1f9815fcf0e upstream.
The USB subsystem has always had an unusual requirement for its scatter-gather transfers: Each element in the scatterlist (except the last one) must have a length divisible by the bulk maxpacket size. This is a particular issue for USB mass storage, which uses SG lists created by the block layer rather than setting up its own.
So far we have scraped by okay because most devices have a logical block size of 512 bytes or larger, and the bulk maxpacket sizes for USB 2 and below are all <= 512. However, USB 3 has a bulk maxpacket size of 1024. Since the xhci-hcd driver includes native SG support, this hasn't mattered much. But now people are trying to use USB-3 mass storage devices with USBIP, and the vhci-hcd driver currently does not have full SG support.
The result is an overflow error, when the driver attempts to implement an SG transfer of 63 512-byte blocks as a single
3584-byte (7 blocks) transfer followed by seven 4096-byte (8 blocks) transfers. The device instead sends 31 1024-byte packets followed by a 512-byte packet, and this overruns the first SG buffer.
Ideally this would be fixed by adding better SG support to vhci-hcd. But for now it appears we can work around the problem by asking the block layer to respect the maxpacket limitation, through the use of the virt_boundary_mask.
--- drivers/usb/storage/scsiglue.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/usb/storage/scsiglue.c +12 -14
@@ -81,6 +81,7 @@ static const char* host_info(struct Scsistatic int slave_alloc (struct scsi_device *sdev) {struct us_data *us =host_to_us (sdev->host); +int maxp;/* * Set the INQUIRY transfer length to 36. We don't use any of
@@ -90,20 +91,17 @@ static int slave_alloc (struct scsi_devi sdev->inquiry_len =36 ;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. -* -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* USB has unusual scatter-gather requirements: the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. Fortunately this value is always a +* power of 2. Inform the block layer about this requirement. +*/ + maxp =usb_maxpacket (us->pusb_dev, us->recv_bulk_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* Some host controllers may have alignment requirements. +* We'll play it safe by requiring 512-byte alignment always. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 36/42 scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
In reply to Greg Kroah-HartmanFrom: Andrew Vasquez <[email protected]>
commit 5cbdae10bf11f96e30b4d14de7b08c8b490e903c upstream.
Commit e6f77540c067 ("scsi: qla2xxx: Fix an integer overflow in sysfs code") incorrectly set 'optrom_region_size' to 'start+size', which can overflow option-rom boundaries when 'start' is non-zero. Continue setting optrom_region_size to the proper adjusted value of 'size'.
--- drivers/scsi/qla2xxx/qla_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -2
@@ -345,7 +345,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SREADING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
@@ -418,7 +418,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SWRITING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
Greg Kroah-Hartman
maintainerPATCH 38/42 Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
The minimum encryption key size for LE connections is 56 bits and to align LE with BR/EDR, enforce 56 bits of minimum encryption key size for BR/EDR connections as well.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_conn.c | 8 ++++++++ 2 files changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -178,6 +178,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
net/bluetooth/hci_conn.c +8 -0
@@ -1165,6 +1165,14 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +*/ +if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) +return 0 ; +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 29/42 iommu/amd: Set exclusion range correctly
In reply to Greg Kroah-Hartman[ Upstream commit 3c677d206210f53a4be972211066c0f1cd47fe12 ]
The exlcusion range limit register needs to contain the base-address of the last page that is part of the range, as bits 0-11 of this register are treated as 0xfff by the hardware for comparisons.
So correctly set the exclusion range in the hardware to the last page which is _in_ the range.
--- drivers/iommu/amd_iommu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu_init.c +1 -1
@@ -355,7 +355,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val)static void iommu_set_exclusion_range (struct amd_iommu *iommu) {u64 start = iommu->exclusion_start &PAGE_MASK ; -u64 limit = (start + iommu->exclusion_length) &PAGE_MASK ; +u64 limit = (start + iommu->exclusion_length -1 ) &PAGE_MASK ;u64 entry;if (!iommu->exclusion_start)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/42 Bluetooth: hidp: fix buffer overflow
In reply to Greg Kroah-HartmanFrom: Young Xiao <[email protected]>
commit a1616a5ac99ede5d605047a9012481ce7ff18b16 upstream.
Struct ca is copied from userspace. It is not checked whether the "name" field is NULL terminated, which allows local users to obtain potentially sensitive information from kernel stack memory, via a HIDPCONNADD command.
This vulnerability is similar to CVE-2011-1079.
--- net/bluetooth/hidp/sock.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/hidp/sock.c +1 -0
@@ -76,6 +76,7 @@ static int hidp_sock_ioctl(struct socketsockfd_put (csock);return err; } + ca.name[sizeof (ca.name)-1 ] =0 ; err =hidp_connection_add (&ca, csock, isock);if (!err &©_to_user (argp, &ca,sizeof (ca)))
Greg Kroah-Hartman
maintainerPATCH 35/42 intel_th: pci: Add Comet Lake support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit e60e9a4b231a20a199d7a61caadc48693c30d695 upstream.
This adds support for Intel TH on Comet Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -173,6 +173,11 @@ static const struct pci_device_id intel_ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Comet Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x02a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Greg Kroah-Hartman
maintainerPATCH 31/42 usb: dwc3: Fix default lpm_nyet_threshold value
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 8d791929b2fbdf7734c1596d808e55cb457f4562 upstream.
The max possible value for DCTL.LPM_NYET_THRES is 15 and not 255. Change the default value to 15.
--- drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/core.c +1 -1
@@ -1042,7 +1042,7 @@ static void dwc3_get_properties(struct du8 hird_threshold;/* default to highest possible threshold */ - lpm_nyet_threshold =0xff ; + lpm_nyet_threshold =0xf ;/* default to -3.5dB de-emphasis */ tx_de_emphasis =1 ;
Greg Kroah-Hartman
maintainerPATCH 5/42 ASoC: hdmi-codec: fix S/PDIF DAI
In reply to Greg Kroah-Hartman[ Upstream commit 2e95f984aae4cf0608d0ba2189c756f2bd50b44a ]
When using the S/PDIF DAI, there is no requirement to call snd_soc_dai_set_fmt() as there is no DAI format definition that defines S/PDIF. In any case, S/PDIF does not have separate clocks, this is embedded into the data stream.
Consequently, when attempting to use TDA998x in S/PDIF mode, the attempt to configure TDA998x via the hw_params callback fails as the hdmi_codec_daifmt is left initialised to zero.
Since the S/PDIF DAI will only be used by S/PDIF, prepare the hdmi_codec_daifmt structure for this format.
--- sound/soc/codecs/hdmi-codec.c | 118 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 59 deletions(-)
sound/soc/codecs/hdmi-codec.c +59 -59
@@ -536,73 +536,71 @@ static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, {struct hdmi_codec_priv *hcp =snd_soc_dai_get_drvdata (dai);struct hdmi_codec_daifmt cf = {0 }; -int ret =0 ;dev_dbg (dai->dev,"%s()\n" , __func__); -if (dai->id ==DAI_ID_SPDIF ) { - cf.fmt =HDMI_SPDIF ; - }else { -switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { -case SND_SOC_DAIFMT_CBM_CFM : - cf.bit_clk_master =1 ; - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFM : - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBM_CFS : - cf.bit_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFS : -break ; -default : -return -EINVAL ; - } +if (dai->id ==DAI_ID_SPDIF ) +return 0 ; + +switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { +case SND_SOC_DAIFMT_CBM_CFM : + cf.bit_clk_master =1 ; + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFM : + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBM_CFS : + cf.bit_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFS : +break ; +default : +return -EINVAL ; + } -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_NF : -break ; -case SND_SOC_DAIFMT_NB_IF : - cf.frame_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_NF : - cf.bit_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_IF : - cf.frame_clk_inv =1 ; - cf.bit_clk_inv =1 ; -break ; - } +switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { +case SND_SOC_DAIFMT_NB_NF : +break ; +case SND_SOC_DAIFMT_NB_IF : + cf.frame_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_NF : + cf.bit_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_IF : + cf.frame_clk_inv =1 ; + cf.bit_clk_inv =1 ; +break ; + } -switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { -case SND_SOC_DAIFMT_I2S : - cf.fmt =HDMI_I2S ; -break ; -case SND_SOC_DAIFMT_DSP_A : - cf.fmt =HDMI_DSP_A ; -break ; -case SND_SOC_DAIFMT_DSP_B : - cf.fmt =HDMI_DSP_B ; -break ; -case SND_SOC_DAIFMT_RIGHT_J : - cf.fmt =HDMI_RIGHT_J ; -break ; -case SND_SOC_DAIFMT_LEFT_J : - cf.fmt =HDMI_LEFT_J ; -break ; -case SND_SOC_DAIFMT_AC97 : - cf.fmt =HDMI_AC97 ; -break ; -default : -dev_err (dai->dev,"Invalid DAI interface format\n" ); -return -EINVAL ; - } +switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { +case SND_SOC_DAIFMT_I2S : + cf.fmt =HDMI_I2S ; +break ; +case SND_SOC_DAIFMT_DSP_A : + cf.fmt =HDMI_DSP_A ; +break ; +case SND_SOC_DAIFMT_DSP_B : + cf.fmt =HDMI_DSP_B ; +break ; +case SND_SOC_DAIFMT_RIGHT_J : + cf.fmt =HDMI_RIGHT_J ; +break ; +case SND_SOC_DAIFMT_LEFT_J : + cf.fmt =HDMI_LEFT_J ; +break ; +case SND_SOC_DAIFMT_AC97 : + cf.fmt =HDMI_AC97 ; +break ; +default : +dev_err (dai->dev,"Invalid DAI interface format\n" ); +return -EINVAL ; } hcp->daifmt[dai->id] = cf; -return ret; +return 0 ; }static int hdmi_codec_digital_mute (struct snd_soc_dai *dai,int mute)
@@ -784,8 +782,10 @@ static int hdmi_codec_probe(struct platform_device *pdev) i++; } -if (hcd->spdif) +if (hcd->spdif) { hcp->daidrv[i] = hdmi_spdif_dai; + hcp->daifmt[DAI_ID_SPDIF ].fmt =HDMI_SPDIF ; + } ret =snd_soc_register_codec (dev, &hdmi_codec, hcp->daidrv, dai_count);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/42 scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
In reply to Greg Kroah-Hartman[ Upstream commit 5c2442fd78998af60e13aba506d103f7f43f8701 ]
If scsi cmd sglist is not suitable for DDP then csiostor driver uses preallocated buffers for DDP, because of this data copy is required from DDP buffer to scsi cmd sglist before calling ->scsi_done().
--- drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/csiostor/csio_scsi.c +4 -1
@@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: -if (req->nsge >0 ) +if (req->nsge >0 ) {scsi_dma_unmap (cmnd); +if (req->dcopy && (host_status ==DID_OK )) + host_status =csio_scsi_copy_to_sgl (hw, req); + } cmnd->result = (((host_status) <<16 ) | scsi_status); cmnd->scsi_done (cmnd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/42 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit a0033bd1eae4650b69be07c17cb87393da584563 upstream.
With CONFIG_DEBUG_PREEMPT=y, the put_cpu_ptr() triggers an underflow warning in preempt_count_sub().
--- drivers/hv/hv.c | 1 - 1 file changed, 1 deletion(-)
drivers/hv/hv.c +0 -1
@@ -356,7 +356,6 @@ int hv_synic_cleanup(unsigned int cpu)clockevents_unbind_device (hv_cpu->clk_evt, cpu);hv_ce_shutdown (hv_cpu->clk_evt); -put_cpu_ptr (hv_cpu); } hv_get_synint_state(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT,
Greg Kroah-Hartman
maintainerPATCH 18/42 linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
In reply to Greg Kroah-Hartman[ Upstream commit a0fe2c6479aab5723239b315ef1b552673f434a3 ]
Use parentheses around uses of the argument in u64_to_user_ptr() to ensure that the cast doesn't apply to part of the argument.
There are existing uses of the macro of the form
u64_to_user_ptr(A + B)
which expands to
(void __user *)(uintptr_t)A + B
(the cast applies to the first operand of the addition, the addition is a pointer addition). This happens to still work as intended, the semantic difference doesn't cause a difference in behavior.
But I want to use u64_to_user_ptr() with a ternary operator in the argument, like so:
u64_to_user_ptr(A ? B : C)
This currently doesn't work as intended.
--- include/linux/kernel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/kernel.h +2 -2
@@ -72,8 +72,8 @@#define u64_to_user_ptr (x) ( \ { \ - typecheck(u64, x); \ - (void __user *)(uintptr_t)x; \ + typecheck(u64, (x)); \ + (void __user *)(uintptr_t)(x); \ } \ )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/42 drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
In reply to Greg Kroah-Hartman[ Upstream commit 2d85978341e6a32e7443d9f28639da254d53f400 ]
We don't want to overwrite "ret", it already holds the correct error code. The "regmap" variable might be a valid pointer as this point.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_hdmi.c +0 -1
@@ -1473,7 +1473,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (regmap)) ret =PTR_ERR (regmap);if (ret) { - ret =PTR_ERR (regmap);dev_err (dev,"Failed to get system configuration registers: %d\n" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/42 IB/hfi1: Eliminate opcode tests on mr deref
In reply to Greg Kroah-Hartman[ Upstream commit a8639a79e85c18c16c10089edd589c7948f19bbd ]
When an old ack_queue entry is used to store an incoming request, it may need to clean up the old entry if it is still referencing the MR. Originally only RDMA READ request needed to reference MR on the responder side and therefore the opcode was tested when cleaning up the old entry. The introduction of tid rdma specific operations in the ack_queue makes the specific opcode tests wrong. Multiple opcodes (RDMA READ, TID RDMA READ, and TID RDMA WRITE) may need MR ref cleanup.
Remove the opcode specific tests associated with the ack_queue.
--- drivers/infiniband/hw/hfi1/rc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/rc.c +2 -2
@@ -2309,7 +2309,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
@@ -2383,7 +2383,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/42 ASoC: cs4270: Set auto-increment bit for register writes
In reply to Greg Kroah-Hartman[ Upstream commit f0f2338a9cfaf71db895fa989ea7234e8a9b471d ]
The CS4270 does not by default increment the register address on consecutive writes. During normal operation it doesn't matter as all register accesses are done individually. At resume time after suspend, however, the regcache code gathers the biggest possible block of registers to sync and sends them one on one go.
To fix this, set the INCR bit in all cases.
--- sound/soc/codecs/cs4270.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4270.c +1 -0
@@ -643,6 +643,7 @@ static const struct regmap_config cs4270_regmap = { .reg_defaults = cs4270_reg_defaults, .num_reg_defaults = ARRAY_SIZE(cs4270_reg_defaults), .cache_type = REGCACHE_RBTREE, + .write_flag_mask = CS4270_I2C_INCR, .readable_reg = cs4270_reg_is_readable, .volatile_reg = cs4270_reg_is_volatile,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 1/42 scsi: libsas: fix a race condition when smp task timeout
In reply to Greg Kroah-HartmanFrom: Jason Yan <[email protected]>
commit b90cd6f2b905905fb42671009dc0e27c310a16ae upstream.
When the lldd is processing the complete sas task in interrupt and set the task stat as SAS_TASK_STATE_DONE, the smp timeout timer is able to be triggered at the same time. And smp_task_timedout() will complete the task wheter the SAS_TASK_STATE_DONE is set or not. Then the sas task may freed before lldd end the interrupt process. Thus a use-after-free will happen.
Fix this by calling the complete() only when SAS_TASK_STATE_DONE is not set. And remove the check of the return value of the del_timer(). Once the LLDD sets DONE, it must call task->done(), which will call smp_task_done()->complete() and the task will be completed and freed correctly.
--- drivers/scsi/libsas/sas_expander.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/libsas/sas_expander.c +4 -5
@@ -47,17 +47,16 @@ static void smp_task_timedout(unsigned lunsigned long flags;spin_lock_irqsave (&task->task_state_lock, flags); -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) +if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { task->task_state_flags |=SAS_TASK_STATE_ABORTED ; +complete (&task->slow_task->completion); + }spin_unlock_irqrestore (&task->task_state_lock, flags); - -complete (&task->slow_task->completion); }static void smp_task_done (struct sas_task *task) { -if (!del_timer (&task->slow_task->timer)) -return ; +del_timer (&task->slow_task->timer);complete (&task->slow_task->completion); }
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.117-43-gfd7dbc6d8090/ Full Build Summary…
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.117-43-gfd7dbc6d8090/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.117-43-gfd7dbc6d8090/
Tree: stable-rc
Branch: linux-4.14.y
Git Describe: v4.14.117-43-gfd7dbc6d8090
Git Commit: fd7dbc6d8090b210573e19d5a50f7772ec4b1977
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 64 unique boards, 25 SoC families, 15 builds out of 201
Boot Failures Detected:
arm:
multi_v7_defconfig:
gcc-8:
stih410-b2120: 1 failed labarm64:
defconfig:
gcc-8:
rk3399-firefly: 1 failed lab
Conflicting Boot Failure Detected: (These likely are not failures as other labs are reporting PASS. Needs review.)
arm:
davinci_all_defconfig:
da850-lcdk:
lab-baylibre: PASS (gcc-8)
lab-baylibre-seattle: FAIL (gcc-8)
---
For more info write to <[email protected]>
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.118 release. There are 42 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 Sat 11 May 2019 06:11:15 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.118-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.118-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: fd7dbc6d8090b210573e19d5a50f7772ec4b1977
git describe: v4.14.117-43-gfd7dbc6d8090
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.117-43-gfd7dbc6d8090
No regressions (compared to build v4.14.117)
No fixes (compared to build v4.14.117)
Ran 23536 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.118 release. There are 42 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 Sat 11 May 2019 06:11:15 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.118-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.14.118-rc1-gfd7dbc6
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.118 release. There are 42 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 Sat 11 May 2019 06:11:15 PM UTC. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 333 pass: 333 fail: 0
Guenter
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.118 release. There are 42 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.
Quoted 9 lines
Responses should be made by Sat 11 May 2019 06:11:15 PM UTC. 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.118-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah