4.14.99-stable review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 54/205 firmware/efi: Add NULL pointer checks in efivars API functions
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ]
Since commit:
ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
we have a device driver accessing the efivars API. Several functions in the efivars API assume __efivars is set, i.e., that they will be accessed only after efivars_register() has been called. However, the following NULL pointer access was reported calling efivar_entry_size() from the brcmfmac device driver:
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = 60bfa5f1 [00000008] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM ... Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events request_firmware_work_func PC is at efivar_entry_size+0x28/0x90 LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] pc : [<c0c40718>] lr : [<bf2a3ef4>] psr: a00d0113 sp : ede7fe28 ip : ee983410 fp : c1787f30 r10: 00000000 r9 : 00000000 r8 : bf2b2258 r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: ad16804a DAC: 00000051
Disassembly showed that the local static variable __efivars is NULL, which is not entirely unexpected given that it is a non-EFI platform.
So add a NULL pointer check to efivar_entry_size(), and to related functions while at it. In efivars_register() a couple of sanity checks are added as well.
--- drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 21 deletions(-)
drivers/firmware/efi/vars.c +78 -21
@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable);static efi_status_t check_var_size (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size)static efi_status_t check_var_size_nonblocking (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *),void *data,bool duplicates,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;unsigned long variable_name_size =1024 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;int err =0 ; +if (!__efivars) +return -EFAULT ; + + ops = __efivars->ops; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry)*/ int __efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -0 ,0 ,NULL ); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL );return efi_status_to_err (status); }
@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete);*/ int efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->set_variable (entry->var.VariableName, &entry->var.VendorGuid,0 ,0 ,NULL );
@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete);int efivar_entry_set (struct efivar_entry *entry,u32 attributes,unsigned long size,void *data,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;efi_char16_t *name = entry->var.VariableName;efi_guid_t vendor = entry->var.VendorGuid;if (down_interruptible (&efivars_lock))return -EINTR ; + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops;if (head &&efivar_entry_find (name, vendor, head, false)) {up (&efivars_lock);return -EEXIST ;
@@ -687,12 +715,17 @@ static int efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, u32 attributes, unsigned long size, void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_trylock (&efivars_lock))return -EBUSY ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + status =check_var_size_nonblocking (attributes, size +ucs2_strsize (name,1024 ));if (status !=EFI_SUCCESS ) {
@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,return -ENOSPC ; } + ops = __efivars->ops; status = ops->set_variable_nonblocking (name, &vendor, attributes, size, data);
@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,int efivar_entry_set_safe (efi_char16_t *name,efi_guid_t vendor,u32 attributes,bool block,unsigned long size,void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; +if (!__efivars) +return -EINVAL ; + + ops = __efivars->ops;if (!ops->query_variable_store)return -ENOSYS ;
@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find);*/ int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; *size =0 ;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->get_variable (entry->var.VariableName, &entry->var.VendorGuid,NULL , size,NULL );up (&efivars_lock);
@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size);int __efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);return efi_status_to_err (status); }
@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get);int efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);up (&efivars_lock);return efi_status_to_err (status);
@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get);int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes,unsigned long *size,void *data,bool *set) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_char16_t *name = entry->var.VariableName;efi_guid_t *vendor = &entry->var.VendorGuid;efi_status_t status;
@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { + err = -EINVAL ; + goto out; + } +/* * Ensure that the available space hasn't shrunk below the safe level */
@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, } } + ops = __efivars->ops; + status = ops->set_variable (name, vendor, attributes, *size, data);if (status !=EFI_SUCCESS ) { err =efi_status_to_err (status);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 59/205 x86/fpu: Add might_fault() to user_insn()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ]
Every user of user_insn() passes an user memory pointer to this macro.
Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed.
[ bp: Space it out to make it more visible. ]
--- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/fpu/internal.h +3 -0
@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 183/205 futex: Handle early deadlock return correctly
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 1a1fb985f2e2b85ec0d3dc2e519ee48389ec2434 upstream.
commit 56222b212e8e ("futex: Drop hb->lock before enqueueing on the rtmutex") changed the locking rules in the futex code so that the hash bucket lock is not longer held while the waiter is enqueued into the rtmutex wait list. This made the lock and the unlock path symmetric, but unfortunately the possible early exit from __rt_mutex_proxy_start() due to a detected deadlock was not updated accordingly. That allows a concurrent unlocker to observe inconsitent state which triggers the warning in the unlock path.
futex_lock_pi() futex_unlock_pi()
lock(hb->lock)
queue(hb_waiter) lock(hb->lock)
lock(rtmutex->wait_lock)
unlock(hb->lock)
// acquired hb->lock
hb_waiter = futex_top_waiter()
lock(rtmutex->wait_lock)
__rt_mutex_proxy_start()
---> fail
remove(rtmutex_waiter);
---> returns -EDEADLOCK
unlock(rtmutex->wait_lock)
// acquired wait_lock
wake_futex_pi()
rt_mutex_next_owner()
--> returns NULL
--> WARN lock(hb->lock)
unqueue(hb_waiter)
The problem is caused by the remove(rtmutex_waiter) in the failure case of __rt_mutex_proxy_start() as this lets the unlocker observe a waiter in the hash bucket but no waiter on the rtmutex, i.e. inconsistent state.
The original commit handles this correctly for the other early return cases (timeout, signal) by delaying the removal of the rtmutex waiter until the returning task reacquired the hash bucket lock.
Treat the failure case of __rt_mutex_proxy_start() in the same way and let the existing cleanup code handle the eventual handover of the rtmutex gracefully. The regular rt_mutex_proxy_start() gains the rtmutex waiter removal for the failure case, so that the other callsites are still operating correctly.
Add proper comments to the code so all these details are fully documented.
Thanks to Peter for helping with the analysis and writing the really valuable code comments.
--- kernel/futex.c | 28 ++++++++++++++++++---------- kernel/locking/rtmutex.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 15 deletions(-)
kernel/futex.c +18 -10
@@ -2811,35 +2811,39 @@ retry_private:* and BUG when futex_unlock_pi() interleaves with this. * * Therefore acquire wait_lock while holding hb->lock, but drop the -* latter before calling rt_mutex_start_proxy_lock(). This still fully -* serializes against futex_unlock_pi() as that does the exact same -* lock handoff sequence. +* latter before calling __rt_mutex_start_proxy_lock(). This +* interleaves with futex_unlock_pi() -- which does a similar lock +* handoff -- such that the latter can observe the futex_q::pi_state +* before __rt_mutex_start_proxy_lock() is done. */ raw_spin_lock_irq (&q.pi_state->pi_mutex.wait_lock);spin_unlock (q.lock_ptr); +/* +* __rt_mutex_start_proxy_lock() unconditionally enqueues the @rt_waiter +* such that futex_unlock_pi() is guaranteed to observe the waiter when +* it sees the futex_q::pi_state. +*/ ret =__rt_mutex_start_proxy_lock (&q.pi_state->pi_mutex, &rt_waiter, current);raw_spin_unlock_irq (&q.pi_state->pi_mutex.wait_lock);if (ret) {if (ret ==1 ) ret =0 ; - -spin_lock (q.lock_ptr); - goto no_block; + goto cleanup; } -if (unlikely (to))hrtimer_start_expires (&to->timer,HRTIMER_MODE_ABS ); ret =rt_mutex_wait_proxy_lock (&q.pi_state->pi_mutex, to, &rt_waiter); +cleanup:spin_lock (q.lock_ptr);/* -* If we failed to acquire the lock (signal/timeout), we must +* If we failed to acquire the lock (deadlock/signal/timeout), we must * first acquire the hb->lock before removing the lock from the -* rt_mutex waitqueue, such that we can keep the hb and rt_mutex -* wait lists consistent. +* rt_mutex waitqueue, such that we can keep the hb and rt_mutex wait +* lists consistent. * * In particular; it is important that futex_unlock_pi() can not * observe this inconsistency.
@@ -2963,6 +2967,10 @@ retry:* there is no point where we hold neither; and therefore * wake_futex_pi() must observe a state consistent with what we * observed. +* +* In particular; this forces __rt_mutex_start_proxy() to +* complete such that we're guaranteed to observe the +* rt_waiter. Also see the WARN in wake_futex_pi(). */ raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (&hb->lock);
kernel/locking/rtmutex.c +32 -5
@@ -1726,12 +1726,33 @@ void rt_mutex_proxy_unlock(struct rt_mutrt_mutex_set_owner (lock,NULL ); } +/** +* __rt_mutex_start_proxy_lock() - Start lock acquisition for another task +* @lock: the rt_mutex to take +* @waiter: the pre-initialized rt_mutex_waiter +* @task: the task to prepare +* +* Starts the rt_mutex acquire; it enqueues the @waiter and does deadlock +* detection. It does not wait, see rt_mutex_wait_proxy_lock() for that. +* +* NOTE: does _NOT_ remove the @waiter on failure; must either call +* rt_mutex_wait_proxy_lock() or rt_mutex_cleanup_proxy_lock() after this. +* +* Returns: +* 0 - task blocked on lock +* 1 - acquired the lock for task, caller should wake it up +* <0 - error +* +* Special API call for PI-futex support. +*/ int __rt_mutex_start_proxy_lock (struct rt_mutex *lock,struct rt_mutex_waiter *waiter,struct task_struct *task) {int ret; +lockdep_assert_held (&lock->wait_lock); +if (try_to_take_rt_mutex (lock, task,NULL ))return 1 ;
@@ -1749,9 +1770,6 @@ int __rt_mutex_start_proxy_lock(struct r ret =0 ; } -if (unlikely (ret)) -remove_waiter (lock, waiter); -debug_rt_mutex_print_deadlock (waiter);return ret;
@@ -1763,12 +1781,18 @@ int __rt_mutex_start_proxy_lock(struct r* @waiter: the pre-initialized rt_mutex_waiter * @task: the task to prepare * +* Starts the rt_mutex acquire; it enqueues the @waiter and does deadlock +* detection. It does not wait, see rt_mutex_wait_proxy_lock() for that. +* +* NOTE: unlike __rt_mutex_start_proxy_lock this _DOES_ remove the @waiter +* on failure. +* * Returns: * 0 - task blocked on lock * 1 - acquired the lock for task, caller should wake it up * <0 - error * -* Special API call for FUTEX_REQUEUE_PI support. +* Special API call for PI-futex support. */ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, struct rt_mutex_waiter *waiter,
@@ -1778,6 +1802,8 @@ int rt_mutex_start_proxy_lock(struct rt_raw_spin_lock_irq (&lock->wait_lock); ret =__rt_mutex_start_proxy_lock (lock, waiter, task); +if (unlikely (ret)) +remove_waiter (lock, waiter);raw_spin_unlock_irq (&lock->wait_lock);return ret;
@@ -1845,7 +1871,8 @@ int rt_mutex_wait_proxy_lock(struct rt_m* @lock: the rt_mutex we were woken on * @waiter: the pre-initialized rt_mutex_waiter * -* Attempt to clean up after a failed rt_mutex_wait_proxy_lock(). +* Attempt to clean up after a failed __rt_mutex_start_proxy_lock() or +* rt_mutex_wait_proxy_lock(). * * Unless we acquired the lock; we're still enqueued on the wait-list and can * in fact still be granted ownership until we're removed. Therefore we can
Greg Kroah-Hartman
maintainerPATCH 195/205 cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
commit b284909abad48b07d3071a9fc9b5692b3e64914b upstream.
With the following commit:
73d5e2b47264 ("cpu/hotplug: detect SMT disabled by BIOS")
... the hotplug code attempted to detect when SMT was disabled by BIOS, in which case it reported SMT as permanently disabled. However, that code broke a virt hotplug scenario, where the guest is booted with only primary CPU threads, and a sibling is brought online later.
The problem is that there doesn't seem to be a way to reliably distinguish between the HW "SMT disabled by BIOS" case and the virt "sibling not yet brought online" case. So the above-mentioned commit was a bit misguided, as it permanently disabled SMT for both cases, preventing future virt sibling hotplugs.
Going back and reviewing the original problems which were attempted to be solved by that commit, when SMT was disabled in BIOS:
1) /sys/devices/system/cpu/smt/control showed "on" instead of "notsupported"; and
2) vmx_vm_init() was incorrectly showing the L1TF_MSG_SMT warning.
I'd propose that we instead consider #1 above to not actually be a problem. Because, at least in the virt case, it's possible that SMT wasn't disabled by BIOS and a sibling thread could be brought online later. So it makes sense to just always default the smt control to "on" to allow for that possibility (assuming cpuid indicates that the CPU supports SMT).
The real problem is #2, which has a simple fix: change vmx_vm_init() to query the actual current SMT state -- i.e., whether any siblings are currently online -- instead of looking at the SMT "control" sysfs value.
So fix it by:
a) reverting the original "fix" and its followup fix:
73d5e2b47264 ("cpu/hotplug: detect SMT disabled by BIOS") bc2d8d262cba ("cpu/hotplug: Fix SMT supported evaluation")
and
b) changing vmx_vm_init() to query the actual current SMT state -- instead of the sysfs control value -- to determine whether the L1TF warning is needed. This also requires the 'sched_smt_present' variable to exported, instead of 'cpu_smt_control'.
--- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kvm/vmx.c | 3 ++- include/linux/cpu.h | 2 -- kernel/cpu.c | 33 ++++----------------------------- kernel/sched/fair.c | 1 + kernel/smp.c | 2 -- 6 files changed, 8 insertions(+), 35 deletions(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -68,7 +68,7 @@ void __init check_bugs(void)* identify_boot_cpu() initialized SMT support information, let the * core code know. */ -cpu_smt_check_topology_early (); +cpu_smt_check_topology ();if (!IS_ENABLED (CONFIG_SMP )) {pr_info ("CPU: " );
arch/x86/kvm/vmx.c +2 -1
@@ -27,6 +27,7 @@#include <linux/mm.h> #include <linux/highmem.h> #include <linux/sched.h> +#include <linux/sched/smt.h> #include <linux/moduleparam.h> #include <linux/mod_devicetable.h> #include <linux/trace_events.h>
@@ -10120,7 +10121,7 @@ static int vmx_vm_init(struct kvm *kvm)* Warn upon starting the first VM in a potentially * insecure environment. */ -if (cpu_smt_control ==CPU_SMT_ENABLED ) +if (sched_smt_active ())pr_warn_once (L1TF_MSG_SMT );if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_NEVER )pr_warn_once (L1TF_MSG_L1D );
include/linux/cpu.h +0 -2
@@ -188,12 +188,10 @@ enum cpuhp_smt_control {#if defined(CONFIG_SMP ) && defined(CONFIG_HOTPLUG_SMT )extern enum cpuhp_smt_control cpu_smt_control;extern void cpu_smt_disable (bool force); -extern void cpu_smt_check_topology_early (void );extern void cpu_smt_check_topology (void );#else # define cpu_smt_control (CPU_SMT_ENABLED)static inline void cpu_smt_disable (bool force) { } -static inline void cpu_smt_check_topology_early (void ) { }static inline void cpu_smt_check_topology (void ) { }#endif
kernel/cpu.c +4 -29
@@ -356,9 +356,6 @@ void __weak arch_smt_update(void) { }#ifdef CONFIG_HOTPLUG_SMT enum cpuhp_smt_control cpu_smt_control__read_mostly =CPU_SMT_ENABLED ; -EXPORT_SYMBOL_GPL (cpu_smt_control); - -static bool cpu_smt_available__read_mostly ;void __init cpu_smt_disable (bool force) {
@@ -376,25 +373,11 @@ void __init cpu_smt_disable(bool force)/* * The decision whether SMT is supported can only be done after the full -* CPU identification. Called from architecture code before non boot CPUs -* are brought up. -*/ -void __init cpu_smt_check_topology_early (void ) -{ -if (!topology_smt_supported ()) - cpu_smt_control =CPU_SMT_NOT_SUPPORTED ; -} - -/* -* If SMT was disabled by BIOS, detect it here, after the CPUs have been -* brought online. This ensures the smt/l1tf sysfs entries are consistent -* with reality. cpu_smt_available is set to true during the bringup of non -* boot CPUs when a SMT sibling is detected. Note, this may overwrite -* cpu_smt_control's previous setting. +* CPU identification. Called from architecture code. */ void __init cpu_smt_check_topology (void ) { -if (!cpu_smt_available) +if (!topology_smt_supported ()) cpu_smt_control =CPU_SMT_NOT_SUPPORTED ; }
@@ -407,18 +390,10 @@ early_param("nosmt", smt_cmdline_disablestatic inline bool cpu_smt_allowed (unsigned int cpu) { -if (topology_is_primary_thread (cpu)) +if (cpu_smt_control ==CPU_SMT_ENABLED )return true; -/* -* If the CPU is not a 'primary' thread and the booted_once bit is -* set then the processor has SMT support. Store this information -* for the late check of SMT support in cpu_smt_check_topology(). -*/ -if (per_cpu (cpuhp_state, cpu).booted_once) - cpu_smt_available = true; - -if (cpu_smt_control ==CPU_SMT_ENABLED ) +if (topology_is_primary_thread (cpu))return true;/*
kernel/sched/fair.c +1 -0
@@ -5651,6 +5651,7 @@ find_idlest_cpu(struct sched_group *grou#ifdef CONFIG_SCHED_SMT DEFINE_STATIC_KEY_FALSE (sched_smt_present); +EXPORT_SYMBOL_GPL (sched_smt_present);static inline void set_idle_cores (int cpu,int val) {
kernel/smp.c +0 -2
@@ -584,8 +584,6 @@ void __init smp_init(void) num_nodes, (num_nodes >1 ?"s" :"" ), num_cpus, (num_cpus > 1 ? "s" : "")); -/* Final decision about SMT support */ -cpu_smt_check_topology ();/* Any cleanup work */ smp_cpus_done (setup_max_cpus); }
Greg Kroah-Hartman
maintainerPATCH 1/205 drm/bufs: Fix Spectre v1 vulnerability
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a37805098900a6e73a55b3a43b7d3bcd987bb3f4 ]
idx can be indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
This issue was detected with the help of Smatch:
drivers/gpu/drm/drm_bufs.c:1420 drm_legacy_freebufs() warn: potential spectre issue 'dma->buflist' [r] (local cap)
Fix this by sanitizing idx before using it to index dma->buflist
Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1].
[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2
--- drivers/gpu/drm/drm_bufs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_bufs.c +3 -0
@@ -36,6 +36,8 @@#include <drm/drmP.h> #include "drm_legacy.h" +#include <linux/nospec.h> +static struct drm_map_list *drm_find_matching_map (struct drm_device *dev,struct drm_local_map *map) {
@@ -1417,6 +1419,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, idx, dma->buf_count - 1);return -EINVAL ; } + idx =array_index_nospec (idx, dma->buf_count); buf = dma->buflist[idx];if (buf->file_priv != file_priv) { DRM_ERROR("Process %d freeing buffer not owned\n",
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 10/205 scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ]
After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to re-establish the login. An nlp_type check in the LOGO completion handler failed to restart discovery for NVME targets. Revised the nlp_type check for NVME as well as SCSI.
While reviewing the LOGO handling a few other issues were seen and were addressed:
- Better lock synchronization around ndlp data types
- When the ABTS times out, unregister the RPI before sending the LOGO so that all local exchange contexts are cleared and nothing received while awaiting LOGO/PLOGI handling will be accepted.
- LOGO handling optimized to:
Wait only R_A_TOV for a response.
It doesn't need to be retried on timeout. If there wasn't a
response, a PLOGI will be sent, thus an implicit logout applies as well when the other port sees it.
If there is a response, any kind of response is considered "good"
and the XRI quarantined for a exchange qualifier window.
- PLOGI is issued as soon a LOGO state is resolved.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +21 -28
@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, icmd->ulpCommand =CMD_ELS_REQUEST64_CR ;if (elscmd ==ELS_CMD_FLOGI ) icmd->ulpTimeout =FF_DEF_RATOV *2 ; +else if (elscmd ==ELS_CMD_LOGO ) + icmd->ulpTimeout = phba->fc_ratov;else icmd->ulpTimeout = phba->fc_ratov *2 ; }else {
@@ -2674,16 +2676,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* The LOGO will not be retried on failure. A LOGO was +* issued to the remote rport and a ACC or RJT or no Answer are +* all acceptable. Note the failure and move forward with +* discovery. The PLOGI will retry. +*/ if (irsp->ulpStatus) { -/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { -/* ELS command is being retried */ - skip_recovery =1 ; - goto out; - }/* LOGO failed */ lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"2756 LOGO failure DID:%06X Status:x%x/x%x\n" , +"2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n" , ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ]);/* Do not call DSM for lpfc_els_abort'ed ELS cmds */
@@ -2729,7 +2730,8 @@ out:* For any other port type, the rpi is unregistered as an implicit * LOGO. */ -if ((ndlp->nlp_type &NLP_FCP_TARGET ) && (skip_recovery ==0 )) { +if (ndlp->nlp_type & (NLP_FCP_TARGET |NLP_NVME_TARGET ) && + skip_recovery ==0 ) {lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;
@@ -2762,6 +2764,8 @@ out:* will be stored into the context1 field of the IOCB for the completion * callback function to the LOGO ELS command. * +* Callers of this routine are expected to unregister the RPI first +* * Return code * 0 - successfully issued logo * 1 - failed to issue logo
@@ -2803,22 +2807,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue LOGO: did:x%x" , ndlp->nlp_DID, 0, 0); -/* -* If we are issuing a LOGO, we may try to recover the remote NPort -* by issuing a PLOGI later. Even though we issue ELS cmds by the -* VPI, if we have a valid RPI, and that RPI gets unreg'ed while -* that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI -* for that ELS cmd. To avoid this situation, lets get rid of the -* RPI right now, before any ELS cmds are sent. -*/ -spin_lock_irq (shost->host_lock); - ndlp->nlp_flag |=NLP_ISSUE_LOGO ; -spin_unlock_irq (shost->host_lock); -if (lpfc_unreg_rpi (vport, ndlp)) { -lpfc_els_free_iocb (phba, elsiocb); -return 0 ; - } - phba->fc_stat.elsXmitLOGO++; elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;spin_lock_irq (shost->host_lock);
@@ -2826,7 +2814,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (shost->host_lock); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;
@@ -2834,6 +2821,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_els_free_iocb (phba, elsiocb);return 1 ; } + +spin_lock_irq (shost->host_lock); + ndlp->nlp_prev_state = ndlp->nlp_state; +spin_unlock_irq (shost->host_lock); +lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; }
@@ -9483,7 +9475,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, "rport in state 0x%x\n", ndlp->nlp_state);return ; } - lpfc_printf_log(phba, KERN_INFO, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, + LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, "3094 Start rport recovery on shost id 0x%x " "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " "flags 0x%x\n",
@@ -9496,8 +9489,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,*/ spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE ; + ndlp->nlp_flag |=NLP_ISSUE_LOGO ;spin_unlock_irqrestore (shost->host_lock, flags); -lpfc_issue_els_logo (vport, ndlp,0 ); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE ); +lpfc_unreg_rpi (vport, ndlp); }
drivers/scsi/lpfc/lpfc_nportdisc.c +5 -0
@@ -801,7 +801,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if (!(ndlp->nlp_flag &NLP_RPI_REGISTERED )) { +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);return 0 ; }
@@ -816,7 +818,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)return 1 ; } } + +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);lpfc_unreg_rpi (vport, ndlp);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 11/205 ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 82c08c3e7f171aa7f579b231d0abbc1d62e91974 ]
In case panic() and panic() called at the same time on different CPUS. For example:
CPU 0:
panic()
__crash_kexec
machine_crash_shutdown
crash_smp_send_stop
machine_kexec
BUG_ON(num_online_cpus() > 1);CPU 1:
panic()
local_irq_disable
panic_smp_self_stop
If CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop(), kdump fails. CPU1 can't receive the ipi irq, CPU1 will be always online. To fix this problem, this patch split out the panic_smp_self_stop() and add set_cpu_online(smp_processor_id(), false).
--- arch/arm/kernel/smp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm/kernel/smp.c +15 -0
@@ -691,6 +691,21 @@ void smp_send_stop(void)pr_warn ("SMP: failed to stop secondary CPUs\n" ); } +/* In case panic() and panic() called at the same time on CPU1 and CPU2, +* and CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop() +* CPU1 can't receive the ipi irqs from CPU2, CPU1 will be always online, +* kdump fails. So split out the panic_smp_self_stop() and add +* set_cpu_online(smp_processor_id(), false). +*/ +void panic_smp_self_stop (void ) +{ +pr_debug ("CPU %u will stop doing anything useful since another CPU has paniced\n" , +smp_processor_id ()); +set_cpu_online (smp_processor_id (), false); +while (1 ) +cpu_relax (); +} +/* * not supported here */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 12/205 clk: boston: fix possible memory leak in clk_boston_setup()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ]
Smatch report warnings:drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell'
'onecell' is malloced in clk_boston_setup(), but not be freed before leaving from the error handling cases.
--- drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clk/imgtec/clk-boston.c +8 -3
@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) hw =clk_hw_register_fixed_rate (NULL ,"input" ,NULL ,0 , in_freq);if (IS_ERR (hw)) {pr_err ("failed to register input clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_INPUT ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"sys" ,"input" ,0 , sys_freq);if (IS_ERR (hw)) {pr_err ("failed to register sys clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_SYS ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"cpu" ,"input" ,0 , cpu_freq);if (IS_ERR (hw)) {pr_err ("failed to register cpu clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_CPU ] = hw; err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, onecell);if (err)pr_err ("failed to add DT provider: %d\n" , err); + +return ; + +error: +kfree (onecell); }/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 13/205 dlm: Dont swamp the CPU with callbacks queued during recovery
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]
Before this patch, recovery would cause all callbacks to be delayed, put on a queue, and afterward they were all queued to the callback work queue. This patch does the same thing, but occasionally takes a break after 25 of them so it won't swamp the CPU at the expense of other RT processes like corosync.
--- fs/dlm/ast.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/dlm/ast.c +10 -0
@@ -290,6 +290,8 @@ void dlm_callback_suspend(struct dlm_ls *ls)flush_workqueue (ls->ls_callback_wq); } +#define MAX_CB_QUEUE 25 +void dlm_callback_resume (struct dlm_ls *ls) {struct dlm_lkb *lkb, *safe;
@@ -300,15 +302,23 @@ void dlm_callback_resume(struct dlm_ls *ls)if (!ls->ls_callback_wq)return ; +more:mutex_lock (&ls->ls_cb_mutex);list_for_each_entry_safe (lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {list_del_init (&lkb->lkb_cb_list);queue_work (ls->ls_callback_wq, &lkb->lkb_cb_work); count++; +if (count ==MAX_CB_QUEUE ) +break ; }mutex_unlock (&ls->ls_cb_mutex);if (count)log_rinfo (ls,"dlm_callback_resume %d" , count); +if (count ==MAX_CB_QUEUE ) { + count =0 ; +cond_resched (); + goto more; + } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 14/205 x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ]
In the expression "word1 << 16", word1 starts as u16, but is promoted to a signed int, then sign-extended to resource_size_t, which is probably not what was intended. Cast to resource_size_t to avoid the sign extension.
This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI:
Fix Broadcom CNB20LE unintended sign extension") back in 2014.
Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension")
--- arch/x86/pci/broadcom_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/broadcom_bus.c +2 -2
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) word1 =read_pci_config_16 (bus, slot, func,0xc0 ); word2 =read_pci_config_16 (bus, slot, func,0xc2 );if (word1 != word2) { - res.start = (word1 <<16 ) |0x0000 ; - res.end = (word2 <<16 ) |0xffff ; + res.start = ((resource_size_t ) word1 <<16 ) |0x0000 ; + res.end = ((resource_size_t ) word2 <<16 ) |0xffff ; res.flags =IORESOURCE_MEM ;update_res (info, res.start, res.end, res.flags,0 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 16/205 crypto: aes_ti - disable interrupts while accessing S-box
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0a6a40c2a8c184a2fb467efacfb1cd338d719e0b ]
In the "aes-fixed-time" AES implementation, disable interrupts while accessing the S-box, in order to make cache-timing attacks more difficult. Previously it was possible for the CPU to be interrupted while the S-box was loaded into L1 cache, potentially evicting the cachelines and causing later table lookups to be time-variant.
In tests I did on x86 and ARM, this doesn't affect performance significantly. Responsiveness is potentially a concern, but interrupts are only disabled for a single AES block.
Note that even after this change, the implementation still isn't necessarily guaranteed to be constant-time; see
https://cr.yp.to/antiforgery/cachetiming-20050414.pdf for a discussion of the many difficulties involved in writing truly constant-time AES software. But it's valuable to make such attacks more difficult.
--- crypto/Kconfig | 3 ++- crypto/aes_ti.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
crypto/Kconfig +2 -1
@@ -930,7 +930,8 @@ config CRYPTO_AES_TI 8 for decryption), this implementation only uses just two S-boxes of 256 bytes each, and attempts to eliminate data dependent latencies by prefetching the entire table into the cache at the start of each - block. + block. Interrupts are also disabled to avoid races where cachelines + are evicted when the CPU is interrupted to do something else. config CRYPTO_AES_586 tristate "AES cipher algorithms (i586)"
crypto/aes_ti.c +18 -0
@@ -269,6 +269,7 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_enc +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_enc[0 ] ^get_unaligned_le32 (in);
@@ -276,6 +277,12 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_enc[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_enc[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_sbox[0 ] ^ __aesti_sbox[128 ]; st0[1 ] ^= __aesti_sbox[32 ] ^ __aesti_sbox[160 ]; st0[2 ] ^= __aesti_sbox[64 ] ^ __aesti_sbox[192 ];
@@ -300,6 +307,8 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static void aesti_decrypt (struct crypto_tfm *tfm,u8 *out,const u8 *in)
@@ -308,6 +317,7 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_dec +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_dec[0 ] ^get_unaligned_le32 (in);
@@ -315,6 +325,12 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_dec[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_dec[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_inv_sbox[0 ] ^ __aesti_inv_sbox[128 ]; st0[1 ] ^= __aesti_inv_sbox[32 ] ^ __aesti_inv_sbox[160 ]; st0[2 ] ^= __aesti_inv_sbox[64 ] ^ __aesti_inv_sbox[192 ];
@@ -339,6 +355,8 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (inv_subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (inv_subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (inv_subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static struct crypto_alg aes_alg = {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 2/205 staging: iio: adc: ad7280a: handle error from __ad7280_read32()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0559ef7fde67bc6c83c6eb6329dbd6649528263e ]
Inside __ad7280_read32(), the spi_sync_transfer() can fail with negative error code. This change will ensure that this error is being passed up in the call stack, so it can be handled.
--- drivers/staging/iio/adc/ad7280a.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/staging/iio/adc/ad7280a.c +13 -4
@@ -256,7 +256,9 @@ static int ad7280_read(struct ad7280_state *st, unsigned int devaddr,if (ret)return ret; -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -294,7 +296,9 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,ad7280_delay (st); -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -327,7 +331,9 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,ad7280_delay (st);for (i =0 ; i < cnt; i++) { -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -370,7 +376,10 @@ static int ad7280_chain_setup(struct ad7280_state *st)return ret;for (n =0 ; n <=AD7280A_MAX_CHAIN ; n++) { -__ad7280_read32 (st, &val); + ret =__ad7280_read32 (st, &val); +if (ret) +return ret; +if (val ==0 )return n -1 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 3/205 drm/vgem: Fix vgem_init to get drm device available.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ]
Modify vgem_init to take platform dev as parent in drm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.
v2: rebase, address checkpatch typo and line over 80 characters
--- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +8 -8
@@ -472,31 +472,31 @@ static int __init vgem_init(void)if (!vgem_device)return -ENOMEM ; - ret =drm_dev_init (&vgem_device->drm, &vgem_driver,NULL ); -if (ret) - goto out_free; - vgem_device->platform =platform_device_register_simple ("vgem" ,-1 ,NULL ,0 );if (IS_ERR (vgem_device->platform)) { ret =PTR_ERR (vgem_device->platform); - goto out_fini; + goto out_free; }dma_coerce_mask_and_coherent (&vgem_device->platform->dev,DMA_BIT_MASK (64 )); + ret =drm_dev_init (&vgem_device->drm, &vgem_driver, + &vgem_device->platform->dev); +if (ret) + goto out_unregister;/* Final step: expose the device/driver to userspace */ ret =drm_dev_register (&vgem_device->drm,0 );if (ret) - goto out_unregister; + goto out_fini;return 0 ; -out_unregister: -platform_device_unregister (vgem_device->platform); out_fini:drm_dev_fini (&vgem_device->drm); +out_unregister: +platform_device_unregister (vgem_device->platform); out_free:kfree (vgem_device);return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 4/205 pinctrl: bcm2835: Use raw spinlock for RT compatibility
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3c7b30f704b6f5e53eed6bf89cf2c8d1b38b02c0 ]
The BCM2835 pinctrl driver acquires a spinlock in its ->irq_enable, ->irq_disable and ->irq_set_type callbacks. Spinlocks become sleeping locks with CONFIG_PREEMPT_RT_FULL=y, therefore invocation of one of the callbacks in atomic context may cause a hard lockup if at least two GPIO pins in the same bank are used as interrupts. The issue doesn't occur with just a single interrupt pin per bank because the lock is never contended. I'm experiencing such lockups with GPIO 8 and 28 used as level-triggered interrupts, i.e. with ->irq_disable being invoked on reception of every IRQ.
The critical section protected by the spinlock is very small (one bitop and one RMW of an MMIO register), hence converting to a raw spinlock seems a better trade-off than converting the driver to threaded IRQ handling (which would increase latency to handle an interrupt).
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +8 -8
@@ -92,7 +92,7 @@ struct bcm2835_pinctrl {struct gpio_chip gpio_chip;struct pinctrl_gpio_range gpio_range; -spinlock_t irq_lock[BCM2835_NUM_BANKS ]; +raw_spinlock_t irq_lock[BCM2835_NUM_BANKS ]; };/* pins are just named GPIO0..GPIO53 */
@@ -471,10 +471,10 @@ static void bcm2835_gpio_irq_enable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);set_bit (offset, &pc->enabled_irq_map[bank]);bcm2835_gpio_irq_config (pc, gpio, true); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); }static void bcm2835_gpio_irq_disable (struct irq_data *data)
@@ -486,12 +486,12 @@ static void bcm2835_gpio_irq_disable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);bcm2835_gpio_irq_config (pc, gpio, false);/* Clear events that were latched prior to clearing event sources */ bcm2835_gpio_set_bit (pc,GPEDS0 , gpio);clear_bit (offset, &pc->enabled_irq_map[bank]); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); } static int __bcm2835_gpio_irq_set_type_disabled(struct bcm2835_pinctrl *pc,
@@ -594,7 +594,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)unsigned long flags;int ret; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);if (test_bit (offset, &pc->enabled_irq_map[bank])) ret =__bcm2835_gpio_irq_set_type_enabled (pc, gpio, type);
@@ -606,7 +606,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)else irq_set_handler_locked (data, handle_level_irq); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags);return ret; }
@@ -1021,7 +1021,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)for_each_set_bit (offset, &events,32 )bcm2835_gpio_wr (pc,GPEDS0 + i *4 ,BIT (offset)); -spin_lock_init (&pc->irq_lock[i]); +raw_spin_lock_init (&pc->irq_lock[i]); } err =gpiochip_add_data (&pc->gpio_chip, pc);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 5/205 ASoC: Intel: mrfld: fix uninitialized variable access
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1539c7f23f256120f89f8b9ec53160790bce9ed2 ]
Randconfig testing revealed a very old bug, with gcc-8:
sound/soc/intel/atom/sst/sst_loader.c: In function 'sst_load_fw':sound/soc/intel/atom/sst/sst_loader.c:357:5: error: 'fw' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (fw == NULL) {
^sound/soc/intel/atom/sst/sst_loader.c:354:25: note: 'fw' was declared here
const struct firmware *fw;
We must check the return code of request_firmware() before we look at the pointer result that may be uninitialized when the function fails.
--- sound/soc/intel/atom/sst/sst_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/atom/sst/sst_loader.c +4 -4
@@ -354,14 +354,14 @@ static int sst_request_fw(struct intel_sst_drv *sst)const struct firmware *fw; retval =request_firmware (&fw, sst->firmware_name, sst->dev); -if (fw ==NULL ) { -dev_err (sst->dev,"fw is returning as null\n" ); -return -EINVAL ; - }if (retval) {dev_err (sst->dev,"request fw failed %d\n" , retval);return retval; } +if (fw ==NULL ) { +dev_err (sst->dev,"fw is returning as null\n" ); +return -EINVAL ; + }mutex_lock (&sst->sst_lock); retval =sst_cache_and_parse_fw (sst, fw);mutex_unlock (&sst->sst_lock);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 7/205 ath9k: dynack: use authentication messages for late ack
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link
--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/dynack.c +2 -1
@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 9/205 scsi: mpt3sas: Call sas_remove_host before removing the target devices
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ]
Call sas_remove_host() before removing the target devices in the driver's .remove() callback function(i.e. during driver unload time). So that driver can provide a way to allow SYNC CACHE, START STOP unit commands etc. (which are issued from SML) to the target drives during driver unload time.
Once sas_remove_host() is called before removing the target drives then driver can just clean up the resources allocated for target devices and no need to call sas_port_delete_phy(), sas_port_delete() API's as these API's internally called from sas_remove_host().
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -8260,6 +8260,7 @@ static void scsih_remove(struct pci_dev *pdev)/* release all the volumes */ _scsih_ir_shutdown (ioc); +sas_remove_host (shost);list_for_each_entry_safe (raid_device, next, &ioc->raid_device_list, list) {if (raid_device->starget) {
@@ -8296,7 +8297,6 @@ static void scsih_remove(struct pci_dev *pdev) ioc->sas_hba.num_phys =0 ; } -sas_remove_host (shost);mpt3sas_base_detach (ioc);spin_lock (&gioc_lock);list_del (&ioc->list);
drivers/scsi/mpt3sas/mpt3sas_transport.c +5 -2
@@ -846,10 +846,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, mpt3sas_port->remote_identify.sas_address, mpt3sas_phy->phy_id); mpt3sas_phy->phy_belongs_to_port =0 ; -sas_port_delete_phy (mpt3sas_port->port, mpt3sas_phy->phy); +if (!ioc->remove_host) +sas_port_delete_phy (mpt3sas_port->port, + mpt3sas_phy->phy);list_del (&mpt3sas_phy->port_siblings); } -sas_port_delete (mpt3sas_port->port); +if (!ioc->remove_host) +sas_port_delete (mpt3sas_port->port);kfree (mpt3sas_port); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainercover 4.14.99-stable review
This is the start of the stable review cycle for the 4.14.99 release. There are 205 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 Wed Feb 13 14:17:19 UTC 2019. 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.99-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.99-rc1
Peter Zijlstra <[email protected]>
perf/x86/intel: Delay memory deallocation until x86_pmu_dead_cpu()
Mike Marciniszyn <[email protected]>
IB/hfi1: Add limit test for RC/UC send via loopback
J. Bruce Fields <[email protected]>
nfsd4: catch some false session retries
J. Bruce Fields <[email protected]>
nfsd4: fix cached replies to solo SEQUENCE compounds
Andy Shevchenko <[email protected]>
serial: 8250_pci: Make PCI class test non fatal
Greg Kroah-Hartman <[email protected]>
serial: fix race between flush_to_ldisc and tty_open
Gustavo A. R. Silva <[email protected]>
perf tests evsel-tp-sched: Fix bitwise operator
Mark Rutland <[email protected]>
perf/core: Don't WARN() for impossible ring-buffer sizes
Tony Luck <[email protected]>
x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
Kan Liang <[email protected]>
perf/x86/intel/uncore: Add Node ID mask
Josh Poimboeuf <[email protected]>
cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
Peter Shier <[email protected]>
KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
Jann Horn <[email protected]>
kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
Paolo Bonzini <[email protected]>
KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
James Bottomley <[email protected]>
scsi: aic94xx: fix module loading
Vaibhav Jain <[email protected]>
scsi: cxlflash: Prevent deadlock when adapter probe fails
Johan Hovold <[email protected]>
staging: speakup: fix tty-operation NULL derefs
Paul Elder <[email protected]>
usb: gadget: musb: fix short isoc packets with inventra dma
Gustavo A. R. Silva <[email protected]>
usb: gadget: udc: net2272: Fix bitwise and boolean operations
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Handle 0 xfer length for OUT EP
Bin Liu <[email protected]>
usb: phy: am335x: fix race condition in _probe
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Plug allocation race for devices sharing a DevID
Thomas Gleixner <[email protected]>
futex: Handle early deadlock return correctly
Leonid Iziumtsev <[email protected]>
dmaengine: imx-dma: fix wrong callback invoke
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix abort of transactions
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix interrupt race on RT
Miklos Szeredi <[email protected]>
fuse: handle zero sized retrieve correctly
Miklos Szeredi <[email protected]>
fuse: decrement NR_WRITEBACK_TEMP on the right page
Jann Horn <[email protected]>
fuse: call pipe_buf_release() under pipe lock
Takashi Iwai <[email protected]>
ALSA: hda - Serialize codec registrations
Charles Keepax <[email protected]>
ALSA: compress: Fix stop handling on compressed capture streams
Rundong Ge <[email protected]>
net: dsa: slave: Don't propagate flag changes on down slave interfaces
Cong Wang <[email protected]>
net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames
Florian Fainelli <[email protected]>
net: systemport: Fix WoL with password after deep sleep
Eric Dumazet <[email protected]>
rds: fix refcount bug in rds_sock_addref
Dan Carpenter <[email protected]>
skge: potential memory corruption in skge_get_regs()
Eric Dumazet <[email protected]>
rxrpc: bad unlock balance in rxrpc_recvmsg
Sebastian Andrzej Siewior <[email protected]>
net: dp83640: expire old TX-skb
Govindarajulu Varadarajan <[email protected]>
enic: fix checksum validation for IPv6
Eric Dumazet <[email protected]>
dccp: fool proof ccid_hc_[rt]x_parse_options()
Eduardo Valentin <[email protected]>
thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set
Du Changbin <[email protected]>
scripts/gdb: fix lx-version string output
Oleg Nesterov <[email protected]>
exec: load_script: don't blindly truncate shebang string
Davidlohr Bueso <[email protected]>
fs/epoll: drop ovflist branch prediction
Liu, Chuansheng <[email protected]>
kernel/hung_task.c: force console verbose before panic
Cheng Lin <[email protected]>
proc/sysctl: fix return error for proc_doulongvec_minmax()
Tetsuo Handa <[email protected]>
kernel/hung_task.c: break RCU locks based on jiffies
Benjamin Gordon <[email protected]>
fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
Aditya Pakki <[email protected]>
HID: lenovo: Add checks to fix of_led_classdev_register
Bjorn Andersson <[email protected]>
thermal: generic-adc: Fix adc to temp interpolation
Douglas Anderson <[email protected]>
kdb: Don't back trace on a cpu that didn't round up
Matthias Brugger <[email protected]>
thermal: bcm2835: enable hwmon explicitly
Finn Thain <[email protected]>
block/swim3: Fix -EBUSY error when re-opening device after unmount
Scott Wood <[email protected]>
fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address()
Wenwen Wang <[email protected]>
gdrom: fix a memory leak bug
Jia-Ju Bai <[email protected]>
isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug in HFCPCI_l1hw()
Larry Chen <[email protected]>
ocfs2: improve ocfs2 Makefile
Junxiao Bi <[email protected]>
ocfs2: don't clear bh uptodate for block read
Marc Zyngier <[email protected]>
scripts/decode_stacktrace: only strip base path when a prefix of the path
Ondrej Mosnacek <[email protected]>
cgroup: fix parsing empty mount option string
Sahitya Tummala <[email protected]>
f2fs: fix sbi->extent_list corruption issue
Kangjie Lu <[email protected]>
niu: fix missing checks of niu_pci_eeprom_read
Anton Ivanov <[email protected]>
um: Avoid marking pages with "changed protection"
Ronnie Sahlberg <[email protected]>
cifs: check ntwrk_buf_start for NULL before dereferencing it
Stefan Roese <[email protected]>
MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in hash_set_dma_transfer
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in cryp_set_dma_transfer
Michael Ellerman <[email protected]>
seq_buf: Make seq_buf_puts() null-terminate the buffer
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of bus read in lm80 probe
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of the status of SMBus read
Chris Perl <[email protected]>
NFS: nfs_compare_mount_options always compare auth flavors.
Jim Mattson <[email protected]>
kvm: Change offset in kvm_write_guest_offset_cached to unsigned
Mahesh Salgaonkar <[email protected]>
powerpc/fadump: Do not allow hot-remove memory from fadump reserved area.
Vitaly Kuznetsov <[email protected]>
KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
Christophe Leroy <[email protected]>
powerpc/mm: Fix reporting of kernel execute faults on the 8xx
Noralf Trønnes <[email protected]>
fbdev: fbcon: Fix unregister crash when more than one framebuffer
Lenny Szubowicz <[email protected]>
ACPI/APEI: Clear GHES block_status before panic()
Kai-Heng Feng <[email protected]>
igb: Fix an issue that PME is not enabled during runtime suspend
Konstantin Khorenko <[email protected]>
i40e: define proper net_device::neigh_priv_len
Peter Rosin <[email protected]>
fbdev: fbmem: behave better with small rotated displays and many CPUs
Guoqing Jiang <[email protected]>
md: fix raid10 hang issue caused by barrier
Alexey Khoroshilov <[email protected]>
video: clps711x-fb: release disp device node in probe()
Nathan Chancellor <[email protected]>
drbd: Avoid Clang warning about pointless switch statment
Lars Ellenberg <[email protected]>
drbd: skip spurious timeout (ping-timeo) when failing promote
Lars Ellenberg <[email protected]>
drbd: disconnect, if the wrong UUIDs are attached on a connected peer
Roland Kammerer <[email protected]>
drbd: narrow rcu_read_lock in drbd_sync_handshake
Madhavan Srinivasan <[email protected]>
powerpc/perf: Fix thresholding counter data for unknown type
Jia-Ju Bai <[email protected]>
cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: increase fw status register read timeout
Dave Carroll <[email protected]>
scsi: smartpqi: correct volume status
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: correct host serial num for ssa
Ido Schimmel <[email protected]>
mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG
Johan Hedberg <[email protected]>
Bluetooth: Fix unnecessary error message for HCI request completion
YueHaibing <[email protected]>
xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi
Johannes Berg <[email protected]>
mac80211: fix radiotap vendor presence bitmap handling
Christophe Leroy <[email protected]>
powerpc/uaccess: fix warning/error with access_ok()
Dennis Zhou <[email protected]>
percpu: convert spin_lock_irq to spin_lock_irqsave.
Bin Liu <[email protected]>
usb: musb: dsps: fix otg state machine
Mark Rutland <[email protected]>
arm64: KVM: Skip MMIO insn after emulation
Michael Mueller <[email protected]>
KVM: s390: unregister debug feature on failing arch init
Arnaldo Carvalho de Melo <[email protected]>
perf probe: Fix unchecked usage of strncpy()
Arnaldo Carvalho de Melo <[email protected]>
perf header: Fix unchecked usage of strncpy()
Adrian Hunter <[email protected]>
perf test: Fix perf_event_attr test failure
Beomho Seo <[email protected]>
tty: serial: samsung: Properly set flags in autoCTS mode
Adrian Hunter <[email protected]>
mmc: sdhci-xenon: Fix timeout checks
Adrian Hunter <[email protected]>
mmc: sdhci-of-esdhc: Fix timeout checks
Kai-Heng Feng <[email protected]>
memstick: Prevent memstick host from getting runtime suspended during card detection
Michal Suchanek <[email protected]>
mmc: bcm2835: reset host on timeout
Phil Elwell <[email protected]>
mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
Suraj Jitindar Singh <[email protected]>
KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
Arnd Bergmann <[email protected]>
ARM: mmp: fix timer_init calls
Fabio Estevam <[email protected]>
ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
Arnd Bergmann <[email protected]>
ARM: pxa: avoid section mismatch warning
Stanislav Fomichev <[email protected]>
selftests/bpf: use __bpf_constant_htons in test_prog.c
Joey Zhang <[email protected]>
switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
Jan Kara <[email protected]>
udf: Fix BUG on corrupted inode
Icenowy Zheng <[email protected]>
phy: sun4i-usb: add support for missing USB PHY index
Adamski, Krzysztof (Nokia - PL/Wroclaw) <[email protected]>
i2c-axxia: check for error conditions first
Viresh Kumar <[email protected]>
OPP: Use opp_table->regulators to verify no regulator case
Yangtao Li <[email protected]>
cpuidle: big.LITTLE: fix refcount leak
Anson Huang <[email protected]>
clk: imx6sl: ensure MMDC CH0 handshake is bypassed
Sergei Shtylyov <[email protected]>
sata_rcar: fix deferred probing
Will Deacon <[email protected]>
iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
Vivek Gautam <[email protected]>
iommu/arm-smmu: Add support for qcom,smmu-v2 variant
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Disable CSP for stream OUT ep
Wolfram Sang <[email protected]>
watchdog: renesas_wdt: don't set divider while watchdog is running
Dan Carpenter <[email protected]>
tracing: Have trace_stack nr_entries compare not be so subtle
Linus Walleij <[email protected]>
ARM: dts: Fix up the D-Link DIR-685 MTD partition info
Philipp Zabel <[email protected]>
media: coda: fix H.264 deblocking filter controls
Jiong Wang <[email protected]>
mips: bpf: fix encoding bug for mm_srlv32_op
Russell King - ARM Linux <[email protected]>
ARM: dts: Fix OMAP4430 SDP Ethernet startup
Yu Zhao <[email protected]>
iommu/amd: Fix amd_iommu=force_isolation
Nicholas Mc Guire <[email protected]>
pinctrl: sx150x: handle failure case of devm_kstrdup
Andy Shevchenko <[email protected]>
usb: dwc3: trace: add missing break statement to make compiler happy
Kaike Wan <[email protected]>
IB/hfi1: Unreserve a reserved request when it is completed
Peter Rajnoha <[email protected]>
kobject: return error code if writing /sys/.../uevent fails
Alexander Duyck <[email protected]>
driver core: Move async_synchronize_full call
Chen-Yu Tsai <[email protected]>
clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks
Chunfeng Yun <[email protected]>
usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
Bart Van Assche <[email protected]>
timekeeping: Use proper seqcount initializer
Mathias Nyman <[email protected]>
usb: hub: delay hub autosuspend if USB3 port is still link training
Anurag Kumar Vulisha <[email protected]>
usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
Zoran Markovic <[email protected]>
smack: fix access permissions for keyring
Alexey Khoroshilov <[email protected]>
media: DaVinci-VPBE: fix error handling in vpbe_initialize()
Sebastian Andrzej Siewior <[email protected]>
x86/fpu: Add might_fault() to user_insn()
Lubomir Rintel <[email protected]>
ARM: mmp/mmp2: dt: enable the clock
Lubomir Rintel <[email protected]>
ARM: dts: mmp2: fix TWSI2
Mark Rutland <[email protected]>
arm64: ftrace: don't adjust the LR value
Harald Freudenberger <[email protected]>
s390/zcrypt: improve special ap message cmd handling
Arend van Spriel <[email protected]>
firmware/efi: Add NULL pointer checks in efivars API functions
Wei Wang <[email protected]>
Thermal: do not clear passive state during system sleep
Will Deacon <[email protected]>
arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
Sean Paul <[email protected]>
drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
J. Bruce Fields <[email protected]>
nfsd4: fix crash on writing v4_end_grace before nfsd startup
Yangtao Li <[email protected]>
soc: bcm: brcmstb: Don't leak device tree node reference
Young Xiao <[email protected]>
sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
Will Deacon <[email protected]>
arm64: io: Ensure calls to delay routines are ordered against prior readX()
Simon Horman <[email protected]>
i2c: sh_mobile: add support for r8a77990 (R-Car E3)
Tiezhu Yang <[email protected]>
f2fs: fix wrong return value of f2fs_acl_create
Sheng Yong <[email protected]>
f2fs: fix race between write_checkpoint and write_begin
Jaegeuk Kim <[email protected]>
f2fs: avoid build warn of fall_through
Yunlei He <[email protected]>
f2fs: move dir data flush to write checkpoint process
Michael Straube <[email protected]>
staging: pi433: fix potential null dereference
Andy Shevchenko <[email protected]>
ACPI: SPCR: Consider baud rate 0 as preconfigured state
Hans Verkuil <[email protected]>
media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
Hans de Goede <[email protected]>
iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
Martin Blumenstingl <[email protected]>
iio: adc: meson-saradc: fix internal clock names
Nicholas Mc Guire <[email protected]>
iio: adc: meson-saradc: check for devm_kasprintf failure
Nathan Chancellor <[email protected]>
dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
YueHaibing <[email protected]>
ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
Alexey Khoroshilov <[email protected]>
media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
Yangtao Li <[email protected]>
soc/tegra: Don't leak device tree node reference
Pu Wen <[email protected]>
perf tools: Add Hygon Dhyana support
Sami Tolvanen <[email protected]>
modpost: validate symbol names also in find_elf_symbol
Saeed Mahameed <[email protected]>
net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
Nathan Chancellor <[email protected]>
ARM: OMAP2+: hwmod: Fix some section annotations
Damian Kos <[email protected]>
drm/rockchip: fix for mailbox read size
Ben Dooks <[email protected]>
usbnet: smsc95xx: fix rx packet alignment
Renato Lui Geh <[email protected]>
staging: iio: ad7780: update voltage on read
Brian Norris <[email protected]>
platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
Dexuan Cui <[email protected]>
Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
Andreas Puhm <[email protected]>
fpga: altera-cvp: Fix registration for CvP incapable devices
Matheus Tavares <[email protected]>
staging:iio:ad2s90: Make probe handle spi_setup failure
Paul Burton <[email protected]>
MIPS: Boston: Disable EG20T prefetch
Miroslav Lichvar <[email protected]>
ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
Andy Duan <[email protected]>
serial: fsl_lpuart: clear parity enable bit when disable parity
Boris Brezillon <[email protected]>
drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
Eric Biggers <[email protected]>
crypto: aes_ti - disable interrupts while accessing S-box
Frank Rowand <[email protected]>
powerpc/pseries: add of_node_put() in dlpar_detach_node()
Colin Ian King <[email protected]>
x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
Bob Peterson <[email protected]>
dlm: Don't swamp the CPU with callbacks queued during recovery
Yi Wang <[email protected]>
clk: boston: fix possible memory leak in clk_boston_setup()
Yufen Wang <[email protected]>
ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
James Smart <[email protected]>
scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
Suganath Prabu <[email protected]>
scsi: mpt3sas: Call sas_remove_host before removing the target devices
James Smart <[email protected]>
scsi: lpfc: Correct LCB RJT handling
Lorenzo Bianconi <[email protected]>
ath9k: dynack: use authentication messages for 'late' ack
Steve Longerbeam <[email protected]>
gpu: ipu-v3: image-convert: Prevent race between run and unprepare
Arnd Bergmann <[email protected]>
ASoC: Intel: mrfld: fix uninitialized variable access
Lukas Wunner <[email protected]>
pinctrl: bcm2835: Use raw spinlock for RT compatibility
Deepak Sharma <[email protected]>
drm/vgem: Fix vgem_init to get drm device available.
Slawomir Stepien <[email protected]>
staging: iio: adc: ad7280a: handle error from __ad7280_read32()
Gustavo A. R. Silva <[email protected]>
drm/bufs: Fix Spectre v1 vulnerability
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++-- arch/arm/boot/dts/mmp2.dtsi | 9 +- arch/arm/boot/dts/omap4-sdp.dts | 1 + arch/arm/kernel/smp.c | 15 ++++ arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++--- arch/arm/mach-omap2/omap_hwmod.c | 6 +- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- arch/arm64/include/asm/io.h | 32 +++++-- arch/arm64/kernel/entry-ftrace.S | 1 - arch/mips/boot/dts/img/boston.dts | 6 ++ arch/mips/include/uapi/asm/inst.h | 2 +- arch/mips/ralink/Kconfig | 1 + arch/powerpc/include/asm/fadump.h | 2 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/kernel/fadump.c | 10 ++- arch/powerpc/kvm/powerpc.c | 5 +- arch/powerpc/mm/fault.c | 4 +- arch/powerpc/perf/isa207-common.c | 7 +- arch/powerpc/platforms/pseries/dlpar.c | 2 + arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +- arch/s390/include/uapi/asm/zcrypt.h | 4 +- arch/s390/kvm/kvm-s390.c | 17 +++- arch/um/include/asm/pgtable.h | 9 +- arch/x86/events/intel/core.c | 10 ++- arch/x86/events/intel/uncore_snbep.c | 4 +- arch/x86/include/asm/fpu/internal.h | 3 + arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kvm/svm.c | 7 ++ arch/x86/kvm/vmx.c | 4 +- arch/x86/kvm/x86.c | 7 ++ arch/x86/pci/broadcom_bus.c | 4 +- crypto/Kconfig | 3 +- crypto/aes_ti.c | 18 ++++ drivers/acpi/apei/ghes.c | 2 + drivers/acpi/spcr.c | 11 +++ drivers/ata/sata_rcar.c | 4 +- drivers/base/bus.c | 12 ++- drivers/base/core.c | 8 +- drivers/base/dd.c | 6 +- drivers/base/power/opp/core.c | 11 ++- drivers/block/drbd/drbd_nl.c | 15 ++-- drivers/block/drbd/drbd_receiver.c | 13 +-- drivers/block/sunvdc.c | 5 ++ drivers/block/swim3.c | 6 +- drivers/cdrom/gdrom.c | 1 + drivers/clk/imgtec/clk-boston.c | 11 ++- drivers/clk/imx/clk-imx6sl.c | 6 ++ drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +- drivers/cpuidle/cpuidle-big_little.c | 7 +- drivers/crypto/ux500/cryp/cryp_core.c | 4 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/bcm2835-dma.c | 70 ++++++--------- drivers/dma/imx-dma.c | 8 +- drivers/dma/xilinx/zynqmp_dma.c | 2 +- drivers/firmware/efi/vars.c | 99 +++++++++++++++++----- drivers/fpga/altera-cvp.c | 9 ++ drivers/gpu/drm/drm_atomic_helper.c | 8 +- drivers/gpu/drm/drm_bufs.c | 3 + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 12 +-- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++-- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 ++- drivers/hid/hid-lenovo.c | 10 ++- drivers/hwmon/lm80.c | 26 ++++-- drivers/i2c/busses/i2c-axxia.c | 32 +++---- drivers/i2c/busses/i2c-sh_mobile.c | 1 + drivers/iio/accel/kxcjk-1013.c | 1 + drivers/iio/adc/meson_saradc.c | 14 ++- drivers/infiniband/hw/hfi1/rc.c | 2 + drivers/infiniband/hw/hfi1/ruc.c | 7 +- drivers/infiniband/hw/qib/qib_ruc.c | 7 +- drivers/iommu/amd_iommu.c | 9 +- drivers/iommu/arm-smmu-v3.c | 8 +- drivers/iommu/arm-smmu.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 32 +++++-- drivers/isdn/hisax/hfc_pci.c | 2 + drivers/md/raid10.c | 4 + drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 +- drivers/media/i2c/adv7842.c | 4 +- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- drivers/media/platform/coda/coda-bit.c | 19 ++--- drivers/media/platform/coda/coda-common.c | 15 ++-- drivers/media/platform/coda/coda.h | 6 +- drivers/media/platform/coda/coda_regs.h | 2 +- drivers/media/platform/davinci/vpbe.c | 7 +- .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 ++- drivers/memstick/core/memstick.c | 3 + drivers/mmc/host/bcm2835.c | 12 +++ drivers/mmc/host/sdhci-of-esdhc.c | 16 +++- drivers/mmc/host/sdhci-xenon-phy.c | 10 ++- drivers/mmc/host/sdhci-xenon.c | 10 ++- drivers/net/ethernet/broadcom/bcmsysport.c | 25 +++--- drivers/net/ethernet/broadcom/bcmsysport.h | 2 + drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 + drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 23 +++++ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 27 +----- drivers/net/ethernet/sun/niu.c | 10 ++- drivers/net/phy/dp83640.c | 13 ++- drivers/net/usb/smsc95xx.c | 1 + drivers/net/wireless/ath/ath9k/dynack.c | 3 +- drivers/net/wireless/st/cw1200/scan.c | 13 ++- drivers/pci/switch/switchtec.c | 3 + drivers/phy/allwinner/phy-sun4i-usb.c | 7 ++ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++-- drivers/pinctrl/meson/pinctrl-meson8.c | 3 + drivers/pinctrl/meson/pinctrl-meson8b.c | 13 +-- drivers/pinctrl/pinctrl-sx150x.c | 11 ++- drivers/platform/chrome/cros_ec_proto.c | 18 +++- drivers/ptp/ptp_chardev.c | 5 +- drivers/ptp/ptp_clock.c | 5 +- drivers/s390/crypto/zcrypt_error.h | 2 + drivers/scsi/aic94xx/aic94xx_init.c | 8 +- drivers/scsi/cxlflash/main.c | 2 + drivers/scsi/lpfc/lpfc_els.c | 52 ++++++------ drivers/scsi/lpfc/lpfc_nportdisc.c | 5 ++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- drivers/scsi/smartpqi/smartpqi_init.c | 6 ++ drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- drivers/soc/bcm/brcmstb/common.c | 6 +- drivers/soc/tegra/common.c | 6 +- drivers/staging/iio/adc/ad7280a.c | 17 +++- drivers/staging/iio/adc/ad7780.c | 6 +- drivers/staging/iio/resolver/ad2s90.c | 7 +- drivers/staging/pi433/pi433_if.c | 4 + drivers/staging/speakup/spk_ttyio.c | 6 +- drivers/thermal/broadcom/bcm2835_thermal.c | 11 +++ drivers/thermal/thermal-generic-adc.c | 12 ++- drivers/thermal/thermal_core.c | 12 ++- drivers/thermal/thermal_hwmon.h | 4 +- drivers/tty/serial/8250/8250_pci.c | 9 +- drivers/tty/serial/fsl_lpuart.c | 4 + drivers/tty/serial/samsung.c | 3 + drivers/tty/serial/serial_core.c | 6 ++ drivers/usb/core/hub.c | 10 +++ drivers/usb/dwc3/gadget.c | 16 ++-- drivers/usb/dwc3/trace.h | 2 + drivers/usb/gadget/udc/net2272.c | 2 +- drivers/usb/mtu3/mtu3_core.c | 4 +- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 +- drivers/usb/musb/musb_dsps.c | 9 +- drivers/usb/musb/musb_gadget.c | 13 +-- drivers/usb/musb/musbhsdma.c | 21 ++--- drivers/usb/phy/phy-am335x.c | 5 +- drivers/video/fbdev/clps711x-fb.c | 5 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 8 +- drivers/watchdog/renesas_wdt.c | 9 +- fs/binfmt_script.c | 10 ++- fs/cifs/readdir.c | 9 +- fs/dlm/ast.c | 10 +++ fs/eventpoll.c | 2 +- fs/f2fs/acl.c | 14 +-- fs/f2fs/data.c | 12 ++- fs/f2fs/f2fs.h | 12 ++- fs/f2fs/file.c | 3 + fs/f2fs/shrinker.c | 2 +- fs/fuse/dev.c | 4 +- fs/fuse/file.c | 2 +- fs/nfs/super.c | 3 +- fs/nfsd/nfs4state.c | 57 +++++++++++-- fs/nfsd/nfsctl.c | 2 + fs/nfsd/state.h | 2 + fs/nfsd/xdr4.h | 13 ++- fs/ocfs2/Makefile | 2 +- fs/ocfs2/buffer_head_io.c | 2 - fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlmfs/Makefile | 2 +- fs/proc/base.c | 12 ++- fs/udf/inode.c | 6 ++ include/linux/cpu.h | 2 - include/linux/genl_magic_struct.h | 5 +- include/linux/kvm_host.h | 3 +- include/linux/mlx5/driver.h | 2 +- include/sound/compress_driver.h | 6 +- kernel/cgroup/cgroup.c | 2 +- kernel/cpu.c | 33 +------- kernel/debug/debug_core.c | 4 + kernel/debug/kdb/kdb_bt.c | 11 ++- kernel/debug/kdb/kdb_debugger.c | 7 -- kernel/events/ring_buffer.c | 3 + kernel/futex.c | 28 +++--- kernel/hung_task.c | 20 ++--- kernel/locking/rtmutex.c | 37 ++++++-- kernel/module.c | 6 +- kernel/sched/fair.c | 1 + kernel/smp.c | 2 - kernel/sysctl.c | 2 + kernel/time/timekeeping.c | 4 +- kernel/trace/trace_stack.c | 2 +- lib/seq_buf.c | 6 +- mm/percpu-km.c | 5 +- net/bluetooth/hci_event.c | 6 ++ net/dccp/ccid.h | 4 +- net/dsa/slave.c | 12 ++- net/ipv6/xfrm6_tunnel.c | 3 + net/mac80211/rx.c | 5 +- net/rds/bind.c | 6 +- net/rxrpc/recvmsg.c | 3 +- scripts/decode_stacktrace.sh | 2 +- scripts/gdb/linux/proc.py | 2 +- scripts/mod/modpost.c | 50 +++++------ security/smack/smack_lsm.c | 12 ++- sound/pci/hda/hda_bind.c | 3 +- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_intel.c | 2 + sound/soc/fsl/Kconfig | 2 +- sound/soc/intel/atom/sst/sst_loader.c | 8 +- tools/hv/hv_kvp_daemon.c | 15 +++- tools/perf/arch/x86/util/kvm-stat.c | 2 +- tools/perf/tests/attr.py | 2 +- tools/perf/tests/evsel-tp-sched.c | 2 +- tools/perf/util/header.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/testing/selftests/bpf/test_progs.c | 8 +- virt/kvm/arm/mmio.c | 11 +-- virt/kvm/kvm_main.c | 6 +- 236 files changed, 1378 insertions(+), 656 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 18/205 serial: fsl_lpuart: clear parity enable bit when disable parity
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ]
Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1482,6 +1482,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,else cr1 &= ~UARTCR1_PT ; } + }else { + cr1 &= ~UARTCR1_PE ; }/* ask the core to calculate the divisor */
@@ -1694,6 +1696,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,else ctrl &= ~UARTCTRL_PT ; } + }else { + ctrl &= ~UARTCTRL_PE ; }/* ask the core to calculate the divisor */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 27/205 drm/rockchip: fix for mailbox read size
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ]
Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is used by them, can read only up to 255 bytes at once. Normally, it's not a big issue as DPCD or EDID reads won't (hopefully) exceed that value.
The real issue here is the revocation list read during the HDCP authentication process. (problematic use case:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152)
The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + 4 bytes of an additional info).
In other words - CTSes with HDCP Repeater won't pass without this fix. Oh, and the driver will most likely stop working (best case scenario).
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, }static int cdn_dp_mailbox_read_receive (struct cdn_dp_device *dp, -u8 *buff,u8 buff_size) +u8 *buff,u16 buff_size) {u32 i;int ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 28/205 ARM: OMAP2+: hwmod: Fix some section annotations
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ]
When building the kernel with Clang, the following section mismatch warnings appears:
WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from the function _setup() to the function .init.text:_setup_iclk_autoidle() The function _setup() references
the function __init _setup_iclk_autoidle().
This is often because _setup lacks a __init
annotation or the annotation of _setup_iclk_autoidle is wrong.
WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from the function _setup() to the function .init.text:_setup_reset() The function _setup() references
the function __init _setup_reset().
This is often because _setup lacks a __init
annotation or the annotation of _setup_reset is wrong.
WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from the function _setup() to the function .init.text:_setup_postsetup() The function _setup() references
the function __init _setup_postsetup().
This is often because _setup lacks a __init
annotation or the annotation of _setup_postsetup is wrong.
_setup is used in omap_hwmod_allocate_module, which isn't marked __init and looks like it shouldn't be, meaning to fix these warnings, those functions must be moved out of the init section, which this patch does.
--- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +3 -3
@@ -2497,7 +2497,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)* a stub; implementing this properly requires iclk autoidle usecounting in * the clock code. No return value. */ -static void __init _setup_iclk_autoidle (struct omap_hwmod *oh) +static void _setup_iclk_autoidle (struct omap_hwmod *oh) {struct omap_hwmod_ocp_if *os;
@@ -2528,7 +2528,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)* reset. Returns 0 upon success or a negative error code upon * failure. */ -static int __init _setup_reset (struct omap_hwmod *oh) +static int _setup_reset (struct omap_hwmod *oh) {int r;
@@ -2589,7 +2589,7 @@ static int __init _setup_reset(struct omap_hwmod *oh)* * No return value. */ -static void __init _setup_postsetup (struct omap_hwmod *oh) +static void _setup_postsetup (struct omap_hwmod *oh) {u8 postsetup_state;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 29/205 net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1e86ace4c140fd5a693e266c9b23409358f25381 ]
Currently the cpu affinity hint mask for completion EQs is stored and read from the wrong place, since reading and storing is done from the same index, there is no actual issue with that, but internal irq_info for completion EQs stars at MLX5_EQ_VEC_COMP_BASE offset in irq_info array, this patch changes the code to use the correct offset to store and read the IRQ affinity hint.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++++++++------ include/linux/mlx5/driver.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -1605,7 +1605,7 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq)static int mlx5e_get_cpu (struct mlx5e_priv *priv,int ix) { -return cpumask_first (priv->mdev->priv.irq_info[ix].mask); +return cpumask_first (priv->mdev->priv.irq_info[ix +MLX5_EQ_VEC_COMP_BASE ].mask); } static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,
drivers/net/ethernet/mellanox/mlx5/core/main.c +8 -6
@@ -619,18 +619,19 @@ u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev)static int mlx5_irq_set_affinity_hint (struct mlx5_core_dev *mdev,int i) {struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int vecidx =MLX5_EQ_VEC_COMP_BASE + i; +int irq =pci_irq_vector (mdev->pdev, vecidx); -if (!zalloc_cpumask_var (&priv->irq_info[i].mask,GFP_KERNEL )) { +if (!zalloc_cpumask_var (&priv->irq_info[vecidx].mask,GFP_KERNEL )) {mlx5_core_warn (mdev,"zalloc_cpumask_var failed" );return -ENOMEM ; }cpumask_set_cpu (cpumask_local_spread (i, priv->numa_node), - priv->irq_info[i].mask); + priv->irq_info[vecidx].mask);if (IS_ENABLED (CONFIG_SMP ) && -irq_set_affinity_hint (irq, priv->irq_info[i].mask)) +irq_set_affinity_hint (irq, priv->irq_info[vecidx].mask))mlx5_core_warn (mdev,"irq_set_affinity_hint failed, irq 0x%.4x" , irq);return 0 ;
@@ -638,11 +639,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)static void mlx5_irq_clear_affinity_hint (struct mlx5_core_dev *mdev,int i) { +int vecidx =MLX5_EQ_VEC_COMP_BASE + i;struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int irq =pci_irq_vector (mdev->pdev, vecidx);irq_set_affinity_hint (irq,NULL ); -free_cpumask_var (priv->irq_info[i].mask); +free_cpumask_var (priv->irq_info[vecidx].mask); }static int mlx5_irq_set_affinity_hints (struct mlx5_core_dev *mdev)
include/linux/mlx5/driver.h +1 -1
@@ -1195,7 +1195,7 @@ enum {static inline const struct cpumask *mlx5_get_vector_affinity_hint (struct mlx5_core_dev *dev,int vector) { -return dev->priv.irq_info[vector].mask; +return dev->priv.irq_info[vector +MLX5_EQ_VEC_COMP_BASE ].mask; }#endif /* MLX5_DRIVER_H */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 30/205 modpost: validate symbol names also in find_elf_symbol
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ]
If an ARM mapping symbol shares an address with a valid symbol, find_elf_symbol can currently return the mapping symbol instead, as the symbol is not validated. This can result in confusing warnings:
WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference from the function set_reset_devices() to the variable .init.text:$x.0
This change adds a call to is_valid_name to find_elf_symbol, similarly to how it's already used in find_elf_symbol2.
--- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
scripts/mod/modpost.c +26 -24
@@ -1215,6 +1215,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch,return 1 ; } +static inline int is_arm_mapping_symbol (const char *str) +{ +return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) + && (str[2 ] =='\0' || str[2 ] =='.' ); +} + +/* +* If there's no name there, ignore it; likewise, ignore it if it's +* one of the magic symbols emitted used by current ARM tools. +* +* Otherwise if find_symbols_between() returns those symbols, they'll +* fail the whitelist tests and cause lots of false alarms ... fixable +* only by merging __exit and __init sections into __text, bloating +* the kernel (which is especially evil on embedded platforms). +*/ +static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) +{ +const char *name = elf->strtab + sym->st_name; + +if (!name || !strlen (name)) +return 0 ; +return !is_arm_mapping_symbol (name); +} +/** * Find symbol based on relocation record info. * In some cases the symbol supplied is a valid symbol so
@@ -1240,6 +1264,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,continue ;if (ELF_ST_TYPE (sym->st_info) ==STT_SECTION )continue ; +if (!is_valid_name (elf, sym)) +continue ;if (sym->st_value == addr)return sym;/* Find a symbol nearby - addr are maybe negative */
@@ -1258,30 +1284,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,return NULL ; } -static inline int is_arm_mapping_symbol (const char *str) -{ -return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) - && (str[2 ] =='\0' || str[2 ] =='.' ); -} - -/* -* If there's no name there, ignore it; likewise, ignore it if it's -* one of the magic symbols emitted used by current ARM tools. -* -* Otherwise if find_symbols_between() returns those symbols, they'll -* fail the whitelist tests and cause lots of false alarms ... fixable -* only by merging __exit and __init sections into __text, bloating -* the kernel (which is especially evil on embedded platforms). -*/ -static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) -{ -const char *name = elf->strtab + sym->st_name; - -if (!name || !strlen (name)) -return 0 ; -return !is_arm_mapping_symbol (name); -} -/* * Find symbols before or equal addr and after addr - in the section sec. * If we find two symbols with equal offset prefer one with a valid name.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 32/205 soc/tegra: Dont leak device tree node reference
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it.
--- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/tegra/common.c +5 -1
@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = {bool soc_is_tegra (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (tegra_machine_match, root) !=NULL ; + match =of_match_node (tegra_machine_match, root); +of_node_put (root); + +return match !=NULL ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 33/205 media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ea0f2ba0fa3f91ea1b8d823a54b042026ada6b3 ]
of_parse_phandle() returns the device node with refcount incremented. There are two nodes that are used temporary in mtk_vcodec_init_enc_pm(), but their refcounts are not decremented.
The patch adds one of_node_put() and fixes returning error codes.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +6 -4
@@ -41,25 +41,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) node =of_parse_phandle (dev->of_node,"mediatek,larb" ,0 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenc = &pdev->dev; node =of_parse_phandle (dev->of_node,"mediatek,larb" ,1 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenclt = &pdev->dev;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 35/205 dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aeaebcc17cdf37065d2693865eeb1ff1c7dc5bf3 ]
Clang warns:
drivers/dma/xilinx/zynqmp_dma.c:166:4: warning: attribute 'aligned' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]
}; __aligned(64)
^./include/linux/compiler_types.h:200:38: note: expanded from macro '__aligned'
^
1 warning generated.
As Nick pointed out in the previous version of this patch, the author likely intended for this struct to be 8-byte (64-bit) aligned, not 64-byte, which is the default. Remove the hanging __aligned attribute.
--- drivers/dma/xilinx/zynqmp_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/xilinx/zynqmp_dma.c +1 -1
@@ -159,7 +159,7 @@ struct zynqmp_dma_desc_ll {u32 ctrl;u64 nxtdscraddr;u64 rsvd; -};__aligned(64) +};/** * struct zynqmp_dma_desc_sw - Per Transaction structure
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 19/205 ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]
If a gettime64 call fails, return the error and avoid copying data back to user.
--- drivers/ptp/ptp_chardev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_chardev.c +4 -1
@@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64 (ptp->info, &ts); + err = ptp->info->gettime64 (ptp->info, &ts); +if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++;
@@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)break ; } +out:kfree (sysoff);return err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 38/205 iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7f6232e69539971cf9eaed07a6c14ab4a2361133 ]
Various 2-in-1's use KIOX010A and KIOX020A as HIDs for 2 KXCJ91008 accelerometers. The KIOX010A HID is for the one in the base and the KIOX020A for the accelerometer in the keyboard.
Since userspace does not have a way yet to deal with (or ignore) the accelerometer in the keyboard, this commit just adds the KIOX010A HID for now so that display rotation will work.
Related: https://github.com/hadess/iio-sensor-proxy/issues/166
--- drivers/iio/accel/kxcjk-1013.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
@@ -1393,6 +1393,7 @@ static const struct acpi_device_id kx_acpi_match[] = { {"KXCJ1008", KXCJ91008}, {"KXCJ9000", KXCJ91008}, {"KIOX000A", KXCJ91008}, + {"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */ {"KXTJ1009", KXTJ21009}, {"SMO8500", KXCJ91008}, { },
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 37/205 iio: adc: meson-saradc: fix internal clock names
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ]
Before this patch we are registering the internal clocks (for example on Meson8b, where the SAR ADC IP block implements the divider and gate clocks) with the following names:
- /soc/cbus@c1100000/adc@8680#adc_div
- /soc/cbus@c1100000/adc@8680#adc_en
This is bad because the common clock framework uses the clock to create a directory in <debugfs>/clk. With such name, the directory creation (silently) fails and the debugfs entry ends up being created at the debugfs root.
With this change, the new clock names are:
- c1108680.adc#adc_div
- c1108680.adc#adc_en
This matches the clock naming scheme used in the PWM, Ethernet and MMC drivers. It also fixes the problem with debugfs.
The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson:
Fix mux clock names").
--- drivers/iio/adc/meson_saradc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/meson_saradc.c +4 -4
@@ -583,8 +583,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,struct clk_init_data init;const char *clk_parents[1 ]; - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_div" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
@@ -605,8 +605,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,if (WARN_ON (IS_ERR (priv->adc_div_clk)))return PTR_ERR (priv->adc_div_clk); - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_en" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 40/205 ACPI: SPCR: Consider baud rate 0 as preconfigured state
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b413b1abeb21b4a152c0bf8d1379efa30759b6e3 ]
Since SPCR 1.04 [1] the baud rate of 0 means a preconfigured state of UART. Assume firmware or bootloader configures console correctly.
--- drivers/acpi/spcr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/spcr.c +11 -0
@@ -148,6 +148,13 @@ int __init parse_spcr(bool earlycon) }switch (table->baud_rate) { +case 0 : +/* +* SPCR 1.04 defines 0 as a preconfigured state of UART. +* Assume firmware or bootloader configures console correctly. +*/ + baud_rate =0 ; +break ;case 3 : baud_rate =9600 ;break ;
@@ -196,6 +203,10 @@ int __init parse_spcr(bool earlycon)* UART so don't attempt to change to the baud rate state * in the table because driver cannot calculate the dividers */ + baud_rate =0 ; + } + +if (!baud_rate) {snprintf (opts,sizeof (opts),"%s,%s,0x%llx" , uart, iotype, table->serial_port.address); }else {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 42/205 f2fs: move dir data flush to write checkpoint process
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ]
This patch move dir data flush to write checkpoint process, by doing this, it may reduce some time for dir fsync.
pre:
-f2fs_do_sync_file enter
-file_write_and_wait_range <- flush & wait -write_checkpoint
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
now:
-f2fs_do_sync_file enter
-write_checkpoint
-block_operations <- flush dir & no wait
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
--- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/file.c +3 -0
@@ -205,6 +205,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,trace_f2fs_sync_file_enter (inode); +if (S_ISDIR (inode->i_mode)) + goto go_write; +/* if fdatasync is triggered, let's do in-place-update */ if (datasync ||get_dirty_pages (inode) <=SM_I (sbi)->min_fsync_blocks)set_inode_flag (inode,FI_NEED_IPU );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 43/205 f2fs: avoid build warn of fall_through
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
In file included from fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (set)
^ fs/f2fs/f2fs.h:2390:2: note: here
case FI_DATA_EXIST:
^~~~
Exposed by my use of -Wimplicit-fallthrough
--- fs/f2fs/f2fs.h | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/f2fs.h +1 -0
@@ -2014,6 +2014,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,case FI_INLINE_DENTRY :if (set)return ; +/* fall through */ case FI_DATA_EXIST :case FI_INLINE_DOTS :f2fs_mark_inode_dirty_sync (inode, true);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 45/205 f2fs: fix wrong return value of f2fs_acl_create
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() should return -EIO instead of -ENOMEM, this patch makes it consistent with posix_acl_create() which has been fixed in commit beaf226b863a ("posix_acl: don't ignore return value of posix_acl_create_masq()").
--- fs/f2fs/acl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/acl.c +8 -6
@@ -349,12 +349,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return PTR_ERR (p); clone =f2fs_acl_clone (p,GFP_NOFS ); -if (!clone) - goto no_mem; +if (!clone) { + ret = -ENOMEM ; + goto release_acl; + } ret =f2fs_acl_create_masq (clone, mode);if (ret <0 ) - goto no_mem_clone; + goto release_clone;if (ret ==0 )posix_acl_release (clone);
@@ -368,11 +370,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return 0 ; -no_mem_clone: +release_clone:posix_acl_release (clone); -no_mem: +release_acl:posix_acl_release (p); -return -ENOMEM ; +return ret; } int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 44/205 f2fs: fix race between write_checkpoint and write_begin
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ]
The following race could lead to inconsistent SIT bitmap:
Task A Task B
====== ======f2fs_write_checkpoint
block_operations
f2fs_lock_all
down_write(node_change)
down_write(node_write)
... sync ...
up_write(node_change)
f2fs_file_write_iter
set_inode_flag(FI_NO_PREALLOC)
......
f2fs_write_begin(index=0, has inline data)
prepare_write_begin
__do_map_lock(AIO) => down_read(node_change)
f2fs_convert_inline_page => update SIT
__do_map_lock(AIO) => up_read(node_change) f2fs_flush_sit_entries <= inconsistent SIT finish write checkpoint sudden-power-off
If SPO occurs after checkpoint is finished, SIT bitmap will be set incorrectly.
--- fs/f2fs/data.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +10 -2
@@ -1880,6 +1880,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,bool locked = false;struct extent_info ei = {0 ,0 ,0 };int err =0 ; +int flag;/* * we already allocated all the blocks, so we don't need to get
@@ -1889,9 +1890,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, !is_inode_flag_set(inode, FI_NO_PREALLOC))return 0 ; +/* f2fs_lock_op avoids race between write CP and convert_inline_page */ +if (f2fs_has_inline_data (inode) && pos + len >MAX_INLINE_DATA (inode)) + flag =F2FS_GET_BLOCK_DEFAULT ; +else + flag =F2FS_GET_BLOCK_PRE_AIO ; +if (f2fs_has_inline_data (inode) || (pos &PAGE_MASK ) >=i_size_read (inode)) { -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +__do_map_lock (sbi, flag, true); locked = true; } restart:
@@ -1929,6 +1936,7 @@ restart:f2fs_put_dnode (&dn);__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +WARN_ON (flag !=F2FS_GET_BLOCK_PRE_AIO ); locked = true; goto restart; }
@@ -1942,7 +1950,7 @@ out:f2fs_put_dnode (&dn); unlock_out:if (locked) -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +__do_map_lock (sbi, flag, false);return err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 46/205 i2c: sh_mobile: add support for r8a77990 (R-Car E3)
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ]
Add support for the IIC code for the r8a77990 (R-Car E3).
It is not considered compatible with existing fallback bindings due to the documented absence of automatic transmission registers.
These registers are currently not used by the driver and thus the provides the same behaviour for "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic". The point of declaring incompatibility is to allow for automatic transmission register support to be added to "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -836,6 +836,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {},
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 20/205 MIPS: Boston: Disable EG20T prefetch
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ]
The Intel EG20T Platform Controller Hub used on the MIPS Boston development board supports prefetching memory to optimize DMA transfers. Unfortunately for unknown reasons this doesn't work well with some MIPS CPUs such as the P6600, particularly when using an I/O Coherence Unit (IOCU) to provide cache-coherent DMA. In these systems it is common for DMA data to be lost, resulting in broken access to EG20T devices such as the MMC or SATA controllers.
Support for a DT property to configure the prefetching was added a while back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from device tree if passed") but we never added the DT snippet to make use of it. Add that now in order to disable the prefetching & fix DMA on the affected systems.
Patchwork: https://patchwork.linux-mips.org/patch/21068/
--- arch/mips/boot/dts/img/boston.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -141,6 +141,12 @@ #size-cells = <2>; #interrupt-cells = <1>; + eg20t_phub@2,0,0 { + compatible = "pci8086,8801"; + reg = <0x00020000 0 0 0 0>; + intel,eg20t-prefetch = <0>; + }; + eg20t_mac@2,0,1 { compatible = "pci8086,8802"; reg = <0x00020100 0 0 0 0>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 47/205 arm64: io: Ensure calls to delay routines are ordered against prior readX()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ]
A relatively standard idiom for ensuring that a pair of MMIO writes to a device arrive at that device with a specified minimum delay between them is as follows:
writel_relaxed(42, dev_base + CTL1); readl(dev_base + CTL1); udelay(10); writel_relaxed(42, dev_base + CTL2);
the intention being that the read-back from the device will push the prior write to CTL1, and the udelay will hold up the write to CTL1 until at least 10us have elapsed.
Unfortunately, on arm64 where the underlying delay loop is implemented as a read of the architected counter, the CPU does not guarantee ordering from the readl() to the delay loop and therefore the delay loop could in theory be speculated and not provide the desired interval between the two writes.
Fix this in a similar manner to PowerPC by introducing a dummy control dependency on the output of readX() which, combined with the ISB in the read of the architected counter, guarantees that a subsequent delay loop can not be executed until the readX() has returned its result.
--- arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/arm64/include/asm/io.h +23 -8
@@ -106,7 +106,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb () rmb() +#define __iormb (v) \ +({ \ + unsigned long tmp; \ + \ + rmb(); \ + \ +/* \ +* Create a dummy control dependency from the IO read to any \ +* later instructions. This ensures that a subsequent call to \ +* udelay() will be ordered due to the ISB in get_cycles(). \ +*/ \ + asmvolatile ("eor %0, %1, %1\n" \ +"cbnz %0, ." \ + :"=r" (tmp) :"r" (v) :"memory" ); \ +}) +#define __iowmb () wmb()#define mmiowb () do { } while (0)
@@ -131,10 +146,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)* following Normal memory access. Writes are ordered relative to any prior * Normal memory access. */ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) +#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) +#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) +#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) +#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; })#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); })#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); })
@@ -185,9 +200,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);/* * io{read,write}{16,32,64}be() macros */ -#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) -#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) -#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) +#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) +#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) +#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; })#define iowrite16be (v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })#define iowrite32be (v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 48/205 sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ]
__vdc_tx_trigger should only loop on EAGAIN a finite number of times.
See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail.
--- drivers/block/sunvdc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/sunvdc.c +5 -0
@@ -41,6 +41,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);#define WAITING_FOR_GEN_CMD 0x04#define WAITING_FOR_ANY -1 +#define VDC_MAX_RETRIES 10 +static struct workqueue_struct *sunvdc_wq;struct vdc_req_entry {
@@ -427,6 +429,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) .end_idx = dr->prod, };int err, delay; +int retries =0 ; hdr.seq = dr->snd_nxt; delay =1 ;
@@ -439,6 +442,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)udelay (delay);if ((delay <<=1 ) >128 ) delay =128 ; +if (retries++ >VDC_MAX_RETRIES ) +break ; }while (err == -EAGAIN );if (err == -ENOTCONN )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 21/205 staging:iio:ad2s90: Make probe handle spi_setup failure
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b3a3eafeef769c6982e15f83631dcbf8d1794efb ]
Previously, ad2s90_probe ignored the return code from spi_setup, not handling its possible failure. This patch makes ad2s90_probe check if the code is an error code and, if so, do the following:
- Call dev_err with an appropriate error message.
- Return the spi_setup's error code.
Note: The 'return ret' statement could be out of the 'if' block, but this whole block will be moved up in the function in the patch:
'staging:iio:ad2s90: Move device registration to the end of probe'.
--- drivers/staging/iio/resolver/ad2s90.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s90.c +6 -1
@@ -86,7 +86,12 @@ static int ad2s90_probe(struct spi_device *spi)/* need 600ns between CS and the first falling edge of SCLK */ spi->max_speed_hz =830000 ; spi->mode =SPI_MODE_3 ; -spi_setup (spi); + ret =spi_setup (spi); + +if (ret <0 ) { +dev_err (&spi->dev,"spi_setup failed!\n" ); +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 22/205 fpga: altera-cvp: Fix registration for CvP incapable devices
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 68f60538daa4bc3da5d0764d46f391916fba20fd ]
The probe function needs to verify the CvP enable bit in order to properly determine if FPGA Manager functionality can be safely enabled.
--- drivers/fpga/altera-cvp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/fpga/altera-cvp.c +9 -0
@@ -404,6 +404,7 @@ static int altera_cvp_probe(struct pci_dev *pdev, {struct altera_cvp_conf *conf;u16 cmd, val; +u32 regval;int ret;/*
@@ -417,6 +418,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,return -ENODEV ; } +pci_read_config_dword (pdev,VSE_CVP_STATUS , ®val); +if (!(regval &VSE_CVP_STATUS_CVP_EN )) { +dev_err (&pdev->dev, +"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n" , + regval); +return -ENODEV ; + } + conf =devm_kzalloc (&pdev->dev,sizeof (*conf),GFP_KERNEL );if (!conf)return -ENOMEM ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 23/205 Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ]
The patch fixes:
hv_kvp_daemon.c: In function 'kvp_set_ip_info':
hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes into a destination of size 4096
The "(unsigned int)str_len" is to avoid:
hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/hv/hv_kvp_daemon.c +13 -2
@@ -1172,6 +1172,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)FILE *file;char cmd[PATH_MAX ];char *mac_addr; +int str_len;/* * Set the configuration for the specified interface with
@@ -1295,8 +1296,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)* invoke the external script to do its magic. */ -snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , -"hv_set_ifconfig" , if_file); + str_len =snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , +"hv_set_ifconfig" , if_file); +/* +* This is a little overcautious, but it's necessary to suppress some +* false warnings from gcc 8.0.1. +*/ +if (str_len <=0 || (unsigned int )str_len >=sizeof (cmd)) { +syslog (LOG_ERR ,"Cmd '%s' (len=%d) may be too long" , + cmd, str_len); +return HV_E_FAIL ; + } +if (system (cmd)) {syslog (LOG_ERR ,"Failed to execute cmd '%s'; error: %d %s" , cmd, errno,strerror (errno));
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 24/205 platform/chrome: dont report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6ad16b78a039b45294b1ad5d69c14ac57b2fe706 ]
EC_MKBP_EVENT_SENSOR_FIFO events can be triggered for a variety of reasons, and there are very few cases in which they should be treated as wakeup interrupts (particularly, when a certain MOTIONSENSE_MODULE_FLAG_* is set, but this is not even supported in the mainline cros_ec_sensor driver yet). Most of the time, they are benign sensor readings. In any case, the top-level cros_ec device doesn't know enough to determine that they should wake the system, and so it should not report the event. This would be the job of the cros_ec_sensors driver to parse.
This patch adds checks to cros_ec_get_next_event() such that it doesn't signal 'wakeup' for events of type EC_MKBP_EVENT_SENSOR_FIFO.
This patch is particularly relevant on devices like Scarlet (Rockchip RK3399 tablet, known as Acer Chromebook Tab 10), where the EC firmware reports sensor events much more frequently. This was causing /sys/power/wakeup_count to increase very frequently, often needlessly interrupting our ability to suspend the system.
--- drivers/platform/chrome/cros_ec_proto.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/platform/chrome/cros_ec_proto.c +15 -3
@@ -551,6 +551,7 @@ static int get_keyboard_state_event(struct cros_ec_device *ec_dev)int cros_ec_get_next_event (struct cros_ec_device *ec_dev,bool *wake_event) { +u8 event_type;u32 host_event;int ret;
@@ -570,11 +571,22 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event)return ret;if (wake_event) { + event_type = ec_dev->event_data.event_type; host_event =cros_ec_get_host_event (ec_dev); -/* Consider non-host_event as wake event */ - *wake_event = !host_event || - !!(host_event & ec_dev->host_event_wake_mask); +/* +* Sensor events need to be parsed by the sensor sub-device. +* Defer them, and don't report the wakeup here. +*/ +if (event_type ==EC_MKBP_EVENT_SENSOR_FIFO ) + *wake_event = false; +/* Masked host-events should not count as wake events. */ +else if (host_event && + !(host_event & ec_dev->host_event_wake_mask)) + *wake_event = false; +/* Consider all other events as wake events. */ +else + *wake_event = true; }return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 26/205 usbnet: smsc95xx: fix rx packet alignment
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ]
The smsc95xx driver already takes into account the NET_IP_ALIGN parameter when setting up the receive packet data, which means we do not need to worry about aligning the packets in the usbnet driver.
Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now passed to the ip_rcv() routine with the start on an aligned address.
Tested on Raspberry Pi B3.
--- drivers/net/usb/smsc95xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/smsc95xx.c +1 -0
@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->features |=NETIF_F_RXCSUM ; dev->net->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM ; +set_bit (EVENT_NO_IP_ALIGN , &dev->flags);smsc95xx_init_mac_address (dev);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 25/205 staging: iio: ad7780: update voltage on read
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 336650c785b62c3bea7c8cf6061c933a90241f67 ]
The ad7780 driver previously did not read the correct device output, as it read an outdated value set at initialization. It now updates its voltage on read.
--- drivers/staging/iio/adc/ad7780.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/iio/adc/ad7780.c +5 -1
@@ -87,12 +87,16 @@ static int ad7780_read_raw(struct iio_dev *indio_dev, long m) {struct ad7780_state *st =iio_priv (indio_dev); +int voltage_uv;switch (m) {case IIO_CHAN_INFO_RAW :return ad_sigma_delta_single_conversion (indio_dev, chan, val);case IIO_CHAN_INFO_SCALE : - *val = st->int_vref_mv * st->gain; + voltage_uv =regulator_get_voltage (st->reg); +if (voltage_uv <0 ) +return voltage_uv; + *val = (voltage_uv /1000 ) * st->gain; *val2 = chan->scan_type.realbits -1 ;return IIO_VAL_FRACTIONAL_LOG2 ;case IIO_CHAN_INFO_OFFSET :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 17/205 drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ]
For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens.
The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment).
--- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +7 -5
@@ -347,12 +347,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)vc4_get_scaling_mode (vc4_state->src_h[1 ], vc4_state->crtc_h); -/* YUV conversion requires that horizontal scaling be enabled, -* even on a plane that's otherwise 1:1. Looks like only PPF -* works in that case, so let's pick that one. +/* YUV conversion requires that horizontal scaling be enabled +* on the UV plane even if vc4_get_scaling_mode() returned +* VC4_SCALING_NONE (which can happen when the down-scaling +* ratio is 0.5). Let's force it to VC4_SCALING_PPF in this +* case. */ -if (vc4_state->is_unity) - vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; +if (vc4_state->x_scaling[1 ] ==VC4_SCALING_NONE ) + vc4_state->x_scaling[1 ] =VC4_SCALING_PPF ; }else { vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 60/205 media: DaVinci-VPBE: fix error handling in vpbe_initialize()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]
If vpbe_set_default_output() or vpbe_set_default_mode() fails, vpbe_initialize() returns error code without releasing resources.
The patch adds error handling for that case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +5 -2
@@ -739,7 +739,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , def_output); -return ret; + goto fail_kfree_amp; }printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode);
@@ -747,12 +747,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , def_mode); -return ret; + goto fail_kfree_amp; } vpbe_dev->initialized =1 ;/* TBD handling of bootargs for default output and mode */ return 0 ; +fail_kfree_amp: +mutex_lock (&vpbe_dev->lock); +kfree (vpbe_dev->amp); fail_kfree_encoders:kfree (vpbe_dev->encoders); fail_dev_unregister:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 61/205 smack: fix access permissions for keyring
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ]
Function smack_key_permission() only issues smack requests for the following operations:
- KEY_NEED_READ (issues MAY_READ)
- KEY_NEED_WRITE (issues MAY_WRITE)
- KEY_NEED_LINK (issues MAY_WRITE)
- KEY_NEED_SETATTR (issues MAY_WRITE)
A blank smack request is issued in all other cases, resulting in smack access being granted if there is any rule defined between subject and object, or denied with -EACCES otherwise.
Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. Fix the logic in the unlikely case when both MAY_READ and MAY_WRITE are needed. Validate access permission field for valid contents.
--- security/smack/smack_lsm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
security/smack/smack_lsm.c +9 -3
@@ -4356,6 +4356,12 @@ static int smack_key_permission(key_ref_t key_ref,int request =0 ;int rc; +/* +* Validate requested permissions +*/ +if (perm & ~KEY_NEED_ALL ) +return -EINVAL ; + keyp =key_ref_to_ptr (key_ref);if (keyp ==NULL )return -EINVAL ;
@@ -4375,10 +4381,10 @@ static int smack_key_permission(key_ref_t key_ref, ad.a.u.key_struct.key = keyp->serial; ad.a.u.key_struct.key_desc = keyp->description;#endif -if (perm &KEY_NEED_READ ) - request =MAY_READ ; +if (perm & (KEY_NEED_READ |KEY_NEED_SEARCH |KEY_NEED_VIEW )) + request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) - request =MAY_WRITE ; + request |=MAY_WRITE ; rc =smk_access (tkp, keyp->security, request, &ad); rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc);return rc;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 62/205 usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b7a4fbe2300a8965ea760c7e871507b84aea17f6 ]
Availability of TRB's is calculated using dwc3_calc_trbs_left(), which determines total available TRB's based on the HWO bit set in a TRB.
In the present code, __dwc3_prepare_one_trb() is called with a TRB which needs to be prepared for transfer. This __dwc3_prepare_one_trb() calls dwc3_calc_trbs_left() to determine total available TRBs and set IOC bit if the total available TRBs are zero. Since the present working TRB (which is passed as an argument to __dwc3_prepare_one_trb() ) doesn't yet have the HWO bit set before calling dwc3_calc_trbs_left(), there are chances that dwc3_calc_trbs_left() wrongly calculates this present working TRB as free(since the HWO bit is not yet set) and returns the total available TRBs as greater than zero (including the present working TRB). This could be a problem.
This patch corrects the above mentioned problem in __dwc3_prepare_one_trb() by increementing the dep->trb_enqueue at the last (after preparing the TRB) instead of increementing at the start and setting the IOC bit only if the total available TRBs returned by dwc3_calc_trbs_left() is 1 . Since we are increementing the dep->trb_enqueue at the last, the present working TRB is also considered as available by dwc3_calc_trbs_left() and non zero value is returned . So, according to the modified logic, when the total available TRBs is equal to 1 that means the total available TRBs in the pool are 0.
--- drivers/usb/dwc3/gadget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +3 -3
@@ -890,8 +890,6 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,struct usb_gadget *gadget = &dwc->gadget;enum usb_device_speed speed = gadget->speed; -dwc3_ep_inc_enq (dep); - trb->size =DWC3_TRB_SIZE_LENGTH (length); trb->bpl =lower_32_bits (dma); trb->bph =upper_32_bits (dma);
@@ -970,7 +968,7 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, }if ((!no_interrupt && !chain) || - (dwc3_calc_trbs_left (dep) ==0 )) + (dwc3_calc_trbs_left (dep) ==1 )) trb->ctrl |=DWC3_TRB_CTRL_IOC ;if (chain)
@@ -981,6 +979,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, trb->ctrl |=DWC3_TRB_CTRL_HWO ; +dwc3_ep_inc_enq (dep); +trace_dwc3_prepare_trb (dep, trb); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 64/205 timekeeping: Use proper seqcount initializer
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ce10a5b3954f2514af726beb78ed8d7350c5e41c ]
tk_core.seq is initialized open coded, but that misses to initialize the lockdep map when lockdep is enabled. Lockdep splats involving tk_core seq consequently lack a name and are hard to read.
Use the proper initializer which takes care of the lockdep map initialization.
[ tglx: Massaged changelog ]
--- kernel/time/timekeeping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/timekeeping.c +3 -1
@@ -41,7 +41,9 @@static struct {seqcount_t seq;struct timekeeper timekeeper; -} tk_core____cacheline_aligned ; +} tk_core____cacheline_aligned = { + .seq =SEQCNT_ZERO (tk_core.seq), +};static DEFINE_RAW_SPINLOCK (timekeeper_lock);static struct timekeeper shadow_timekeeper;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 67/205 driver core: Move async_synchronize_full call
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c37d721c68ad88925ba0e72f6e14acb829a8c6bb ]
Move the async_synchronize_full call out of __device_release_driver and into driver_detach.
The idea behind this is that the async_synchronize_full call will only guarantee that any existing async operations are flushed. This doesn't do anything to guarantee that a hotplug event that may occur while we are doing the release of the driver will not be asynchronously scheduled.
By moving this into the driver_detach path we can avoid potential deadlocks as we aren't holding the device lock at this point and we should not have the driver we want to flush loaded so the flush will take care of any asynchronous events the driver we are detaching might have scheduled.
--- drivers/base/dd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/dd.c +3 -3
@@ -813,9 +813,6 @@ static void __device_release_driver(struct device *dev, struct device *parent) drv = dev->driver;if (drv) { -if (driver_allows_async_probing (drv)) -async_synchronize_full (); -while (device_links_busy (dev)) {device_unlock (dev);if (parent)
@@ -920,6 +917,9 @@ void driver_detach(struct device_driver *drv)struct device_private *dev_prv;struct device *dev; +if (driver_allows_async_probing (drv)) +async_synchronize_full (); +for (;;) {spin_lock (&drv->p->klist_devices.k_lock);if (list_empty (&drv->p->klist_devices.k_list)) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 69/205 IB/hfi1: Unreserve a reserved request when it is completed
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ]
Currently, When a reserved operation is completed, its entry in the send queue will not be unreserved, which leads to the miscalculation of qp->s_avail and thus the triggering of a WARN_ON call trace. This patch fixes the problem by unreserving the reserved operation when it is completed.
--- drivers/infiniband/hw/hfi1/rc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/rc.c +2 -0
@@ -1162,6 +1162,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)if (cmp_psn (wqe->lpsn, qp->s_sending_psn) >=0 &&cmp_psn (qp->s_sending_psn, qp->s_sending_hpsn) <=0 )break ; +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
@@ -1214,6 +1215,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp,u32 s_last;rvt_put_swqe (wqe); +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 52/205 arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ]
As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines are ordered against prior readX()"), MMIO reads smaller than 64 bits fail to compile under clang because we end up mixing 32-bit and 64-bit register operands for the same data processing instruction:
./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths]
return readb(addr);
^
./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb'
^
./include/asm-generic/io.h:695:9: note: use constraint modifier "w"
./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb'
^
./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb'
asm volatile("eor %0, %1, %1\n" \
^Fix the build by casting the macro argument to 'unsigned long' when used as an input to the inline asm.
--- arch/arm64/include/asm/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/io.h +2 -1
@@ -119,7 +119,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)*/ \ asmvolatile ("eor %0, %1, %1\n" \"cbnz %0, ." \ - :"=r" (tmp) :"r" (v) :"memory" ); \ + :"=r" (tmp) :"r" ((unsigned long )(v)) \ + :"memory" ); \ })#define __iowmb () wmb()
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 70/205 usb: dwc3: trace: add missing break statement to make compiler happy
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 54d48183d21e03f780053d7129312049cb5dd591 ]
The missed break statement in the outer switch makes the code fall through always and thus always same value will be printed.
Besides that, compiler warns about missed fall through marker:
drivers/usb/dwc3/./trace.h: In function ‘trace_raw_output_dwc3_log_trb’:drivers/usb/dwc3/./trace.h:246:4: warning: this statement may fall through [-Wimplicit-fallthrough=]
switch (pcm) {
^~~~~~Add the missing break statement to work correctly without compilation warnings.
--- drivers/usb/dwc3/trace.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/trace.h +2 -0
@@ -262,9 +262,11 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, s ="2x " ;break ;case 3 : +default : s ="3x " ;break ; } +break ;default : s ="" ; } s; }),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 71/205 pinctrl: sx150x: handle failure case of devm_kstrdup
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ]
devm_kstrdup() may return NULL if internal allocation failed. Thus using label, name is unsafe without checking. Therefor in the unlikely case of allocation failure, sx150x_probe() simply returns -ENOMEM.
--- drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-sx150x.c +8 -3
@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, }/* Register GPIO controller */ - pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); pctl->gpio.base =-1 ; pctl->gpio.ngpio = pctl->data->npins; pctl->gpio.get_direction = sx150x_gpio_get_direction;
@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, pctl->gpio.of_node = dev->of_node;#endif pctl->gpio.can_sleep = true; + pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); +if (!pctl->gpio.label) +return -ENOMEM ; +/* * Setting multiple pins is not safe when all pins are not * handled by the same regmap register. The oscio pin (present
@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client,/* Add Interrupt support if an irq is specified */ if (client->irq >0 ) { - pctl->irq_chip.name =devm_kstrdup (dev, client->name, -GFP_KERNEL ); pctl->irq_chip.irq_mask = sx150x_irq_mask; pctl->irq_chip.irq_unmask = sx150x_irq_unmask; pctl->irq_chip.irq_set_type = sx150x_irq_set_type; pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; + pctl->irq_chip.name =devm_kstrdup (dev, client->name, +GFP_KERNEL ); +if (!pctl->irq_chip.name) +return -ENOMEM ; pctl->irq.masked = ~0 ; pctl->irq.sense =0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 73/205 ARM: dts: Fix OMAP4430 SDP Ethernet startup
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 ]
It was noticed that unbinding and rebinding the KSZ8851 ethernet resulted in the driver reporting "failed to read device ID" at probe. Probing the reset line with a 'scope while repeatedly attempting to bind the driver in a shell loop revealed that the KSZ8851 RSTN pin is constantly held at zero, meaning the device is held in reset, and does not respond on the SPI bus.
Experimentation with the startup delay on the regulator set to 50ms shows that the reset is positively released after 20ms.
Schematics for this board are not available, and the traces are buried in the inner layers of the board which makes tracing where the RSTN pin extremely difficult. We can only guess that the RSTN pin is wired to a reset generator chip driven off the ethernet supply, which fits the observed behaviour.
Include this delay in the regulator startup delay - effectively treating the reset as a "supply stable" indicator.
This can not be modelled as a delay in the KSZ8851 driver since the reset generation is board specific - if the RSTN pin had been wired to a GPIO, reset could be released earlier via the already provided support in the KSZ8851 driver.
This also got confirmed by Peter Ujfalusi <[email protected]> based on Blaze schematics that should be very close to SDP4430:
TPS22902YFPR is used as the regulator switch (gpio48 controlled):
Convert arm boot_lock to raw The VOUT is routed to TPS3808G01DBV. (SCH Note: Threshold set at 90%. Vsense: 0.405V).
According to the TPS3808 data sheet the RESET delay time when Ct is open (this is the case in the schema): MIN/TYP/MAX: 12/20/28 ms.
--- arch/arm/boot/dts/omap4-sdp.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap4-sdp.dts +1 -0
@@ -33,6 +33,7 @@ gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ enable-active-high; regulator-boot-on; + startup-delay-us = <25000>; }; vbat: fixedregulator-vbat {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 74/205 mips: bpf: fix encoding bug for mm_srlv32_op
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ]
For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90.
Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav.
v1->v2:
- Keep mm_srlv32_op sorted by value.
--- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/uapi/asm/inst.h +1 -1
@@ -369,8 +369,8 @@ enum mm_32a_minor_op { mm_ext_op =0x02c , mm_pool32axf_op =0x03c , mm_srl32_op =0x040 , + mm_srlv32_op =0x050 , mm_sra_op =0x080 , - mm_srlv32_op =0x090 , mm_rotr_op =0x0c0 , mm_lwxs_op =0x118 , mm_addu32_op = 0x150,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 75/205 media: coda: fix H.264 deblocking filter controls
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]
Add support for the third loop filter mode V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.
The filter offset controls are signed values in the -6 to 6 range and are stored into the slice header fields slice_alpha_c0_offset_div2 and slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are double their value, in range of -12 to 12.
Rename variables to more closely match the nomenclature in the H.264 specification.
--- drivers/media/platform/coda/coda-bit.c | 19 +++++++++---------- drivers/media/platform/coda/coda-common.c | 15 +++++++-------- drivers/media/platform/coda/coda.h | 6 +++--- drivers/media/platform/coda/coda_regs.h | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-)
drivers/media/platform/coda/coda-bit.c +9 -10
@@ -953,16 +953,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)else coda_write (dev,CODA_STD_H264 ,CODA_CMD_ENC_SEQ_COD_STD ); -if (ctx->params.h264_deblk_enabled) { - value = ((ctx->params.h264_deblk_alpha & -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | - ((ctx->params.h264_deblk_beta & -CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET ); - }else { - value =1 <<CODA_264PARAM_DISABLEDEBLK_OFFSET ; - } + value = ((ctx->params.h264_disable_deblocking_filter_idc & +CODA_264PARAM_DISABLEDEBLK_MASK ) << +CODA_264PARAM_DISABLEDEBLK_OFFSET ) | + ((ctx->params.h264_slice_alpha_c0_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | + ((ctx->params.h264_slice_beta_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET );coda_write (dev, value,CODA_CMD_ENC_SEQ_264_PARA );break ;case V4L2_PIX_FMT_JPEG :
drivers/media/platform/coda/coda-common.c +7 -8
@@ -1675,14 +1675,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) ctx->params.h264_max_qp = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA : - ctx->params.h264_deblk_alpha = ctrl->val; + ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA : - ctx->params.h264_deblk_beta = ctrl->val; + ctx->params.h264_slice_beta_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE : - ctx->params.h264_deblk_enabled = (ctrl->val == -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); + ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_PROFILE :/* TODO: switch between baseline and constrained baseline */
@@ -1764,13 +1763,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_MAX_QP ,0 ,51 ,1 ,51 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std_menu (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED ,0x0 , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); +V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY , +0x0 ,V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE, V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
drivers/media/platform/coda/coda.h +3 -3
@@ -114,9 +114,9 @@ struct coda_params {u8 h264_inter_qp;u8 h264_min_qp;u8 h264_max_qp; -u8 h264_deblk_enabled; -u8 h264_deblk_alpha; -u8 h264_deblk_beta; +u8 h264_disable_deblocking_filter_idc; +s8 h264_slice_alpha_c0_offset_div2; +s8 h264_slice_beta_offset_div2;u8 h264_profile_idc;u8 h264_level_idc;u8 mpeg4_intra_qp;
drivers/media/platform/coda/coda_regs.h +1 -1
@@ -292,7 +292,7 @@#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f#define CODA_264PARAM_DISABLEDEBLK_OFFSET 6 -#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01 +#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01#define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 76/205 ARM: dts: Fix up the D-Link DIR-685 MTD partition info
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ]
The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains:
dev: size erasesize name
mtd0: 01e7ff40 00020000 "rootfs"
mtd1: 01f40000 00020000 "upgrade"
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd4: 00040000 00020000 "RedBoot"
mtd5: 00020000 00020000 "LangPack"
mtd6: 02000000 00020000 "flash"
Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered.
Remains:
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd5: 00020000 00020000 "LangPack"
Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000.
--- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/gemini-dlink-dir-685.dts +6 -10
@@ -128,20 +128,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 78/205 watchdog: renesas_wdt: dont set divider while watchdog is running
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e990e12741877e9bfac402ca468f4007a75f6e2a ]
The datasheet says we must stop the timer before changing the clock divider. This can happen when the restart handler is called while the watchdog is running.
--- drivers/watchdog/renesas_wdt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/watchdog/renesas_wdt.c +7 -2
@@ -74,12 +74,17 @@ static int rwdt_init_timeout(struct watchdog_device *wdev)static int rwdt_start (struct watchdog_device *wdev) {struct rwdt_priv *priv =watchdog_get_drvdata (wdev); +u8 val;pm_runtime_get_sync (wdev->parent); -rwdt_write (priv,0 ,RWTCSRB ); -rwdt_write (priv, priv->cks,RWTCSRA ); +/* Stop the timer before we modify any register */ + val =readb_relaxed (priv->base +RWTCSRA ) & ~RWTCSRA_TME ; +rwdt_write (priv, val,RWTCSRA ); +rwdt_init_timeout (wdev); +rwdt_write (priv, priv->cks,RWTCSRA ); +rwdt_write (priv,0 ,RWTCSRB );while (readb_relaxed (priv->base +RWTCSRA ) &RWTCSRA_WRFLG )cpu_relax ();
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 79/205 usb: dwc3: gadget: Disable CSP for stream OUT ep
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ]
In stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. So we don't want controller to carry on transfers when short packet is received. So disable the CSP for stream capable endpoint.
This is based on the 3.30a Programming guide, where table 3-1 device descriptor structure field definitions says for CSP bit If this bit is 0, the controller generates an XferComplete event and remove the stream. So if we keep CSP as 1 then switching between streams would not happen as in stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned.
--- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +6 -2
@@ -959,9 +959,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, usb_endpoint_type(dep->endpoint.desc)); } -/* always enable Continue on Short Packet */ +/* +* Enable Continue on Short Packet +* when endpoint is not a stream capable +*/ if (usb_endpoint_dir_out (dep->endpoint.desc)) { - trb->ctrl |=DWC3_TRB_CTRL_CSP ; +if (!dep->stream_capable) + trb->ctrl |=DWC3_TRB_CTRL_CSP ;if (short_not_ok) trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 53/205 Thermal: do not clear passive state during system sleep
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ]
commit ff140fea847e ("Thermal: handle thermal zone device properly during system sleep") added PM hook to call thermal zone reset during sleep. However resetting thermal zone will also clear the passive state and thus cancel the polling queue which leads the passive cooling device state not being cleared properly after sleep.
thermal_pm_notify => thermal_zone_device_reset set passive to 0 thermal_zone_trip_update will skip update passive as `old_target == instance->target'.monitor_thermal_zone => thermal_zone_device_set_polling will cancel tz->poll_queue, so the cooling device state will not be changed afterwards.
--- drivers/thermal/thermal_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +8 -4
@@ -454,16 +454,20 @@ static void update_temperature(struct thermal_zone_device *tz) tz->last_temperature, tz->temperature); } -static void thermal_zone_device_reset (struct thermal_zone_device *tz) +static void thermal_zone_device_init (struct thermal_zone_device *tz) {struct thermal_instance *pos; - tz->temperature =THERMAL_TEMP_INVALID ; - tz->passive =0 ;list_for_each_entry (pos, &tz->thermal_instances, tz_node) pos->initialized = false; } +static void thermal_zone_device_reset (struct thermal_zone_device *tz) +{ + tz->passive =0 ; +thermal_zone_device_init (tz); +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
@@ -1503,7 +1507,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { -thermal_zone_device_reset (tz); +thermal_zone_device_init (tz);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 80/205 iommu/arm-smmu: Add support for qcom,smmu-v2 variant
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ]
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
--- drivers/iommu/arm-smmu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/arm-smmu.c +3 -0
@@ -117,6 +117,7 @@ enum arm_smmu_implementation {GENERIC_SMMU ,ARM_MMU500 ,CAVIUM_SMMUV2 , + QCOM_SMMUV2, };/* Until ACPICA headers cover IORT rev. C */
@@ -1910,6 +1911,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);ARM_SMMU_MATCH_DATA (arm_mmu401,ARM_SMMU_V1_64K ,GENERIC_SMMU );ARM_SMMU_MATCH_DATA (arm_mmu500,ARM_SMMU_V2 ,ARM_MMU500 );ARM_SMMU_MATCH_DATA (cavium_smmuv2,ARM_SMMU_V2 ,CAVIUM_SMMUV2 ); +ARM_SMMU_MATCH_DATA (qcom_smmuv2,ARM_SMMU_V2 ,QCOM_SMMUV2 );static const struct of_device_id arm_smmu_of_match[] = { { .compatible ="arm,smmu-v1" , .data = &smmu_generic_v1 },
@@ -1918,6 +1920,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, { }, };MODULE_DEVICE_TABLE (of, arm_smmu_of_match);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 82/205 sata_rcar: fix deferred probing
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/sata_rcar.c +3 -1
@@ -880,7 +880,9 @@ static int sata_rcar_probe(struct platform_device *pdev)int ret =0 ; irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) +if (irq <0 ) +return irq; +if (!irq)return -EINVAL ; priv = devm_kzalloc(&pdev->dev, sizeof(struct sata_rcar_priv),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 56/205 arm64: ftrace: dont adjust the LR value
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ]
The core ftrace code requires that when it is handed the PC of an instrumented function, this PC is the address of the instrumented instruction. This is necessary so that the core ftrace code can identify the specific instrumentation site. Since the instrumented function will be a BL, the address of the instrumented function is LR - 4 at entry to the ftrace code.
This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, which acquire the PC of the instrumented function.
The mcount_get_lr helper is used to acquire the LR of the instrumented function, whose value does not require this adjustment, and cannot be adjusted to anything meaningful. No adjustment of this value is made on other architectures, including arm. However, arm64 adjusts this value by 4.
This patch brings arm64 in line with other architectures and removes the adjustment of the LR value.
--- arch/arm64/kernel/entry-ftrace.S | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/entry-ftrace.S +0 -1
@@ -79,7 +79,6 @@ .macro mcount_get_lr reg ldr \reg, [x29] ldr \reg, [\reg, #8] - mcount_adjust_addr \reg, \reg .endm .macro mcount_get_lr_addr reg
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 57/205 ARM: dts: mmp2: fix TWSI2
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ]
Marvell keeps their MMP2 datasheet secret, but there are good clues that TWSI2 is not on 0xd4025000 on that platform, not does it use IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:
arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58
I'm taking a somewhat educated guess that is probably a copy & paste error from PXA168 or PXA910 and that the real controller in fact hides at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.
I'm also copying some properties from TWSI1 that were missing or incorrect.
Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.
--- arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mmp2.dtsi +6 -3
@@ -220,12 +220,15 @@ status = "disabled"; }; - twsi2: i2c@d4025000 { + twsi2: i2c@d4031000 { compatible = "mrvl,mmp-twsi"; - reg = <0xd4025000 0x1000>; - interrupts = <58>; + reg = <0xd4031000 0x1000>; + interrupt-parent = <&intcmux17>; + interrupts = <0>; clocks = <&soc_clocks MMP2_CLK_TWSI1>; resets = <&soc_clocks MMP2_CLK_TWSI1>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 50/205 nfsd4: fix crash on writing v4_end_grace before nfsd startup
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ]
Anatoly Trosinenko reports that this:
1) Checkout fresh master Linux branch (tested with commit e195ca6cb)
2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build
3) From kvm-xfstests shell:
results in NULL dereference in locks_end_grace.
Check that nfsd has been started before trying to end the grace period.
--- fs/nfsd/nfsctl.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfsctl.c +2 -0
@@ -1126,6 +1126,8 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)case 'Y' :case 'y' :case '1' : +if (nn->nfsd_serv) +return -EBUSY ;nfsd4_end_grace (nn);break ;default :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 84/205 cpuidle: big.LITTLE: fix refcount leak
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9456823c842f346c74265fcd98d008d87a7eb6f5 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. bl_idle_init() doesn't do that, so fix it.
--- drivers/cpuidle/cpuidle-big_little.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-big_little.c +6 -1
@@ -167,6 +167,7 @@ static int __init bl_idle_init(void) {int ret;struct device_node *root =of_find_node_by_path ("/" ); +const struct of_device_id *match_id;if (!root)return -ENODEV ;
@@ -174,7 +175,11 @@ static int __init bl_idle_init(void)/* * Initialize the driver just for a compliant set of machines */ -if (!of_match_node (compatible_machine_match, root)) + match_id =of_match_node (compatible_machine_match, root); + +of_node_put (root); + +if (!match_id)return -ENODEV ;if (!mcpm_is_available ())
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 93/205 ARM: mmp: fix timer_init calls
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ]
The change to passing the timer frequency as a function argument was a good idea, but caused a build failure for one user that was missed in the update:
arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer':arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration]
Change that as well to fix the build error, and rename the function to put it into a proper namespace and make it clearer what is actually going on.
I saw that the high 6500000 HZ frequency was previously only set with CONFIG_MMP2, but is now also used with MMP (pxa910), so I'm changing that back here. Please make sure that the frequencies are all correct now.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq,unsigned long rate); +extern void mmp_timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_PXA168_TIMER1 ,3250000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/pxa910.c +1 -1
@@ -116,7 +116,7 @@ void __init pxa910_timer_init(void)__raw_writel (APBC_APBCLK |APBC_RST ,APBC_TIMERS );__raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA910_AP1_TIMER1 ); +mmp_timer_init (IRQ_PXA910_AP1_TIMER1 ,3250000 ); }/* on-chip devices */
arch/arm/mach-mmp/time.c +2 -2
@@ -184,7 +184,7 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq,unsigned long rate) +void __init mmp_timer_init (int irq,unsigned long rate) {timer_config ();
@@ -239,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq, rate); +mmp_timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 94/205 KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 693ac10a88a2219bde553b2e8460dbec97e594e6 ]
The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the availability of in kernel tce acceleration for vfio. However it is currently the case that this is only available on a powernv machine, not for a pseries machine.
Thus make this capability dependent on having the cpu feature CPU_FTR_HVMODE.
[[email protected] - fixed compilation for Book E.]
--- arch/powerpc/kvm/powerpc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/powerpc.c +4 -1
@@ -540,8 +540,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)#ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_SPAPR_TCE :case KVM_CAP_SPAPR_TCE_64 : -/* fallthrough */ + r =1 ; +break ;case KVM_CAP_SPAPR_TCE_VFIO : + r = !!cpu_has_feature (CPU_FTR_HVMODE ); +break ;case KVM_CAP_PPC_RTAS :case KVM_CAP_PPC_FIXUP_HCALL :case KVM_CAP_PPC_ENABLE_HCALL :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 95/205 mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 07d405769afea5718529fc9e341f0b13b3189b6f ]
If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. The resulting operations leave the FSM stuck in READWAIT, a state which persists until the MMC framework resets the controller, by which point the root filesystem is likely to have been unmounted.
A less heavyweight solution is to detect the condition and nudge the FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
--- drivers/mmc/host/bcm2835.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mmc/host/bcm2835.c +9 -0
@@ -772,6 +772,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host)if (!(sdhsts &SDHSTS_CRC7_ERROR ) || (host->cmd->opcode !=MMC_SEND_OP_COND )) { +u32 edm, fsm; +if (sdhsts &SDHSTS_CMD_TIME_OUT ) { host->cmd->error = -ETIMEDOUT ; }else {
@@ -780,6 +782,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host)bcm2835_dumpregs (host); host->cmd->error = -EILSEQ ; } + edm =readl (host->ioaddr +SDEDM ); + fsm = edm &SDEDM_FSM_MASK ; +if (fsm ==SDEDM_FSM_READWAIT || + fsm ==SDEDM_FSM_WRITESTART1 ) +/* Kick the FSM out of its wait */ +writel (edm |SDEDM_FORCE_DATA_MODE , + host->ioaddr +SDEDM );bcm2835_finish_request (host);return ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 96/205 mmc: bcm2835: reset host on timeout
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ]
The bcm2835 mmc host tends to lock up for unknown reason so reset it on timeout. The upper mmc block layer tries retransimitting with single blocks which tends to work out after a long wait.
This is better than giving up and leaving the machine broken for no obvious reason.
--- drivers/mmc/host/bcm2835.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/bcm2835.c +3 -0
@@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc)if (host->dma_chan)dmaengine_terminate_sync (host->dma_chan); + host->dma_chan =NULL ;bcm2835_reset_internal (host); }
@@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work)dev_err (dev,"timeout waiting for hardware interrupt.\n" );bcm2835_dumpregs (host); +bcm2835_reset (host->mmc); +if (host->data) { host->data->error = -ETIMEDOUT ;bcm2835_finish_data (host);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 97/205 memstick: Prevent memstick host from getting runtime suspended during card detection
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e03e303edf1c63e6dd455ccd568c74e93ef3ba8c ]
We can use MEMSTICK_POWER_{ON,OFF} along with pm_runtime_{get,put} helpers to let memstick host support runtime pm.
The rpm count may go down to zero before the memstick host powers on, so the host can be runtime suspended.
So before doing card detection, increment the rpm count to avoid the host gets runtime suspended. Balance the rpm count after card detection is done.
--- drivers/memstick/core/memstick.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/memstick/core/memstick.c +3 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #define DRIVER_NAME "memstick"
@@ -436,6 +437,7 @@ static void memstick_check(struct work_struct *work)struct memstick_dev *card;dev_dbg (&host->dev,"memstick_check started\n" ); +pm_runtime_get_noresume (host->dev.parent);mutex_lock (&host->lock);if (!host->card) {if (memstick_power_on (host))
@@ -479,6 +481,7 @@ out_power_off: host->set_param (host,MEMSTICK_POWER ,MEMSTICK_POWER_OFF );mutex_unlock (&host->lock); +pm_runtime_put (host->dev.parent);dev_dbg (&host->dev,"memstick_check finished\n" ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 98/205 mmc: sdhci-of-esdhc: Fix timeout checks
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ea6d027312111c6d96309ad1a684b33cb37e6764 ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-of-esdhc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +12 -4
@@ -481,8 +481,12 @@ static void esdhc_clock_enable(struct sdhci_host *host, bool enable)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); val =ESDHC_CLOCK_STABLE ; -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) & val)) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) & val) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));break ;
@@ -558,8 +562,12 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE ) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));return ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 100/205 tty: serial: samsung: Properly set flags in autoCTS mode
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ]
Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support") has changed the way the autoCTS mode is handled.
According to that change, serial drivers which enable H/W autoCTS mode must set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling TX. This patch adds proper handling of UPSTAT_AUTOCTS flag.
--- drivers/tty/serial/samsung.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/samsung.c +3 -0
@@ -1343,11 +1343,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,wr_regl (port,S3C2410_ULCON , ulcon);wr_regl (port,S3C2410_UBRDIV , quot); + port->status &= ~UPSTAT_AUTOCTS ; + umcon =rd_regl (port,S3C2410_UMCON );if (termios->c_cflag &CRTSCTS ) { umcon |=S3C2410_UMCOM_AFC ;/* Disable RTS when RX FIFO contains 63 bytes */ umcon &= ~S3C2412_UMCON_AFC_8 ; + port->status =UPSTAT_AUTOCTS ; }else { umcon &= ~S3C2410_UMCOM_AFC ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 102/205 perf header: Fix unchecked usage of strncpy()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7572588085a13d5db02bf159542189f52fdb507e ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/header.c: In function 'perf_event__synthesize_event_update_unit':
util/header.c:3586:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
strncpy(ev->data, evsel->unit, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/header.c:3579:16: note: length computed here
size_t size = strlen(evsel->unit);
^~~~~~~~~~~~~~~~~~~--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -3132,7 +3132,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool,if (ev ==NULL )return -ENOMEM ; -strncpy (ev->data, evsel->unit, size); +strlcpy (ev->data, evsel->unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 85/205 OPP: Use opp_table->regulators to verify no regulator case
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 90e3577b5feb42bac1269e16bb3d2bdd8f6df40f ]
The value of opp_table->regulator_count is not very consistent right now and it may end up being 0 while we do have a "opp-microvolt" property in the OPP table. It was kept that way as we used to check if any regulators are set with the OPP core for a device or not using value of regulator_count.
Lets use opp_table->regulators for that purpose as the meaning of regulator_count is going to change in the later patches.
--- drivers/base/power/opp/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/base/power/opp/core.c +7 -4
@@ -192,12 +192,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)if (IS_ERR (opp_table))return 0 ; - count = opp_table->regulator_count; -/* Regulator may not be required for the device */ -if (!count) +if (!opp_table->regulators) goto put_opp_table; + count = opp_table->regulator_count; + uV =kmalloc_array (count,sizeof (*uV),GFP_KERNEL );if (!uV) goto put_opp_table;
@@ -921,6 +921,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,struct regulator *reg;int i; +if (!opp_table->regulators) +return true; +for (i =0 ; i < opp_table->regulator_count; i++) { reg = opp_table->regulators[i];
@@ -1226,7 +1229,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table)struct dev_pm_set_opp_data *data;int len, count = opp_table->regulator_count; -if (WARN_ON (!count)) +if (WARN_ON (!opp_table->regulators))return -EINVAL ;/* space for set_opp_data */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 103/205 perf probe: Fix unchecked usage of strncpy()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bef0b8970f27da5ca223e522a174d03e2587761d ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
In this case the 'target' buffer is coming from a list of build-ids that are expected to have a len of at most (SBUILD_ID_SIZE - 1) chars, so probably we're safe, but since we're using strncpy() here, use strlcpy() instead to provide the intended safety checking without the using the problematic strncpy() function.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/probe-file.c: In function 'probe_cache__open.isra.5':
util/probe-file.c:427:3: error: 'strncpy' specified bound 41 equals destination size [-Werror=stringop-truncation]
strncpy(sbuildid, target, SBUILD_ID_SIZE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
--- tools/perf/util/probe-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-file.c +1 -1
@@ -424,7 +424,7 @@ static int probe_cache__open(struct probe_cache *pcache, const char *target,if (target &&build_id_cache__cached (target)) {/* This is a cached buildid */ -strncpy (sbuildid, target,SBUILD_ID_SIZE ); +strlcpy (sbuildid, target,SBUILD_ID_SIZE ); dir_name =build_id_cache__linkname (sbuildid,NULL ,0 ); goto found; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 104/205 KVM: s390: unregister debug feature on failing arch init
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]
Make sure the debug feature and its allocated resources get released upon unsuccessful architecture initialization.
A related indication of the issue will be reported as kernel message.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +14 -3
@@ -361,19 +361,30 @@ static void kvm_s390_cpu_feat_init(void)int kvm_arch_init (void *opaque) { +int rc; + kvm_s390_dbf =debug_register ("kvm-trace" ,32 ,1 ,7 *sizeof (long ));if (!kvm_s390_dbf)return -ENOMEM ;if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view)) { -debug_unregister (kvm_s390_dbf); -return -ENOMEM ; + rc = -ENOMEM ; + goto out_debug_unreg; }kvm_s390_cpu_feat_init ();/* Register floating interrupt controller interface. */ -return kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); + rc =kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); +if (rc) { +pr_err ("Failed to register FLIC rc=%d\n" , rc); + goto out_debug_unreg; + } +return 0 ; + +out_debug_unreg: +debug_unregister (kvm_s390_dbf); +return rc; }void kvm_arch_exit (void )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 107/205 percpu: convert spin_lock_irq to spin_lock_irqsave.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6ab7d47bcbf0144a8cb81536c2cead4cde18acfe ]
Quoted 1 line
From Michael Cree:
"Bisection lead to commit b38d08f3181c ("percpu: restructure
locking") as being the cause of lockups at initial boot on the kernel built for generic Alpha.
On a suggestion by Tejun Heo that:
So, the only thing I can think of is that it's calling spin_unlock_irq() while irq handling isn't set up yet. Can you please try the followings?
1. Convert all spin_[un]lock_irq() to spin_lock_irqsave/unlock_irqrestore()."
--- mm/percpu-km.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/percpu-km.c +3 -2
@@ -50,6 +50,7 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp)const int nr_pages = pcpu_group_sizes[0 ] >>PAGE_SHIFT ;struct pcpu_chunk *chunk;struct page *pages; +unsigned long flags;int i; chunk =pcpu_alloc_chunk (gfp);
@@ -68,9 +69,9 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp) chunk->data = pages; chunk->base_addr =page_address (pages) - pcpu_group_offsets[0 ]; -spin_lock_irq (&pcpu_lock); +spin_lock_irqsave (&pcpu_lock, flags);pcpu_chunk_populated (chunk,0 , nr_pages, false); -spin_unlock_irq (&pcpu_lock); +spin_unlock_irqrestore (&pcpu_lock, flags);pcpu_stats_chunk_alloc ();trace_percpu_create_chunk (chunk->base_addr);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 108/205 powerpc/uaccess: fix warning/error with access_ok()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 05a4ab823983d9136a460b7b5e0d49ee709a6f86 ]
With the following piece of code, the following compilation warning is encountered:
if (_IOC_DIR(ioc) != _IOC_NONE) {
int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;
if (!access_ok(verify, ioarg, _IOC_SIZE(ioc))) {drivers/platform/test/dev.c: In function 'my_ioctl':drivers/platform/test/dev.c:219:7: warning: unused variable 'verify' [-Wunused-variable]
int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;
This patch fixes it by referencing 'type' in the macro allthough doing nothing with it.
--- arch/powerpc/include/asm/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/uaccess.h +1 -1
@@ -54,7 +54,7 @@#endif #define access_ok (type, addr, size) \ - (__chk_user_ptr(addr), \ + (__chk_user_ptr(addr), (void)(type), \ __access_ok((__force unsigned long)(addr), (size), get_fs()))/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 109/205 mac80211: fix radiotap vendor presence bitmap handling
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit efc38dd7d5fa5c8cdd0c917c5d00947aa0539443 ]
Due to the alignment handling, it actually matters where in the code we add the 4 bytes for the presence bitmap to the length; the first field is the timestamp with 8 byte alignment so we need to add the space for the extra vendor namespace presence bitmap *before* we do any alignment for the fields.
Move the presence bitmap length accounting to the right place to fix the alignment for the data properly.
--- net/mac80211/rx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac80211/rx.c +3 -2
@@ -141,6 +141,9 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local,/* allocate extra bitmaps */ if (status->chains) len +=4 *hweight8 (status->chains); +/* vendor presence bitmap */ +if (status->flag &RX_FLAG_RADIOTAP_VENDOR_DATA ) + len +=4 ;if (ieee80211_have_rx_timestamp (status)) { len =ALIGN (len,8 );
@@ -182,8 +185,6 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local,if (status->flag &RX_FLAG_RADIOTAP_VENDOR_DATA ) {struct ieee80211_vendor_radiotap *rtap = (void *)skb->data; -/* vendor presence bitmap */ - len +=4 ;/* alignment for fixed 6-byte vendor data header */ len =ALIGN (len,2 );/* vendor data header */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 111/205 Bluetooth: Fix unnecessary error message for HCI request completion
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1629db9c75342325868243d6bca5853017d91cf8 ]
In case a command which completes in Command Status was sent using the hci_cmd_send-family of APIs there would be a misleading error in the hci_get_cmd_complete function, since the code would be trying to fetch the Command Complete parameters when there are none.
Avoid the misleading error and silently bail out from the function in case the received event is a command status.
--- net/bluetooth/hci_event.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/hci_event.c +6 -0
@@ -5212,6 +5212,12 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode,return true; } +/* Check if request ended in Command Status - no way to retreive +* any extra parameters in this case. +*/ +if (hdr->evt ==HCI_EV_CMD_STATUS ) +return false; +if (hdr->evt !=HCI_EV_CMD_COMPLETE ) {BT_DBG ("Last event is not cmd complete (0x%2.2x)" , hdr->evt);return false;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 86/205 i2c-axxia: check for error conditions first
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f5c85fe3a60ace555d09898166af372547f97fc ]
It was observed that when using seqentional mode contrary to the documentation, the SS bit (which is supposed to only be set if automatic/sequence command completed normally), is sometimes set together with NA (NAK in address phase) causing transfer to falsely be considered successful.
My assumption is that this does not happen during manual mode since the controller is stopping its work the moment it sets NA/ND bit in status register. This is not the case in Automatic/Sequentional mode where it is still working to send STOP condition and the actual status we get depends on the time when the ISR is run.
This patch changes the order of checking status bits in ISR - error conditions are checked first and only if none of them occurred, the transfer may be considered successful. This is required to introduce using of sequentional mode in next patch.
--- drivers/i2c/busses/i2c-axxia.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-axxia.c +16 -16
@@ -296,22 +296,7 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)i2c_int_disable (idev,MST_STATUS_TFL ); } -if (status &MST_STATUS_SCC ) { -/* Stop completed */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_SNS ) { -/* Transfer done */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) -axxia_i2c_empty_rx_fifo (idev); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_TSS ) { -/* Transfer timeout */ - idev->msg_err = -ETIMEDOUT ; -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (unlikely (status &MST_STATUS_ERR )) { +if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );if (status &MST_STATUS_AL )
@@ -328,6 +313,21 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)readl (idev->base +MST_TX_BYTES_XFRD ), readl(idev->base + MST_TX_XFER));complete (&idev->msg_complete); + }else if (status &MST_STATUS_SCC ) { +/* Stop completed */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_SNS ) { +/* Transfer done */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) +axxia_i2c_empty_rx_fifo (idev); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); } out:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 113/205 scsi: smartpqi: correct host serial num for ssa
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b2346b5030cf9458f30a84028d9fe904b8c942a7 ]
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -653,6 +653,7 @@ struct bmic_host_wellness_driver_version {u8 driver_version_tag[2 ];__le16 driver_version_length;char driver_version[32 ]; +u8 dont_write_tag[2 ];u8 end_tag[2 ]; };
@@ -682,6 +683,8 @@ static int pqi_write_driver_version_to_host_wellness(strncpy (buffer->driver_version,"Linux " DRIVER_VERSION ,sizeof (buffer->driver_version) -1 ); buffer->driver_version[sizeof (buffer->driver_version) -1 ] ='\0' ; + buffer->dont_write_tag[0 ] ='D' ; + buffer->dont_write_tag[1 ] ='W' ; buffer->end_tag[0 ] ='Z' ; buffer->end_tag[1 ] ='Z' ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 114/205 scsi: smartpqi: correct volume status
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7ff44499bafbd376115f0bb6b578d980f56ee13b ]
- fix race condition when a unit is deleted after an RLL, and before we have gotten the LV_STATUS page of the unit.
- In this case we will get a standard inquiry, rather than the desired page. This will result in a unit presented which no longer exists.
- If we ask for LV_STATUS, insure we get LV_STATUS
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -1184,6 +1184,9 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info,if (rc) goto out; +if (vpd->page_code !=CISS_VPD_LV_STATUS ) + goto out; + page_length = offsetof(struct ciss_vpd_logical_volume_status , volume_status) + vpd->page_length;if (page_length <sizeof (*vpd))
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 87/205 phy: sun4i-usb: add support for missing USB PHY index
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2659392e5c08dff626e6db1d739adff58a94604d ]
The new Allwinner H6 SoC's USB2 PHY has two holes -- USB1 (which is a 3.0 port with dedicated PHY) and USB2 (which doesn't exist at all).
Add support for this kind of missing USB PHY index.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +7 -0
@@ -125,6 +125,7 @@ struct sun4i_usb_phy_cfg {bool dedicated_clocks;bool enable_pmu_unk1;bool phy0_dual_route; +int missing_phys; };struct sun4i_usb_phy_data {
@@ -645,6 +646,9 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev,if (args->args[0 ] >= data->cfg->num_phys)return ERR_PTR (-ENODEV ); +if (data->cfg->missing_phys &BIT (args->args[0 ])) +return ERR_PTR (-ENODEV ); +return data->phys[args->args[0 ]].phy; }
@@ -740,6 +744,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)struct sun4i_usb_phy *phy = data->phys + i;char name[16 ]; +if (data->cfg->missing_phys &BIT (i)) +continue ; +snprintf (name,sizeof (name),"usb%d_vbus" , i); phy->vbus =devm_regulator_get_optional (dev, name);if (IS_ERR (phy->vbus)) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 89/205 switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e4a7dca5de625018b29417ecc39dc5037d9a5a36 ]
In the ioctl_event_ctl() SWITCHTEC_IOCTL_EVENT_IDX_ALL case, we call event_ctl() several times with the same "ctl" struct. Each call clobbers ctl.flags, which leads to the problem that we may not actually enable or disable all events as the user requested.
Preserve the event flag value with a temporary variable.
--- drivers/pci/switch/switchtec.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/switch/switchtec.c +3 -0
@@ -1064,6 +1064,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, {int ret;int nr_idxs; +unsigned int event_flags;struct switchtec_ioctl_event_ctl ctl;if (copy_from_user (&ctl, uctl,sizeof (ctl)))
@@ -1085,7 +1086,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,else return -EINVAL ; + event_flags = ctl.flags;for (ctl.index =0 ; ctl.index < nr_idxs; ctl.index++) { + ctl.flags = event_flags; ret =event_ctl (stdev, &ctl);if (ret <0 )return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 90/205 selftests/bpf: use __bpf_constant_htons in test_prog.c
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a0517a0f7ef23550b4484c37e2b9c2d32abebf64 ]
For some reason, my older GCC (< 4.8) isn't smart enough to optimize the !__builtin_constant_p() branch in bpf_htons, I see:
error: implicit declaration of function '__builtin_bswap16'
Let's use __bpf_constant_htons as suggested by Daniel Borkmann.
I tried to use simple htons, but it produces the following:
test_progs.c:54:17: error: braced-group within expression allowed only inside a function
.eth.h_proto = htons(ETH_P_IP),
--- tools/testing/selftests/bpf/test_progs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/test_progs.c +4 -4
@@ -43,10 +43,10 @@ static struct {struct iphdr iph;struct tcphdr tcp; }__packed pkt_v4 = { - .eth.h_proto =bpf_htons (ETH_P_IP ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IP ), .iph.ihl =5 , .iph.protocol =6 , - .iph.tot_len =bpf_htons (MAGIC_BYTES ), + .iph.tot_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
@@ -56,9 +56,9 @@ static struct {struct ipv6hdr iph;struct tcphdr tcp; }__packed pkt_v6 = { - .eth.h_proto =bpf_htons (ETH_P_IPV6 ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IPV6 ), .iph.nexthdr =6 , - .iph.payload_len =bpf_htons (MAGIC_BYTES ), + .iph.payload_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 91/205 ARM: pxa: avoid section mismatch warning
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 88af3209aa0881aa5ffd99664b6080a4be5f24e5 ]
WARNING: vmlinux.o(.text+0x19f90): Section mismatch in reference from the function littleton_init_lcd() to the function .init.text:pxa_set_fb_info() The function littleton_init_lcd() references
the function __init pxa_set_fb_info().
This is often because littleton_init_lcd lacks a __init
annotation or the annotation of pxa_set_fb_info is wrong.
WARNING: vmlinux.o(.text+0xf824): Section mismatch in reference from the function zeus_register_ohci() to the function .init.text:pxa_set_ohci_info() The function zeus_register_ohci() references
the function __init pxa_set_ohci_info().
This is often because zeus_register_ohci lacks a __init
annotation or the annotation of pxa_set_ohci_info is wrong.
WARNING: vmlinux.o(.text+0xf95c): Section mismatch in reference from the function cm_x300_init_u2d() to the function .init.text:pxa3xx_set_u2d_info() The function cm_x300_init_u2d() references
the function __init pxa3xx_set_u2d_info().
This is often because cm_x300_init_u2d lacks a __init
annotation or the annotation of pxa3xx_set_u2d_info is wrong.
--- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/cm-x300.c +1 -1
@@ -547,7 +547,7 @@ static struct pxa3xx_u2d_platform_data cm_x300_u2d_platform_data = { .exit = cm_x300_u2d_exit, }; -static void cm_x300_init_u2d (void ) +static void __init cm_x300_init_u2d (void ) {pxa3xx_set_u2d_info (&cm_x300_u2d_platform_data); }
arch/arm/mach-pxa/littleton.c +1 -1
@@ -183,7 +183,7 @@ static struct pxafb_mach_info littleton_lcd_info = { .lcd_conn = LCD_COLOR_TFT_16BPP, }; -static void littleton_init_lcd (void ) +static void __init littleton_init_lcd (void ) {pxa_set_fb_info (NULL , &littleton_lcd_info); }
arch/arm/mach-pxa/zeus.c +1 -1
@@ -558,7 +558,7 @@ static struct pxaohci_platform_data zeus_ohci_platform_data = { .flags = ENABLE_PORT_ALL | POWER_SENSE_LOW, }; -static void zeus_register_ohci (void ) +static void __init zeus_register_ohci (void ) {/* Port 2 is shared between host and client interface. */ UP2OCR =UP2OCR_HXOE |UP2OCR_HXS |UP2OCR_DMPDE |UP2OCR_DPPDE ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 92/205 ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit add6883619a9e3bf9658eaff1a547354131bbcd9 ]
eukrea-tlv320.c machine driver runs on non-DT platforms and include <asm/mach-types.h> header file in order to be able to use some machine_is_eukrea_xxx() macros.
Building it for ARM64 causes the following build error:
sound/soc/fsl/eukrea-tlv320.c:28:10: fatal error: asm/mach-types.h: No such file or directory
Avoid this error by not allowing to build the SND_SOC_EUKREA_TLV320 driver when ARM64 is selected.
This is needed in preparation for the i.MX8M support.
--- sound/soc/fsl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/Kconfig +1 -1
@@ -221,7 +221,7 @@ config SND_SOC_PHYCORE_AC97 config SND_SOC_EUKREA_TLV320 tristate "Eukrea TLV320" - depends on ARCH_MXC && I2C + depends on ARCH_MXC && !ARM64 && I2C select SND_SOC_TLV320AIC23_I2C select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 83/205 clk: imx6sl: ensure MMDC CH0 handshake is bypassed
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0efcc2c0fd2001a83240a8c3d71f67770484917e ]
Same as other i.MX6 SoCs, ensure unused MMDC channel's handshake is bypassed, this is to make sure no request signal will be generated when periphe_clk_sel is changed or SRC warm reset is triggered.
--- drivers/clk/imx/clk-imx6sl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/imx/clk-imx6sl.c +6 -0
@@ -17,6 +17,8 @@#include "clk.h" +#define CCDR 0x4 +#define BM_CCM_CCDR_MMDC_CH0_MASK (1 << 17)#define CCSR 0xc#define BM_CCSR_PLL1_SW_CLK_SEL (1 << 2)#define CACRR 0x10
@@ -414,6 +416,10 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clks[IMX6SL_CLK_USDHC3 ] =imx_clk_gate2 ("usdhc3" ,"usdhc3_podf" , base +0x80 ,6 ); clks[IMX6SL_CLK_USDHC4 ] =imx_clk_gate2 ("usdhc4" ,"usdhc4_podf" , base +0x80 ,8 ); +/* Ensure the MMDC CH0 handshake is bypassed */ +writel_relaxed (readl_relaxed (base +CCDR ) | +BM_CCM_CCDR_MMDC_CH0_MASK , base +CCDR ); +imx_check_clocks (clks,ARRAY_SIZE (clks)); clk_data.clks = clks;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 116/205 cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f68ef64cd7feb1220232bd8f501d8aad340a099 ]
The function cw1200_bss_info_changed() and cw1200_hw_scan() can be concurrently executed.
The two functions both access a possible shared variable "frame.skb".
This shared variable is freed by dev_kfree_skb() in cw1200_upload_beacon(), which is called by cw1200_bss_info_changed(). The free operation is protected by a mutex lock "priv->conf_mutex" in cw1200_bss_info_changed().
In cw1200_hw_scan(), this shared variable is accessed without the protection of the mutex lock "priv->conf_mutex".
Thus, concurrency use-after-free bugs may occur.
To fix these bugs, the original calls to mutex_lock(&priv->conf_mutex) and mutex_unlock(&priv->conf_mutex) are moved to the places, which can protect the accesses to the shared variable.
--- drivers/net/wireless/st/cw1200/scan.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/wireless/st/cw1200/scan.c +6 -7
@@ -78,6 +78,10 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,if (req->n_ssids >WSM_SCAN_MAX_NUM_OF_SSIDS )return -EINVAL ; +/* will be unlocked in cw1200_scan_work() */ +down (&priv->scan.lock); +mutex_lock (&priv->conf_mutex); + frame.skb =ieee80211_probereq_get (hw, priv->vif->addr,NULL ,0 , req->ie_len);if (!frame.skb)
@@ -86,19 +90,15 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,if (req->ie_len)skb_put_data (frame.skb, req->ie, req->ie_len); -/* will be unlocked in cw1200_scan_work() */ -down (&priv->scan.lock); -mutex_lock (&priv->conf_mutex); - ret =wsm_set_template_frame (priv, &frame);if (!ret) {/* Host want to be the probe responder. */ ret =wsm_set_probe_responder (priv, true); }if (ret) { +dev_kfree_skb (frame.skb);mutex_unlock (&priv->conf_mutex);up (&priv->scan.lock); -dev_kfree_skb (frame.skb);return ret; }
@@ -120,10 +120,9 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, ++priv->scan.n_ssids; } -mutex_unlock (&priv->conf_mutex); -if (frame.skb)dev_kfree_skb (frame.skb); +mutex_unlock (&priv->conf_mutex);queue_work (priv->workqueue, &priv->scan.work);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 125/205 i40e: define proper net_device::neigh_priv_len
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 31389b53b3e0b535867af9090a5d19ec64768d55 ]
Out of bound read reported by KASan.
i40iw_net_event() reads unconditionally 16 bytes from neigh->primary_key while the memory allocated for "neighbour" struct is evaluated in neigh_alloc() as
tbl->entry_size + dev->neigh_priv_len
where "dev" is a net_device.
But the driver does not setup dev->neigh_priv_len and we read beyond the neigh entry allocated memory, so the patch in the next mail fixes this.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -0
@@ -9772,6 +9772,9 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)ether_addr_copy (netdev->dev_addr, mac_addr);ether_addr_copy (netdev->perm_addr, mac_addr); +/* i40iw_net_event() reads 16 bytes from neigh->primary_key */ + netdev->neigh_priv_len =sizeof (u32) *4 ; + netdev->priv_flags |=IFF_UNICAST_FLT ; netdev->priv_flags |=IFF_SUPP_NOFCS ;/* Setup netdev TC information */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 126/205 igb: Fix an issue that PME is not enabled during runtime suspend
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1fb3a7a75e2efcc83ef21f2434069cddd6fae6f5 ]
I210 ethernet card doesn't wakeup when a cable gets plugged. It's because its PME is not set.
Since commit 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3"), if the PCI state is saved, pci_pm_runtime_suspend() stops calling pci_finish_runtime_suspend(), which enables the PCI PME.
To fix the issue, let's not to save PCI states when it's runtime suspend, to let the PCI subsystem enables PME.
--- drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +5 -3
@@ -7950,9 +7950,11 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,rtnl_unlock ();#ifdef CONFIG_PM - retval =pci_save_state (pdev); -if (retval) -return retval; +if (!runtime) { + retval =pci_save_state (pdev); +if (retval) +return retval; + }#endif status =rd32 (E1000_STATUS );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 128/205 fbdev: fbcon: Fix unregister crash when more than one framebuffer
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2122b40580dd9d0620398739c773d07a7b7939d0 ]
When unregistering fbdev using unregister_framebuffer(), any bound console will unbind automatically. This is working fine if this is the only framebuffer, resulting in a switch to the dummy console. However if there is a fb0 and I unregister fb1 having a bound console, I eventually get a crash. The fastest way for me to trigger the crash is to do a reboot, resulting in this splat:
[ 76.478825] WARNING: CPU: 0 PID: 527 at linux/kernel/workqueue.c:1442 __queue_work+0x2d4/0x41c [ 76.478849] Modules linked in: raspberrypi_hwmon gpio_backlight backlight bcm2835_rng rng_core [last unloaded: tinydrm] [ 76.478916] CPU: 0 PID: 527 Comm: systemd-udevd Not tainted 4.20.0-rc4+ #4 [ 76.478933] Hardware name: BCM2835 [ 76.478949] Backtrace: [ 76.478995] [<c010d388>] (dump_backtrace) from [<c010d670>] (show_stack+0x20/0x24) [ 76.479022] r6:00000000 r5:c0bc73be r4:00000000 r3:6fb5bf81 [ 76.479060] [<c010d650>] (show_stack) from [<c08e82f4>] (dump_stack+0x20/0x28) [ 76.479102] [<c08e82d4>] (dump_stack) from [<c0120070>] (__warn+0xec/0x12c) [ 76.479134] [<c011ff84>] (__warn) from [<c01201e4>] (warn_slowpath_null+0x4c/0x58) [ 76.479165] r9:c0eb6944 r8:00000001 r7:c0e927f8 r6:c0bc73be r5:000005a2 r4:c0139e84 [ 76.479197] [<c0120198>] (warn_slowpath_null) from [<c0139e84>] (__queue_work+0x2d4/0x41c) [ 76.479222] r6:d7666a00 r5:c0e918ee r4:dbc4e700 [ 76.479251] [<c0139bb0>] (__queue_work) from [<c013a02c>] (queue_work_on+0x60/0x88) [ 76.479281] r10:c0496bf8 r9:00000100 r8:c0e92ae0 r7:00000001 r6:d9403700 r5:d7666a00 [ 76.479298] r4:20000113 [ 76.479348] [<c0139fcc>] (queue_work_on) from [<c0496c28>] (cursor_timer_handler+0x30/0x54) [ 76.479374] r7:d8a8fabc r6:c0e08088 r5:d8afdc5c r4:d8a8fabc [ 76.479413] [<c0496bf8>] (cursor_timer_handler) from [<c0178744>] (call_timer_fn+0x100/0x230) [ 76.479435] r4:c0e9192f r3:d758a340 [ 76.479465] [<c0178644>] (call_timer_fn) from [<c0178980>] (expire_timers+0x10c/0x12c) [ 76.479495] r10:40000000 r9:c0e9192f r8:c0e92ae0 r7:d8afdccc r6:c0e19280 r5:c0496bf8 [ 76.479513] r4:d8a8fabc [ 76.479541] [<c0178874>] (expire_timers) from [<c0179630>] (run_timer_softirq+0xa8/0x184) [ 76.479570] r9:00000001 r8:c0e19280 r7:00000000 r6:c0e08088 r5:c0e1a3e0 r4:c0e19280 [ 76.479603] [<c0179588>] (run_timer_softirq) from [<c0102404>] (__do_softirq+0x1ac/0x3fc) [ 76.479632] r10:c0e91680 r9:d8afc020 r8:0000000a r7:00000100 r6:00000001 r5:00000002 [ 76.479650] r4:c0eb65ec [ 76.479686] [<c0102258>] (__do_softirq) from [<c0124d10>] (irq_exit+0xe8/0x168) [ 76.479716] r10:d8d1a9b0 r9:d8afc000 r8:00000001 r7:d949c000 r6:00000000 r5:c0e8b3f0 [ 76.479734] r4:00000000 [ 76.479764] [<c0124c28>] (irq_exit) from [<c016b72c>] (__handle_domain_irq+0x94/0xb0) [ 76.479793] [<c016b698>] (__handle_domain_irq) from [<c01021dc>] (bcm2835_handle_irq+0x3c/0x48) [ 76.479823] r8:d8afdebc r7:d8afddfc r6:ffffffff r5:c0e089f8 r4:d8afddc8 r3:d8afddc8 [ 76.479851] [<c01021a0>] (bcm2835_handle_irq) from [<c01019f0>] (__irq_svc+0x70/0x98)
The problem is in the console rebinding in fbcon_fb_unbind(). It uses the virtual console index as the new framebuffer index to bind the console(s) to. The correct way is to use the con2fb_map lookup table to find the framebuffer index.
--- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +1 -1
@@ -3041,7 +3041,7 @@ static int fbcon_fb_unbind(int idx)for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map[i] != idx && con2fb_map[i] !=-1 ) { - new_idx = i; + new_idx = con2fb_map[i];break ; } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 129/205 powerpc/mm: Fix reporting of kernel execute faults on the 8xx
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ffca395b11c4a5a6df6d6345f794b0e3d578e2d0 ]
On the 8xx, no-execute is set via PPP bits in the PTE. Therefore a no-exec fault generates DSISR_PROTFAULT error bits, not DSISR_NOEXEC_OR_G.
This patch adds DSISR_PROTFAULT in the test mask.
--- arch/powerpc/mm/fault.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/mm/fault.c +3 -1
@@ -215,7 +215,9 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault)static bool bad_kernel_fault (bool is_exec,unsigned long error_code,unsigned long address) { -if (is_exec && (error_code & (DSISR_NOEXEC_OR_G |DSISR_KEYFAULT ))) { +/* NX faults set DSISR_PROTFAULT on the 8xx, DSISR_NOEXEC_OR_G on others */ +if (is_exec && (error_code & (DSISR_NOEXEC_OR_G |DSISR_KEYFAULT | +DSISR_PROTFAULT ))) { printk_ratelimited(KERN_CRIT "kernel tried to execute" " exec-protected page (%lx) -" "exploit attempt? (uid: %d)\n",
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 131/205 pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2b745ac3cceb8fc1d9985990c8241a821ea97e53 ]
The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) only belong to the pin controller in the AO domain. With the current definition these pins cannot be referred to in .dts files as group (which is possible on GXBB and GXL for example).
Add a separate "gpio_aobus" function to fix the mapping between the pin controller and the GPIO pins in the AO domain. This is similar to how the GXBB and GXL drivers implement this functionality.
--- drivers/pinctrl/meson/pinctrl-meson8b.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/pinctrl/meson/pinctrl-meson8b.c +8 -5
@@ -649,16 +649,18 @@ static const char * const gpio_groups[] = {"BOOT_10" ,"BOOT_11" ,"BOOT_12" ,"BOOT_13" ,"BOOT_14" ,"BOOT_15" ,"BOOT_16" ,"BOOT_17" ,"BOOT_18" , -"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" , -"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , -"GPIOAO_8" ,"GPIOAO_9" ,"GPIOAO_10" ,"GPIOAO_11" , -"GPIOAO_12" ,"GPIOAO_13" ,"GPIO_BSD_EN" ,"GPIO_TEST_N" , -"DIF_0_P" ,"DIF_0_N" ,"DIF_1_P" ,"DIF_1_N" ,"DIF_2_P" ,"DIF_2_N" ,"DIF_3_P" ,"DIF_3_N" ,"DIF_4_P" ,"DIF_4_N" }; +static const char *const gpio_aobus_groups[] = { +"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" , +"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , +"GPIOAO_8" ,"GPIOAO_9" ,"GPIOAO_10" ,"GPIOAO_11" , +"GPIOAO_12" ,"GPIOAO_13" ,"GPIO_BSD_EN" ,"GPIO_TEST_N" +}; +static const char *const sd_a_groups[] = {"sd_d0_a" ,"sd_d1_a" ,"sd_d2_a" ,"sd_d3_a" ,"sd_clk_a" , "sd_cmd_a"
@@ -874,6 +876,7 @@ static struct meson_pmx_func meson8b_cbus_functions[] = { };static struct meson_pmx_func meson8b_aobus_functions[] = { +FUNCTION (gpio_aobus),FUNCTION (uart_ao),FUNCTION (uart_ao_b),FUNCTION (i2c_slave_ao),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 132/205 KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e87555e550cef4941579cd879759a7c0dee24e68 ]
AMD doesn't seem to implement MSR_IA32_MCG_EXT_CTL and svm code in kvm knows nothing about it, however, this MSR is among emulated_msrs and thus returned with KVM_GET_MSR_INDEX_LIST. The consequent KVM_GET_MSRS, of course, fails.
Report the MSR as unsupported to not confuse userspace.
--- arch/x86/kvm/svm.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kvm/svm.c +7 -0
@@ -5319,6 +5319,13 @@ static bool svm_cpu_has_accelerated_tpr(void)static bool svm_has_emulated_msr (int index) { +switch (index) { +case MSR_IA32_MCG_EXT_CTL : +return false; +default : +break ; + } +return true; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 133/205 powerpc/fadump: Do not allow hot-remove memory from fadump reserved area.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0db6896ff6332ba694f1e61b93ae3b2640317633 ]
For fadump to work successfully there should not be any holes in reserved memory ranges where kernel has asked firmware to move the content of old kernel memory in event of crash. Now that fadump uses CMA for reserved area, this memory area is now not protected from hot-remove operations unless it is cma allocated. Hence, fadump service can fail to re-register after the hot-remove operation, if hot-removed memory belongs to fadump reserved region. To avoid this make sure that memory from fadump reserved area is not hot-removable if fadump is registered.
However, if user still wants to remove that memory, he can do so by manually stopping fadump service before hot-remove operation.
--- arch/powerpc/include/asm/fadump.h | 2 +- arch/powerpc/kernel/fadump.c | 10 ++++++++-- arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +++++-- 3 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/fadump.h +1 -1
@@ -200,7 +200,7 @@ struct fad_crash_memory_ranges {unsigned long long size; }; -extern int is_fadump_boot_memory_area (u64 addr,ulong size); +extern int is_fadump_memory_area (u64 addr,ulong size);extern int early_init_dt_scan_fw_dump (unsigned long node,const char *uname,int depth,void *data);extern int fadump_reserve_mem (void );
arch/powerpc/kernel/fadump.c +8 -2
@@ -117,13 +117,19 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,/* * If fadump is registered, check if the memory provided -* falls within boot memory area. +* falls within boot memory area and reserved memory area. */ -int is_fadump_boot_memory_area (u64 addr,ulong size) +int is_fadump_memory_area (u64 addr,ulong size) { +u64 d_start = fw_dump.reserve_dump_area_start; +u64 d_end = d_start + fw_dump.reserve_dump_area_size; +if (!fw_dump.dump_registered)return 0 ; +if (((addr + size) > d_start) && (addr <= d_end)) +return 1 ; +return (addr + size) >RMA_START && addr <= fw_dump.boot_memory_size; }
arch/powerpc/platforms/pseries/hotplug-memory.c +5 -2
@@ -441,8 +441,11 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb) phys_addr = lmb->base_addr;#ifdef CONFIG_FA_DUMP -/* Don't hot-remove memory that falls in fadump boot memory area */ -if (is_fadump_boot_memory_area (phys_addr, block_sz)) +/* +* Don't hot-remove memory that falls in fadump boot memory area +* and memory that is reserved for capturing old kernel memory. +*/ +if (is_fadump_memory_area (phys_addr, block_sz))return false;#endif
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 134/205 kvm: Change offset in kvm_write_guest_offset_cached to unsigned
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7a86dab8cf2f0fdf508f3555dddfc236623bff60 ]
Since the offset is added directly to the hva from the gfn_to_hva_cache, a negative offset could result in an out of bounds write. The existing BUG_ON only checks for addresses beyond the end of the gfn_to_hva_cache, not for addresses before the start of the gfn_to_hva_cache.
Note that all current call sites have non-negative offsets.
--- include/linux/kvm_host.h | 3 ++- virt/kvm/kvm_main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/kvm_host.h +2 -1
@@ -685,7 +685,8 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,int kvm_write_guest_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc,void *data,unsigned long len);int kvm_write_guest_offset_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc, -void *data,int offset,unsigned long len); +void *data,unsigned int offset, +unsigned long len);int kvm_gfn_to_hva_cache_init (struct kvm *kvm,struct gfn_to_hva_cache *ghc,gpa_t gpa,unsigned long len);int kvm_clear_guest_page (struct kvm *kvm,gfn_t gfn,int offset,int len);
virt/kvm/kvm_main.c +2 -1
@@ -1962,7 +1962,8 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,EXPORT_SYMBOL_GPL (kvm_gfn_to_hva_cache_init);int kvm_write_guest_offset_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc, -void *data,int offset,unsigned long len) +void *data,unsigned int offset, +unsigned long len) {struct kvm_memslots *slots =kvm_memslots (kvm);int r;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 117/205 powerpc/perf: Fix thresholding counter data for unknown type
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 17cfccc91545682513541924245abb876d296063 ]
MMCRA[34:36] and MMCRA[38:44] expose the thresholding counter value. Thresholding counter can be used to count latency cycles such as load miss to reload. But threshold counter value is not relevant when the sampled instruction type is unknown or reserved. Patch to fix the thresholding counter value to zero when sampled instruction type is unknown or reserved.
--- arch/powerpc/perf/isa207-common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/perf/isa207-common.c +6 -1
@@ -228,8 +228,13 @@ void isa207_get_mem_weight(u64 *weight)u64 mmcra =mfspr (SPRN_MMCRA );u64 exp =MMCRA_THR_CTR_EXP (mmcra);u64 mantissa =MMCRA_THR_CTR_MANT (mmcra); +u64 sier =mfspr (SPRN_SIER ); +u64 val = (sier &ISA207_SIER_TYPE_MASK ) >>ISA207_SIER_TYPE_SHIFT ; - *weight = mantissa << (2 * exp); +if (val ==0 || val ==7 ) + *weight =0 ; +else + *weight = mantissa << (2 * exp); }int isa207_get_constraint (u64 event,unsigned long *maskp,unsigned long *valp)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 135/205 NFS: nfs_compare_mount_options always compare auth flavors.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 594d1644cd59447f4fceb592448d5cd09eb09b5e ]
This patch removes the check from nfs_compare_mount_options to see if a `sec' option was passed for the current mount before comparing auth flavors and instead just always compares auth flavors.
Consider the following scenario:
You have a server with the address 192.168.1.1 and two exports /export/a and /export/b. The first export supports sys' and krb5' security, the second just `sys'.
Assume you start with no mounts from the server.
The following results in EIOs being returned as the kernel nfs client incorrectly thinks it can share the underlying `struct nfs_server's:
$ mkdir /tmp/{a,b}
$ sudo mount -t nfs -o vers=3,sec=krb5 192.168.1.1:/export/a /tmp/a
$ sudo mount -t nfs -o vers=3 192.168.1.1:/export/b /tmp/b
$ df >/dev/null
df: ‘/tmp/b’: Input/output error--- fs/nfs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/super.c +1 -2
@@ -2401,8 +2401,7 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n goto Ebusy;if (a->acdirmax != b->acdirmax) goto Ebusy; -if (b->auth_info.flavor_len >0 && - clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) +if (clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) goto Ebusy;return 1 ; Ebusy:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 99/205 mmc: sdhci-xenon: Fix timeout checks
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0e6e7c2ff397e1bbebc882ca3132148aaaef1ddd ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-xenon-phy.c | 10 +++++++--- drivers/mmc/host/sdhci-xenon.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-xenon-phy.c +7 -3
@@ -357,9 +357,13 @@ static int xenon_emmc_phy_enable_dll(struct sdhci_host *host)/* Wait max 32 ms */ timeout =ktime_add_ms (ktime_get (),32 ); -while (!(sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & -XENON_DLL_LOCK_STATE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & +XENON_DLL_LOCK_STATE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Wait for DLL Lock time-out\n" );return -ETIMEDOUT ; }
drivers/mmc/host/sdhci-xenon.c +7 -3
@@ -34,9 +34,13 @@ static int xenon_enable_internal_clk(struct sdhci_host *host)sdhci_writel (host, reg,SDHCI_CLOCK_CONTROL );/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!((reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL )) - &SDHCI_CLOCK_INT_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (reg &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Internal clock never stabilised.\n" );return -ETIMEDOUT ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 137/205 hwmon: (lm80) fix a missing check of bus read in lm80 probe
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315 ]
In lm80_probe(), if lm80_read_value() fails, it returns a negative error number which is stored to data->fan[f_min] and will be further used. We should avoid using the data if the read fails.
The fix checks if lm80_read_value() fails, and if so, returns with the error number.
--- drivers/hwmon/lm80.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/hwmon/lm80.c +9 -2
@@ -628,6 +628,7 @@ static int lm80_probe(struct i2c_client *client,struct device *dev = &client->dev;struct device *hwmon_dev;struct lm80_data *data; +int rv; data =devm_kzalloc (dev,sizeof (struct lm80_data ),GFP_KERNEL );if (!data)
@@ -640,8 +641,14 @@ static int lm80_probe(struct i2c_client *client,lm80_init_client (client);/* A few vars need to be filled upon startup */ - data->fan[f_min][0 ] =lm80_read_value (client,LM80_REG_FAN_MIN (1 )); - data->fan[f_min][1 ] =lm80_read_value (client,LM80_REG_FAN_MIN (2 )); + rv =lm80_read_value (client,LM80_REG_FAN_MIN (1 )); +if (rv <0 ) +return rv; + data->fan[f_min][0 ] = rv; + rv =lm80_read_value (client,LM80_REG_FAN_MIN (2 )); +if (rv <0 ) +return rv; + data->fan[f_min][1 ] = rv; hwmon_dev =devm_hwmon_device_register_with_groups (dev, client->name, data, lm80_groups);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 139/205 crypto: ux500 - Use proper enum in cryp_set_dma_transfer
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9d880c5945c748d8edcac30965f3349a602158c4 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/crypto/ux500/cryp/cryp_core.c:559:5: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
direction, DMA_CTRL_ACK);
^~~~~~~~~
drivers/crypto/ux500/cryp/cryp_core.c:583:5: warning: implicit
conversion from enumeration type 'enum dma_data_direction' to different
enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
direction,
^~~~~~~~~2 warnings generated.
dmaengine_prep_slave_sg expects an enum from dma_transfer_direction. Because we know the value of the dma_data_direction enum from the switch statement, we can just use the proper value from dma_transfer_direction so there is no more conversion.
DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2
--- drivers/crypto/ux500/cryp/cryp_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/ux500/cryp/cryp_core.c +2 -2
@@ -555,7 +555,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, desc =dmaengine_prep_slave_sg (channel, ctx->device->dma.sg_src, ctx->device->dma.sg_src_len, - direction,DMA_CTRL_ACK ); +DMA_MEM_TO_DEV ,DMA_CTRL_ACK );break ;case DMA_FROM_DEVICE :
@@ -579,7 +579,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, desc =dmaengine_prep_slave_sg (channel, ctx->device->dma.sg_dst, ctx->device->dma.sg_dst_len, - direction, +DMA_DEV_TO_MEM ,DMA_CTRL_ACK |DMA_PREP_INTERRUPT );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 141/205 MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0b15394475e3bcaf35ca4bf22fc55d56df67224e ]
Testing has shown, that when using mainline U-Boot on MT7688 based boards, the system may hang or crash while mounting the root-fs. The main issue here is that mainline U-Boot configures EBase to a value near the end of system memory. And with CONFIG_CPU_MIPSR2_IRQ_VI disabled, trap_init() will not allocate a new area to place the exception handler. The original value will be used and the handler will be copied to this location, which might already be used by some userspace application.
The MT7688 supports VI - its config3 register is 0x00002420, so VInt (Bit 5) is set. But without setting CONFIG_CPU_MIPSR2_IRQ_VI this bit will not be evaluated to result in "cpu_has_vi" being set. This patch now selects CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8 which results trap_init() to allocate some memory for the exception handler.
Please note that this issue was not seen with the Mediatek U-Boot version, as it does not touch EBase (stays at default of 0x8000.0000). This is strictly also not correct as the kernel (_text) resides here.
--- arch/mips/ralink/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/mips/ralink/Kconfig +1 -0
@@ -39,6 +39,7 @@ choice config SOC_MT7620 bool "MT7620/8" + select CPU_MIPSR2_IRQ_VI select HW_HAS_PCI config SOC_MT7621
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 142/205 cifs: check ntwrk_buf_start for NULL before dereferencing it
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 59a63e479ce36a3f24444c3a36efe82b78e4a8e0 ]
RHBZ: 1021460
There is an issue where when multiple threads open/close the same directory ntwrk_buf_start might end up being NULL, causing the call to smbCalcSize later to oops with a NULL deref.
The real bug is why this happens and why this can become NULL for an open cfile, which should not be allowed.
This patch tries to avoid a oops until the time when we fix the underlying issue.
--- fs/cifs/readdir.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/cifs/readdir.c +8 -1
@@ -655,7 +655,14 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,/* scan and find it */ int i;char *cur_ent; -char *end_of_smb = cfile->srch_inf.ntwrk_buf_start + +char *end_of_smb; + +if (cfile->srch_inf.ntwrk_buf_start ==NULL ) { +cifs_dbg (VFS ,"ntwrk_buf_start is NULL during readdir\n" ); +return -EIO ; + } + + end_of_smb = cfile->srch_inf.ntwrk_buf_start + server->ops->calc_smb_size ( cfile->srch_inf.ntwrk_buf_start);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 143/205 um: Avoid marking pages with "changed protection"
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8892d8545f2d0342b9c550defbfb165db237044b ]
Changing protection is a very high cost operation in UML because in addition to an extra syscall it also interrupts mmap merge sequences generated by the tlb.
While the condition is not particularly common it is worth avoiding.
--- arch/um/include/asm/pgtable.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/um/include/asm/pgtable.h +8 -1
@@ -197,12 +197,17 @@ static inline pte_t pte_mkold(pte_t pte)static inline pte_t pte_wrprotect (pte_t pte) { -pte_clear_bits (pte, _PAGE_RW); +if (likely (pte_get_bits (pte, _PAGE_RW))) +pte_clear_bits (pte, _PAGE_RW); +else +return pte;return (pte_mknewprot (pte)); }static inline pte_t pte_mkread (pte_t pte) { +if (unlikely (pte_get_bits (pte, _PAGE_USER))) +return pte;pte_set_bits (pte, _PAGE_USER);return (pte_mknewprot (pte)); }
@@ -221,6 +226,8 @@ static inline pte_t pte_mkyoung(pte_t pte)static inline pte_t pte_mkwrite (pte_t pte) { +if (unlikely (pte_get_bits (pte, _PAGE_RW))) +return pte;pte_set_bits (pte, _PAGE_RW);return (pte_mknewprot (pte)); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 144/205 niu: fix missing checks of niu_pci_eeprom_read
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 26fd962bde0b15e54234fe762d86bc0349df1de4 ]
niu_pci_eeprom_read() may fail, so we should check its return value before using the read data.
--- drivers/net/ethernet/sun/niu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/sun/niu.c +8 -2
@@ -8119,6 +8119,8 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) start +=3 ; prop_len =niu_pci_eeprom_read (np, start +4 ); +if (prop_len <0 ) +return prop_len; err =niu_pci_vpd_get_propname (np, start +5 , namebuf,64 );if (err <0 )return err;
@@ -8163,8 +8165,12 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end)netif_printk (np, probe,KERN_DEBUG , np->dev,"VPD_SCAN: Reading in property [%s] len[%d]\n" , namebuf, prop_len); -for (i =0 ; i < prop_len; i++) - *prop_buf++ =niu_pci_eeprom_read (np, off + i); +for (i =0 ; i < prop_len; i++) { + err =niu_pci_eeprom_read (np, off + i); +if (err >=0 ) + *prop_buf = err; + ++prop_buf; + } } start += len;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 118/205 drbd: narrow rcu_read_lock in drbd_sync_handshake
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d29e89e34952a9ad02c77109c71a80043544296e ]
So far there was the possibility that we called genlmsg_new(GFP_NOIO)/mutex_lock() while holding an rcu_read_lock().
This included cases like:
drbd_sync_handshake (acquire the RCU lock)
drbd_asb_recover_1p
drbd_khelper
drbd_bcast_event
genlmsg_new(GFP_NOIO) --> may sleepdrbd_sync_handshake (acquire the RCU lock)
drbd_asb_recover_1p
drbd_khelper
notify_helper
genlmsg_new(GFP_NOIO) --> may sleepdrbd_sync_handshake (acquire the RCU lock)
drbd_asb_recover_1p
drbd_khelper
notify_helper
mutex_lock --> may sleepWhile using GFP_ATOMIC whould have been possible in the first two cases, the real fix is to narrow the rcu_read_lock.
--- drivers/block/drbd/drbd_receiver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/block/drbd/drbd_receiver.c +6 -5
@@ -3361,7 +3361,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device,enum drbd_conns rv =C_MASK ;enum drbd_disk_state mydisk;struct net_conf *nc; -int hg, rule_nr, rr_conflict, tentative; +int hg, rule_nr, rr_conflict, tentative, always_asbp; mydisk = device->state.disk;if (mydisk ==D_NEGOTIATING )
@@ -3412,8 +3412,12 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device,rcu_read_lock (); nc =rcu_dereference (peer_device->connection->net_conf); + always_asbp = nc->always_asbp; + rr_conflict = nc->rr_conflict; + tentative = nc->tentative; +rcu_read_unlock (); -if (hg ==100 || (hg ==-100 && nc->always_asbp)) { +if (hg ==100 || (hg ==-100 && always_asbp)) {int pcount = (device->state.role ==R_PRIMARY ) + (peer_role ==R_PRIMARY );int forced = (hg ==-100 );
@@ -3452,9 +3456,6 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device,"Sync from %s node\n" , (hg < 0) ? "peer" : "this"); } - rr_conflict = nc->rr_conflict; - tentative = nc->tentative; -rcu_read_unlock ();if (hg ==-100 ) {/* FIXME this log message is not correct if we end up here
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 146/205 cgroup: fix parsing empty mount option string
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e250d91d65750a0c0c62483ac4f9f357e7317617 ]
This fixes the case where all mount options specified are consumed by an LSM and all that's left is an empty string. In this case cgroupfs should accept the string and not fail.
How to reproduce (with SELinux enabled):
# umount /sys/fs/cgroup/unified
# mount -o context=system_u:object_r:cgroup_t:s0 -t cgroup2 cgroup2 /sys/fs/cgroup/unified
mount: /sys/fs/cgroup/unified: wrong fs type, bad option, bad superblock on cgroup2, missing codepage or helper program, or other error.
# dmesg | tail -n 1
[ 31.575952] cgroup: cgroup2: unknown option ""--- kernel/cgroup/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup/cgroup.c +1 -1
@@ -1692,7 +1692,7 @@ static int parse_cgroup_root_flags(char *data, unsigned int *root_flags) *root_flags =0 ; -if (!data) +if (!data || *data =='\0' )return 0 ;while ((token =strsep (&data,"," )) !=NULL ) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 148/205 ocfs2: dont clear bh uptodate for block read
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 70306d9dce75abde855cefaf32b3f71eed8602a3 ]
For sync io read in ocfs2_read_blocks_sync(), first clear bh uptodate flag and submit the io, second wait io done, last check whether bh uptodate, if not return io error.
If two sync io for the same bh were issued, it could be the first io done and set uptodate flag, but just before check that flag, the second io came in and cleared uptodate, then ocfs2_read_blocks_sync() for the first io will return IO error.
Indeed it's not necessary to clear uptodate flag, as the io end handler end_buffer_read_sync() will set or clear it based on io succeed or failed.
The following message was found from a nfs server but the underlying storage returned no error.
[4106438.567376] (nfsd,7146,3):ocfs2_get_suballoc_slot_bit:2780 ERROR: read block 1238823695 failed -5 [4106438.567569] (nfsd,7146,3):ocfs2_get_suballoc_slot_bit:2812 ERROR: status = -5 [4106438.567611] (nfsd,7146,3):ocfs2_test_inode_bit:2894 ERROR: get alloc slot and bit failed -5 [4106438.567643] (nfsd,7146,3):ocfs2_test_inode_bit:2932 ERROR: status = -5 [4106438.567675] (nfsd,7146,3):ocfs2_get_dentry:94 ERROR: test inode bit failed -5
Same issue in non sync read ocfs2_read_blocks(), fixed it as well.
--- fs/ocfs2/buffer_head_io.c | 2 -- 1 file changed, 2 deletions(-)
fs/ocfs2/buffer_head_io.c +0 -2
@@ -152,7 +152,6 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,#endif } -clear_buffer_uptodate (bh);get_bh (bh);/* for end_buffer_read_sync() */ bh->b_end_io = end_buffer_read_sync;submit_bh (REQ_OP_READ ,0 , bh);
@@ -306,7 +305,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,continue ; } -clear_buffer_uptodate (bh);get_bh (bh);/* for end_buffer_read_sync() */ if (validate)set_buffer_needs_validate (bh);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 120/205 drbd: skip spurious timeout (ping-timeo) when failing promote
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9848b6ddd8c92305252f94592c5e278574e7a6ac ]
If you try to promote a Secondary while connected to a Primary and allow-two-primaries is NOT set, we will wait for "ping-timeout" to give this node a chance to detect a dead primary,
in case the cluster manager noticed faster than we did.
But if we then are *still* connected to a Primary, we fail (after an additional timeout of ping-timout).
This change skips the spurious second timeout.
Most people won't notice really,
since "ping-timeout" by default is half a second.
But in some installations, ping-timeout may be 10 or 20 seconds or more, and spuriously delaying the error return becomes annoying.
--- drivers/block/drbd/drbd_nl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/block/drbd/drbd_nl.c +8 -7
@@ -668,14 +668,15 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int forif (rv ==SS_TWO_PRIMARIES ) {/* Maybe the peer is detected as dead very soon... retry at most once more in this case. */ -int timeo; -rcu_read_lock (); - nc =rcu_dereference (connection->net_conf); - timeo = nc ? (nc->ping_timeo +1 ) *HZ /10 :1 ; -rcu_read_unlock (); -schedule_timeout_interruptible (timeo); -if (try < max_tries) +if (try < max_tries) { +int timeo; try = max_tries -1 ; +rcu_read_lock (); + nc =rcu_dereference (connection->net_conf); + timeo = nc ? (nc->ping_timeo +1 ) *HZ /10 :1 ; +rcu_read_unlock (); +schedule_timeout_interruptible (timeo); + }continue ; }if (rv <SS_SUCCESS ) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 121/205 drbd: Avoid Clang warning about pointless switch statment
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a52c5a16cf19d8a85831bb1b915a221dd4ffae3c ]
There are several warnings from Clang about no case statement matching the constant 0:
In file included from drivers/block/drbd/drbd_receiver.c:48:
In file included from drivers/block/drbd/drbd_int.h:48:
In file included from ./include/linux/drbd_genl_api.h:54:
In file included from ./include/linux/genl_magic_struct.h:236:./include/linux/drbd_genl.h:321:1: warning: no case matching constant switch condition '0'
GENL_struct(DRBD_NLA_HELPER, 24, drbd_helper_info, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/genl_magic_struct.h:220:10: note: expanded from macro 'GENL_struct'
switch (0) {
^Silence this warning by adding a 'case 0:' statement. Additionally, adjust the alignment of the statements in the ct_assert_unique macro to avoid a checkpatch warning.
This solution was originally sent by Arnd Bergmann with a default case
statement: https://lore.kernel.org/patchwork/patch/756723/
--- include/linux/genl_magic_struct.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/linux/genl_magic_struct.h +4 -1
@@ -191,6 +191,7 @@ static inline void ct_assert_unique_operations(void) {switch (0 ) {#include GENL_MAGIC_INCLUDE_FILE +case 0 : ; } }
@@ -209,6 +210,7 @@ static inline void ct_assert_unique_top_level_attributes(void) {switch (0 ) {#include GENL_MAGIC_INCLUDE_FILE +case 0 : ; } }
@@ -218,7 +220,8 @@ static inline void ct_assert_unique_top_level_attributes(void) static inline void ct_assert_unique_ ## s_name ## _attributes(void) \ { \ switch (0) { \ - s_fields \ + s_fields \ + case 0: \ ; \ } \ }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 122/205 video: clps711x-fb: release disp device node in probe()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fdac751355cd76e049f628afe6acb8ff4b1399f7 ]
clps711x_fb_probe() increments refcnt of disp device node by of_parse_phandle() and leaves it undecremented on both successful and error paths.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/video/fbdev/clps711x-fb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/video/fbdev/clps711x-fb.c +4 -1
@@ -287,14 +287,17 @@ static int clps711x_fb_probe(struct platform_device *pdev) } ret =of_get_fb_videomode (disp, &cfb->mode,OF_USE_NATIVE_MODE ); -if (ret) +if (ret) { +of_node_put (disp); goto out_fb_release; + }of_property_read_u32 (disp,"ac-prescale" , &cfb->ac_prescale); cfb->cmap_invert =of_property_read_bool (disp,"cmap-invert" ); ret =of_property_read_u32 (disp,"bits-per-pixel" , &info->var.bits_per_pixel); +of_node_put (disp);if (ret) goto out_fb_release;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 124/205 fbdev: fbmem: behave better with small rotated displays and many CPUs
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f75df8d4b4fabfad7e3cba2debfad12741c6fde7 ]
Blitting an image with "negative" offsets is not working since there is no clipping. It hopefully just crashes. For the bootup logo, there is protection so that blitting does not happen as the image is drawn further and further to the right (ROTATE_UR) or further and further down (ROTATE_CW). There is however no protection when drawing in the opposite directions (ROTATE_UD and ROTATE_CCW).
Add back this protection.
The regression is 20-odd years old but the mindless warning-killing mentality displayed in commit 34bdb666f4b2 ("fbdev: fbmem: remove positive test on unsigned values") is also to blame, methinks.
--- drivers/video/fbdev/core/fbmem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fbmem.c +6 -2
@@ -435,7 +435,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dx += image->width +8 ; } }else if (rotate ==FB_ROTATE_UD ) { -for (x =0 ; x < num; x++) { +u32 dx = image->dx; + +for (x =0 ; x < num && image->dx <= dx; x++) { info->fbops->fb_imageblit (info, image); image->dx -= image->width +8 ; }
@@ -447,7 +449,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dy += image->height +8 ; } }else if (rotate ==FB_ROTATE_CCW ) { -for (x =0 ; x < num; x++) { +u32 dy = image->dy; + +for (x =0 ; x < num && image->dy <= dy; x++) { info->fbops->fb_imageblit (info, image); image->dy -= image->height +8 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 115/205 scsi: smartpqi: increase fw status register read timeout
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 65111785acccb836ec75263b03b0e33f21e74f47 ]
Problem:
- during the driver initialization, driver will poll fw for KERNEL_UP in a 30 seconds timeout.
- if the firmware is not ready after 30 seconds,
driver will not be loaded.
Fix:
- change timeout from 30 seconds to 3 minutes.
--- drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_sis.c +1 -1
@@ -59,7 +59,7 @@#define SIS_CTRL_KERNEL_UP 0x80#define SIS_CTRL_KERNEL_PANIC 0x100 -#define SIS_CTRL_READY_TIMEOUT_SECS 30 +#define SIS_CTRL_READY_TIMEOUT_SECS 180#define SIS_CTRL_READY_RESUME_TIMEOUT_SECS 90#define SIS_CTRL_READY_POLL_INTERVAL_MSECS 10
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 150/205 isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug in HFCPCI_l1hw()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7418e6520f22a2e35815122fa5a53d5bbfa2c10f ]
In drivers/isdn/hisax/hfc_pci.c, the functions hfcpci_interrupt() and HFCPCI_l1hw() may be concurrently executed.
HFCPCI_l1hw()
line 1173: if (!cs->tx_skb)
hfcpci_interrupt()
line 942: spin_lock_irqsave();
line 1066: dev_kfree_skb_irq(cs->tx_skb);
Thus, a possible concurrency use-after-free bug may occur in HFCPCI_l1hw().
To fix these bugs, the calls to spin_lock_irqsave() and spin_unlock_irqrestore() are added in HFCPCI_l1hw(), to protect the access to cs->tx_skb.
--- drivers/isdn/hisax/hfc_pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/isdn/hisax/hfc_pci.c +2 -0
@@ -1169,11 +1169,13 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg)if (cs->debug &L1_DEB_LAPD )debugl1 (cs,"-> PH_REQUEST_PULL" );#endif +spin_lock_irqsave (&cs->lock, flags);if (!cs->tx_skb) {test_and_clear_bit (FLG_L1_PULL_REQ , &st->l1.Flags); st->l1.l1l2 (st,PH_PULL |CONFIRM ,NULL ); }else test_and_set_bit (FLG_L1_PULL_REQ , &st->l1.Flags); +spin_unlock_irqrestore (&cs->lock, flags);break ;case (HW_RESET |REQUEST ):spin_lock_irqsave (&cs->lock, flags);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 159/205 kernel/hung_task.c: break RCU locks based on jiffies
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 304ae42739b108305f8d7b3eb3c1aec7c2b643a9 ]
check_hung_uninterruptible_tasks() is currently calling rcu_lock_break() for every 1024 threads. But check_hung_task() is very slow if printk() was called, and is very fast otherwise.
If many threads within some 1024 threads called printk(), the RCU grace period might be extended enough to trigger RCU stall warnings. Therefore, calling rcu_lock_break() for every some fixed jiffies will be safer.
--- kernel/hung_task.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/hung_task.c +4 -4
@@ -33,7 +33,7 @@ int __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;* is disabled during the critical section. It also controls the size of * the RCU grace period. So it needs to be upper-bound. */ -#define HUNG_TASK_BATCHING 1024 +#define HUNG_TASK_LOCK_BREAK (HZ / 10)/* * Zero means infinite timeout - no checking done:
@@ -164,7 +164,7 @@ static bool rcu_lock_break(struct task_struct *g, struct task_struct *t)static void check_hung_uninterruptible_tasks (unsigned long timeout) {int max_count = sysctl_hung_task_check_count; -int batch_count =HUNG_TASK_BATCHING ; +unsigned long last_break = jiffies;struct task_struct *g, *t;/*
@@ -179,10 +179,10 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout)for_each_process_thread (g, t) {if (!max_count--) goto unlock; -if (!--batch_count) { - batch_count =HUNG_TASK_BATCHING ; +if (time_after (jiffies, last_break +HUNG_TASK_LOCK_BREAK )) {if (!rcu_lock_break (g, t)) goto unlock; + last_break = jiffies; }/* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ if (t->state ==TASK_UNINTERRUPTIBLE )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 160/205 proc/sysctl: fix return error for proc_doulongvec_minmax()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 09be178400829dddc1189b50a7888495dd26aa84 ]
If the number of input parameters is less than the total parameters, an EINVAL error will be returned.
For example, we use proc_doulongvec_minmax to pass up to two parameters with kern_table:
{
.procname = "monitor_signals", .data = &monitor_sigs, .maxlen = 2*sizeof(unsigned long), .mode = 0644, .proc_handler = proc_doulongvec_minmax,
},
Reproduce:
When passing two parameters, it's work normal. But passing only one parameter, an error "Invalid argument"(EINVAL) is returned.
[root@cl150 ~]# echo 1 2 > /proc/sys/kernel/monitor_signals [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals
1 2
[root@cl150 ~]# echo 3 > /proc/sys/kernel/monitor_signals -bash: echo: write error: Invalid argument [root@cl150 ~]# echo $?
1
[root@cl150 ~]# cat /proc/sys/kernel/monitor_signals
3 2
[root@cl150 ~]#
The following is the result after apply this patch. No error is returned when the number of input parameters is less than the total parameters.
[root@cl150 ~]# echo 1 2 > /proc/sys/kernel/monitor_signals [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals
1 2
[root@cl150 ~]# echo 3 > /proc/sys/kernel/monitor_signals [root@cl150 ~]# echo $?
0
[root@cl150 ~]# cat /proc/sys/kernel/monitor_signals
3 2
[root@cl150 ~]#
There are three processing functions dealing with digital parameters, __do_proc_dointvec/__do_proc_douintvec/__do_proc_doulongvec_minmax.
This patch deals with __do_proc_doulongvec_minmax, just as __do_proc_dointvec does, adding a check for parameters 'left'. In __do_proc_douintvec, its code implementation explicitly does not support multiple inputs.
static int __do_proc_douintvec(...){
...
/*
* Arrays are not supported, keep this simple. *Do not* add
* support for them.
*/
if (vleft != 1) {
*lenp = 0;
return -EINVAL;
}
...
}So, just __do_proc_doulongvec_minmax has the problem. And most use of proc_doulongvec_minmax/proc_doulongvec_ms_jiffies_minmax just have one parameter.
--- kernel/sysctl.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sysctl.c +2 -0
@@ -2708,6 +2708,8 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, intbool neg; left -=proc_skip_spaces (&p); +if (!left) +break ; err = proc_get_long(&p, &left, &val, &neg, proc_wspace_sep,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 162/205 fs/epoll: drop ovflist branch prediction
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 76699a67f3041ff4c7af6d6ee9be2bfbf1ffb671 ]
The ep->ovflist is a secondary ready-list to temporarily store events that might occur when doing sproc without holding the ep->wq.lock. This accounts for every time we check for ready events and also send events back to userspace; both callbacks, particularly the latter because of copy_to_user, can account for a non-trivial time.
As such, the unlikely() check to see if the pointer is being used, seems both misleading and sub-optimal. In fact, we go to an awful lot of trouble to sync both lists, and populating the ovflist is far from an uncommon scenario.
For example, profiling a concurrent epoll_wait(2) benchmark, with CONFIG_PROFILE_ANNOTATED_BRANCHES shows that for a two threads a 33% incorrect rate was seen; and when incrementally increasing the number of epoll instances (which is used, for example for multiple queuing load balancing models), up to a 90% incorrect rate was seen.
Similarly, by deleting the prediction, 3% throughput boost was seen across incremental threads.
--- fs/eventpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/eventpoll.c +1 -1
@@ -1167,7 +1167,7 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v* semantics). All the events that happen during that period of time are * chained in ep->ovflist and requeued later on. */ -if (unlikely (ep->ovflist !=EP_UNACTIVE_PTR )) { +if (ep->ovflist !=EP_UNACTIVE_PTR ) {if (epi->next ==EP_UNACTIVE_PTR ) { epi->next = ep->ovflist; ep->ovflist = epi;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 163/205 exec: load_script: dont blindly truncate shebang string
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8099b047ecc431518b9bb6bdbba3549bbecdc343 ]
load_script() simply truncates bprm->buf and this is very wrong if the length of shebang string exceeds BINPRM_BUF_SIZE-2. This can silently truncate i_arg or (worse) we can execute the wrong binary if buf[2:126] happens to be the valid executable path.
Change load_script() to return ENOEXEC if it can't find '\n' or zero in bprm->buf. Note that '\0' can come from either prepare_binprm()->memset() or from kernel_read(), we do not care.
--- fs/binfmt_script.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/binfmt_script.c +7 -3
@@ -42,10 +42,14 @@ static int load_script(struct linux_binprm *bprm)fput (bprm->file); bprm->file =NULL ; - bprm->buf[BINPRM_BUF_SIZE -1 ] ='\0' ; -if ((cp =strchr (bprm->buf,'\n' )) ==NULL ) - cp = bprm->buf+BINPRM_BUF_SIZE -1 ; +for (cp = bprm->buf+2 ;; cp++) { +if (cp >= bprm->buf +BINPRM_BUF_SIZE ) +return -ENOEXEC ; +if (!*cp || (*cp =='\n' )) +break ; + } *cp ='\0' ; +while (cp > bprm->buf) { cp--;if ((*cp ==' ' ) || (*cp =='\t' ))
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 164/205 scripts/gdb: fix lx-version string output
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b058809bfc8faeb7b7cae047666e23375a060059 ]
A bug is present in GDB which causes early string termination when parsing variables. This has been reported [0], but we should ensure that we can support at least basic printing of the core kernel strings.
For current gdb version (has been tested with 7.3 and 8.1), 'lx-version' only prints one character.
(gdb) lx-version
L(gdb)
This can be fixed by casting 'linux_banner' as (char *).
(gdb) lx-version
Linux version 4.19.0-rc1+ (changbin@acer) (gcc version 7.3.0 (Ubuntu 7.3.0-16ubuntu3)) #21 SMP Sat Sep 1 21:43:30 CST 2018
[0] https://sourceware.org/bugzilla/show_bug.cgi?id=20077
--- scripts/gdb/linux/proc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/gdb/linux/proc.py +1 -1
@@ -41,7 +41,7 @@ class LxVersion(gdb.Command): def invoke(self, arg, from_tty): # linux_banner should contain a newline - gdb.write(gdb.parse_and_eval("linux_banner").string()) + gdb.write(gdb.parse_and_eval("(char *)linux_banner").string()) LxVersion()
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 165/205 thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eduardo Valentin <[email protected]>
commit 03334ba8b425b2ad275c8f390cf83c7b081c3095 upstream.
Avoid warnings like this:
thermal_hwmon.h:29:1: warning: ‘thermal_remove_hwmon_sysfs’ defined but not used [-Wunused-function]
thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
--- drivers/thermal/thermal_hwmon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/thermal_hwmon.h +2 -2
@@ -34,13 +34,13 @@int thermal_add_hwmon_sysfs (struct thermal_zone_device *tz);void thermal_remove_hwmon_sysfs (struct thermal_zone_device *tz);#else -static int +static inline int thermal_add_hwmon_sysfs (struct thermal_zone_device *tz) {return 0 ; } -static void +static inline void thermal_remove_hwmon_sysfs (struct thermal_zone_device *tz) { }
Greg Kroah-Hartman
maintainerPATCH 167/205 enic: fix checksum validation for IPv6
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Govindarajulu Varadarajan <[email protected]>
[ Upstream commit 7596175e99b3d4bce28022193efd954c201a782a ]
In case of IPv6 pkts, ipv4_csum_ok is 0. Because of this, driver does not set skb->ip_summed. So IPv6 rx checksum is not offloaded.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/cisco/enic/enic_main.c +2 -1
@@ -1393,7 +1393,8 @@ static void enic_rq_indicate_buf(struct* csum is correct or is zero. */ if ((netdev->features &NETIF_F_RXCSUM ) && !csum_not_calc && - tcp_udp_csum_ok && ipv4_csum_ok && outer_csum_ok) { + tcp_udp_csum_ok && outer_csum_ok && + (ipv4_csum_ok || ipv6)) { skb->ip_summed =CHECKSUM_UNNECESSARY ; skb->csum_level = encap; }
Greg Kroah-Hartman
maintainerPATCH 168/205 net: dp83640: expire old TX-skb
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 53bc8d2af08654659abfadfd3e98eb9922ff787c ]
During sendmsg() a cloned skb is saved via dp83640_txtstamp() in ->tx_queue. After the NIC sends this packet, the PHY will reply with a timestamp for that TX packet. If the cable is pulled at the right time I don't see that packet. It might gets flushed as part of queue shutdown on NIC's side.
Once the link is up again then after the next sendmsg() we enqueue another skb in dp83640_txtstamp() and have two on the list. Then the PHY will send a reply and decode_txts() attaches it to the first skb on the list.
No crash occurs since refcounting works but we are one packet behind. linuxptp/ptp4l usually closes the socket and opens a new one (in such a timeout case) so those "stale" replies never get there. However it does not resume normal operation anymore.
Purge old skbs in decode_txts().
--- drivers/net/phy/dp83640.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/phy/dp83640.c +10 -3
@@ -893,14 +893,14 @@ static void decode_txts(struct dp83640_p struct phy_txts *phy_txts) {struct skb_shared_hwtstamps shhwtstamps; +struct dp83640_skb_info *skb_info;struct sk_buff *skb; -u64 ns;u8 overflow; +u64 ns;/* We must already have the skb that triggered this. */ - +again: skb =skb_dequeue (&dp83640->tx_queue); -if (!skb) {pr_debug ("have timestamp but tx_queue empty\n" );return ;
@@ -915,6 +915,11 @@ static void decode_txts(struct dp83640_p }return ; } + skb_info = (struct dp83640_skb_info *)skb->cb; +if (time_after (jiffies, skb_info->tmo)) { +kfree_skb (skb); + goto again; + } ns =phy2txts (phy_txts);memset (&shhwtstamps,0 ,sizeof (shhwtstamps));
@@ -1466,6 +1471,7 @@ static bool dp83640_rxtstamp(struct phy_static void dp83640_txtstamp (struct phy_device *phydev,struct sk_buff *skb,int type) { +struct dp83640_skb_info *skb_info = (struct dp83640_skb_info *)skb->cb;struct dp83640_private *dp83640 = phydev->priv;switch (dp83640->hwts_tx_en) {
@@ -1478,6 +1484,7 @@ static void dp83640_txtstamp(struct phy_/* fall through */ case HWTSTAMP_TX_ON :skb_shinfo (skb)->tx_flags |=SKBTX_IN_PROGRESS ; + skb_info->tmo = jiffies +SKB_TIMESTAMP_TIMEOUT ;skb_queue_tail (&dp83640->tx_queue, skb);break ;
Greg Kroah-Hartman
maintainerPATCH 151/205 gdrom: fix a memory leak bug
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 093c48213ee37c3c3ff1cf5ac1aa2a9d8bc66017 ]
In probe_gdrom(), the buffer pointed by 'gd.cd_info' is allocated through kzalloc() and is used to hold the information of the gdrom device. To register and unregister the device, the pointer 'gd.cd_info' is passed to the functions register_cdrom() and unregister_cdrom(), respectively. However, this buffer is not freed after it is used, which can cause a memory leak bug.
This patch simply frees the buffer 'gd.cd_info' in exit_gdrom() to fix the above issue.
--- drivers/cdrom/gdrom.c | 1 + 1 file changed, 1 insertion(+)
drivers/cdrom/gdrom.c +1 -0
@@ -889,6 +889,7 @@ static void __exit exit_gdrom(void)platform_device_unregister (pd);platform_driver_unregister (&gdrom_driver);kfree (gd.toc); +kfree (gd.cd_info); }module_init (init_gdrom);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 169/205 rxrpc: bad unlock balance in rxrpc_recvmsg
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 6dce3c20ac429e7a651d728e375853370c796e8d ]
When either "goto wait_interrupted;" or "goto wait_error;" paths are taken, socket lock has already been released.
This patch fixes following syzbot splat :
WARNING: bad unlock balance detected!
5.0.0-rc4+ #59 Not tainted
-------------------------------------
syz-executor223/8256 is trying to release lock (sk_lock-AF_RXRPC) at:
[<ffffffff86651353>] rxrpc_recvmsg+0x6d3/0x3099 net/rxrpc/recvmsg.c:598 but there are no more locks to release!
other info that might help us debug this:
1 lock held by syz-executor223/8256:
#0: 00000000fa9ed0f4 (slock-AF_RXRPC){+...}, at: spin_lock_bh include/linux/spinlock.h:334 [inline] #0: 00000000fa9ed0f4 (slock-AF_RXRPC){+...}, at: release_sock+0x20/0x1c0 net/core/sock.c:2798
stack backtrace: CPU: 1 PID: 8256 Comm: syz-executor223 Not tainted 5.0.0-rc4+ #59 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x172/0x1f0 lib/dump_stack.c:113 print_unlock_imbalance_bug kernel/locking/lockdep.c:3391 [inline] print_unlock_imbalance_bug.cold+0x114/0x123 kernel/locking/lockdep.c:3368 __lock_release kernel/locking/lockdep.c:3601 [inline] lock_release+0x67e/0xa00 kernel/locking/lockdep.c:3860 sock_release_ownership include/net/sock.h:1471 [inline] release_sock+0x183/0x1c0 net/core/sock.c:2808 rxrpc_recvmsg+0x6d3/0x3099 net/rxrpc/recvmsg.c:598 sock_recvmsg_nosec net/socket.c:794 [inline] sock_recvmsg net/socket.c:801 [inline] sock_recvmsg+0xd0/0x110 net/socket.c:797 __sys_recvfrom+0x1ff/0x350 net/socket.c:1845 __do_sys_recvfrom net/socket.c:1863 [inline] __se_sys_recvfrom net/socket.c:1859 [inline] __x64_sys_recvfrom+0xe1/0x1a0 net/socket.c:1859 do_syscall_64+0x103/0x610 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x446379 Code: e8 2c b3 02 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 2b 09 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fe5da89fd98 EFLAGS: 00000246 ORIG_RAX: 000000000000002d RAX: ffffffffffffffda RBX: 00000000006dbc28 RCX: 0000000000446379 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003 RBP: 00000000006dbc20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006dbc2c R13: 0000000000000000 R14: 0000000000000000 R15: 20c49ba5e353f7cf
--- net/rxrpc/recvmsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/rxrpc/recvmsg.c +2 -1
@@ -588,6 +588,7 @@ error_requeue_call: } error_no_call:release_sock (&rx->sk); +error_trace:trace_rxrpc_recvmsg (call, rxrpc_recvmsg_return,0 ,0 ,0 , ret);return ret;
@@ -596,7 +597,7 @@ wait_interrupted: wait_error:finish_wait (sk_sleep (&rx->sk), &wait); call =NULL ; - goto error_no_call; + goto error_trace; }/**
Greg Kroah-Hartman
maintainerPATCH 170/205 skge: potential memory corruption in skge_get_regs()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 294c149a209c6196c2de85f512b52ef50f519949 ]
The "p" buffer is 0x4000 bytes long. B3_RI_WTO_R1 is 0x190. The value of "regs->len" is in the 1-0x4000 range. The bug here is that "regs->len - B3_RI_WTO_R1" can be a negative value which would lead to memory corruption and an abrupt crash.
--- drivers/net/ethernet/marvell/skge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/skge.c +4 -2
@@ -152,8 +152,10 @@ static void skge_get_regs(struct net_devmemset (p,0 , regs->len);memcpy_fromio (p, io,B3_RAM_ADDR ); -memcpy_fromio (p +B3_RI_WTO_R1 , io +B3_RI_WTO_R1 , - regs->len -B3_RI_WTO_R1 ); +if (regs->len >B3_RI_WTO_R1 ) { +memcpy_fromio (p +B3_RI_WTO_R1 , io +B3_RI_WTO_R1 , + regs->len -B3_RI_WTO_R1 ); + } }/* Wake on Lan only supported on Yukon chips with rev 1 or above */
Greg Kroah-Hartman
maintainerPATCH 171/205 rds: fix refcount bug in rds_sock_addref
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 6fa19f5637a6c22bc0999596bcc83bdcac8a4fa6 ]
syzbot was able to catch a bug in rds [1]
The issue here is that the socket might be found in a hash table but that its refcount has already be set to 0 by another cpu.
We need to use refcount_inc_not_zero() to be safe here.
[1]
refcount_t: increment on 0; use-after-free.
WARNING: CPU: 1 PID: 23129 at lib/refcount.c:153 refcount_inc_checked lib/refcount.c:153 [inline] WARNING: CPU: 1 PID: 23129 at lib/refcount.c:153 refcount_inc_checked+0x61/0x70 lib/refcount.c:151 Kernel panic - not syncing: panic_on_warn set ... CPU: 1 PID: 23129 Comm: syz-executor3 Not tainted 5.0.0-rc4+ #53 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1db/0x2d0 lib/dump_stack.c:113 panic+0x2cb/0x65c kernel/panic.c:214 __warn.cold+0x20/0x48 kernel/panic.c:571 report_bug+0x263/0x2b0 lib/bug.c:186 fixup_bug arch/x86/kernel/traps.c:178 [inline] fixup_bug arch/x86/kernel/traps.c:173 [inline] do_error_trap+0x11b/0x200 arch/x86/kernel/traps.c:271 do_invalid_op+0x37/0x50 arch/x86/kernel/traps.c:290 invalid_op+0x14/0x20 arch/x86/entry/entry_64.S:973 RIP: 0010:refcount_inc_checked lib/refcount.c:153 [inline] RIP: 0010:refcount_inc_checked+0x61/0x70 lib/refcount.c:151 Code: 1d 51 63 c8 06 31 ff 89 de e8 eb 1b f2 fd 84 db 75 dd e8 a2 1a f2 fd 48 c7 c7 60 9f 81 88 c6 05 31 63 c8 06 01 e8 af 65 bb fd <0f> 0b eb c1 90 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 41 54 49 RSP: 0018:ffff8880a0cbf1e8 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffc90006113000 RDX: 000000000001047d RSI: ffffffff81685776 RDI: 0000000000000005 RBP: ffff8880a0cbf1f8 R08: ffff888097c9e100 R09: ffffed1015ce5021 R10: ffffed1015ce5020 R11: ffff8880ae728107 R12: ffff8880723c20c0 R13: ffff8880723c24b0 R14: dffffc0000000000 R15: ffffed1014197e64 sock_hold include/net/sock.h:647 [inline] rds_sock_addref+0x19/0x20 net/rds/af_rds.c:675 rds_find_bound+0x97c/0x1080 net/rds/bind.c:82 rds_recv_incoming+0x3be/0x1430 net/rds/recv.c:362 rds_loop_xmit+0xf3/0x2a0 net/rds/loop.c:96 rds_send_xmit+0x1355/0x2a10 net/rds/send.c:355 rds_sendmsg+0x323c/0x44e0 net/rds/send.c:1368 sock_sendmsg_nosec net/socket.c:621 [inline] sock_sendmsg+0xdd/0x130 net/socket.c:631 __sys_sendto+0x387/0x5f0 net/socket.c:1788 __do_sys_sendto net/socket.c:1800 [inline] __se_sys_sendto net/socket.c:1796 [inline] __x64_sys_sendto+0xe1/0x1a0 net/socket.c:1796 do_syscall_64+0x1a3/0x800 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x458089 Code: 6d b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 3b b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fc266df8c78 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 0000000000000006 RCX: 0000000000458089 RDX: 0000000000000000 RSI: 00000000204b3fff RDI: 0000000000000005 RBP: 000000000073bf00 R08: 00000000202b4000 R09: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fc266df96d4 R13: 00000000004c56e4 R14: 00000000004d94a8 R15: 00000000ffffffff
--- net/rds/bind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/rds/bind.c +3 -3
@@ -62,10 +62,10 @@ struct rds_sock *rds_find_bound(__be32 arcu_read_lock (); rs =rhashtable_lookup (&bind_hash_table, &key, ht_parms); -if (rs && !sock_flag (rds_rs_to_sk (rs),SOCK_DEAD )) -rds_sock_addref (rs); -else +if (rs && (sock_flag (rds_rs_to_sk (rs),SOCK_DEAD ) || + !refcount_inc_not_zero (&rds_rs_to_sk (rs)->sk_refcnt))) rs =NULL ; +rcu_read_unlock (); rdsdebug("returning rs %p for %pI4:%u\n", rs, &addr,
Greg Kroah-Hartman
maintainerPATCH 174/205 net: dsa: slave: Dont propagate flag changes on down slave interfaces
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rundong Ge <[email protected]>
[ Upstream commit 17ab4f61b8cd6f9c38e9d0b935d86d73b5d0d2b5 ]
The unbalance of master's promiscuity or allmulti will happen after ifdown and ifup a slave interface which is in a bridge.
When we ifdown a slave interface , both the 'dsa_slave_close' and 'dsa_slave_change_rx_flags' will clear the master's flags. The flags of master will be decrease twice.
In the other hand, if we ifup the slave interface again, since the slave's flags were cleared the 'dsa_slave_open' won't set the master's flag, only 'dsa_slave_change_rx_flags' that triggered by 'br_add_if' will set the master's flags. The flags of master is increase once.
Only propagating flag changes when a slave interface is up makes sure this does not happen. The 'vlan_dev_change_rx_flags' had the same problem and was fixed, and changes here follows that fix.
--- net/dsa/slave.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/dsa/slave.c +8 -4
@@ -156,10 +156,14 @@ static void dsa_slave_change_rx_flags(ststruct dsa_slave_priv *p =netdev_priv (dev);struct net_device *master =dsa_master_netdev (p); -if (change &IFF_ALLMULTI ) -dev_set_allmulti (master, dev->flags &IFF_ALLMULTI ?1 :-1 ); -if (change &IFF_PROMISC ) -dev_set_promiscuity (master, dev->flags &IFF_PROMISC ?1 :-1 ); +if (dev->flags &IFF_UP ) { +if (change &IFF_ALLMULTI ) +dev_set_allmulti (master, + dev->flags &IFF_ALLMULTI ?1 :-1 ); +if (change &IFF_PROMISC ) +dev_set_promiscuity (master, + dev->flags &IFF_PROMISC ?1 :-1 ); + } }static void dsa_slave_set_rx_mode (struct net_device *dev)
Greg Kroah-Hartman
maintainerPATCH 172/205 net: systemport: Fix WoL with password after deep sleep
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit 8dfb8d2cceb76b74ad5b58cc65c75994329b4d5e ]
Broadcom STB chips support a deep sleep mode where all register contents are lost. Because we were stashing the MagicPacket password into some of these registers a suspend into that deep sleep then a resumption would not lead to being able to wake-up from MagicPacket with password again.
Fix this by keeping a software copy of the password and program it during suspend.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 25 ++++++++++--------------- drivers/net/ethernet/broadcom/bcmsysport.h | 2 ++ 2 files changed, 12 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/bcmsysport.c +10 -15
@@ -519,7 +519,6 @@ static void bcm_sysport_get_wol(struct n struct ethtool_wolinfo *wol) {struct bcm_sysport_priv *priv =netdev_priv (dev); -u32 reg; wol->supported =WAKE_MAGIC |WAKE_MAGICSECURE ; wol->wolopts = priv->wolopts;
@@ -527,11 +526,7 @@ static void bcm_sysport_get_wol(struct nif (!(priv->wolopts &WAKE_MAGICSECURE ))return ; -/* Return the programmed SecureOn password */ - reg =umac_readl (priv,UMAC_PSW_MS ); -put_unaligned_be16 (reg, &wol->sopass[0 ]); - reg =umac_readl (priv,UMAC_PSW_LS ); -put_unaligned_be32 (reg, &wol->sopass[2 ]); +memcpy (wol->sopass, priv->sopass,sizeof (priv->sopass)); } static int bcm_sysport_set_wol(struct net_device *dev,
@@ -547,13 +542,8 @@ static int bcm_sysport_set_wol(struct neif (wol->wolopts & ~supported)return -EINVAL ; -/* Program the SecureOn password */ -if (wol->wolopts &WAKE_MAGICSECURE ) { -umac_writel (priv,get_unaligned_be16 (&wol->sopass[0 ]), -UMAC_PSW_MS ); -umac_writel (priv,get_unaligned_be32 (&wol->sopass[2 ]), -UMAC_PSW_LS ); - } +if (wol->wolopts &WAKE_MAGICSECURE ) +memcpy (priv->sopass, wol->sopass,sizeof (priv->sopass));/* Flag the device and relevant IRQ as wakeup capable */ if (wol->wolopts) {
@@ -2221,12 +2211,17 @@ static int bcm_sysport_suspend_to_wol(stunsigned int timeout =1000 ;u32 reg; -/* Password has already been programmed */ reg =umac_readl (priv,UMAC_MPD_CTRL ); reg |=MPD_EN ; reg &= ~PSW_EN ; -if (priv->wolopts &WAKE_MAGICSECURE ) +if (priv->wolopts &WAKE_MAGICSECURE ) { +/* Program the SecureOn password */ +umac_writel (priv,get_unaligned_be16 (&priv->sopass[0 ]), +UMAC_PSW_MS ); +umac_writel (priv,get_unaligned_be32 (&priv->sopass[2 ]), +UMAC_PSW_LS ); reg |=PSW_EN ; + }umac_writel (priv, reg,UMAC_MPD_CTRL );/* Make sure RBUF entered WoL mode as result */
drivers/net/ethernet/broadcom/bcmsysport.h +2 -0
@@ -11,6 +11,7 @@#ifndef __BCM_SYSPORT_H#define __BCM_SYSPORT_H +#include <linux/ethtool.h> #include <linux/if_vlan.h> /* Receive/transmit descriptor format */
@@ -754,6 +755,7 @@ struct bcm_sysport_priv { unsigned int crc_fwd:1;u16 rev;u32 wolopts; +u8 sopass[SOPASS_MAX ]; unsigned int wol_irq_disabled:1;/* MIB related fields */
Greg Kroah-Hartman
maintainerPATCH 173/205 net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit e8c8b53ccaff568fef4c13a6ccaf08bf241aa01a ]
When an ethernet frame is padded to meet the minimum ethernet frame size, the padding octets are not covered by the hardware checksum. Fortunately the padding octets are usually zero's, which don't affect checksum. However, we have a switch which pads non-zero octets, this causes kernel hardware checksum fault repeatedly.
Prior to:
commit '88078d98d1bb ("net: pskb_trim_rcsum() and CHECKSUM_COMPLETE ...")' skb checksum was forced to be CHECKSUM_NONE when padding is detected. After it, we need to keep skb->csum updated, like what we do for RXFCS. However, fixing up CHECKSUM_COMPLETE requires to verify and parse IP headers, it is not worthy the effort as the packets are so small that CHECKSUM_COMPLETE can't save anything.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +14 -0
@@ -646,6 +646,8 @@ static u32 mlx5e_get_fcs(const struct skreturn __get_unaligned_cpu32 (fcs_bytes); } +#define short_frame (size) ((size) <= ETH_ZLEN + ETH_FCS_LEN) + static inline void mlx5e_handle_csum(struct net_device *netdev, struct mlx5_cqe64 *cqe, struct mlx5e_rq *rq,
@@ -661,6 +663,17 @@ static inline void mlx5e_handle_csum(strreturn ; } +/* CQE csum doesn't cover padding octets in short ethernet +* frames. And the pad field is appended prior to calculating +* and appending the FCS field. +* +* Detecting these padded frames requires to verify and parse +* IP headers, so we simply force all those small frames to be +* CHECKSUM_UNNECESSARY even if they are not padded. +*/ +if (short_frame (skb->len)) + goto csum_unnecessary; +if (is_first_ethertype_ip (skb)) { skb->ip_summed =CHECKSUM_COMPLETE ; skb->csum =csum_unfold ((__force __sum16 )cqe->check_sum);
@@ -672,6 +685,7 @@ static inline void mlx5e_handle_csum(strreturn ; } +csum_unnecessary:if (likely ((cqe->hds_ip_ext &CQE_L3_OK ) && (cqe->hds_ip_ext &CQE_L4_OK ))) { skb->ip_summed =CHECKSUM_UNNECESSARY ;
Greg Kroah-Hartman
maintainerPATCH 176/205 ALSA: hda - Serialize codec registrations
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 305a0ade180981686eec1f92aa6252a7c6ebb1cf upstream.
In the current code, the codec registration may happen both at the codec bind time and the end of the controller probe time. In a rare occasion, they race with each other, leading to Oops due to the still uninitialized card device.
This patch introduces a simple flag to prevent the codec registration at the codec bind time as long as the controller probe is going on. The controller probe invokes snd_card_register() that does the whole registration task, and we don't need to register each piece beforehand.
--- sound/pci/hda/hda_bind.c | 3 ++- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_intel.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)
sound/pci/hda/hda_bind.c +2 -1
@@ -109,7 +109,8 @@ static int hda_codec_driver_probe(struct err =snd_hda_codec_build_controls (codec);if (err <0 ) goto error_module; -if (codec->card->registered) { +/* only register after the bus probe finished; otherwise it's racy */ +if (!codec->bus->bus_probing && codec->card->registered) { err =snd_card_register (codec->card);if (err <0 ) goto error_module;
sound/pci/hda/hda_codec.h +1 -0
@@ -68,6 +68,7 @@ struct hda_bus { unsigned int response_reset:1; /* controller was reset */ unsigned int in_reset:1; /* during reset operation */ unsigned int no_response_fallback:1; /* don't fallback at RIRB error */ + unsigned int bus_probing :1; /* during probing process */int primary_dig_out_type;/* primary digital out PCM type */ unsigned int mixer_assigned;/* codec addr for mixer name */
sound/pci/hda/hda_intel.c +2 -0
@@ -2236,6 +2236,7 @@ static int azx_probe_continue(struct azxint val;int err; +to_hda_bus (bus)->bus_probing =1 ; hda->probe_continued =1 ;/* bind with i915 if needed */
@@ -2341,6 +2342,7 @@ i915_power_fail:if (err <0 ) hda->init_failed =1 ;complete_all (&hda->probe_wait); +to_hda_bus (bus)->bus_probing =0 ;return err; }
Greg Kroah-Hartman
maintainerPATCH 177/205 fuse: call pipe_buf_release() under pipe lock
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 9509941e9c534920ccc4771ae70bd6cbbe79df1c upstream.
Some of the pipe_buf_release() handlers seem to assume that the pipe is locked - in particular, anon_pipe_buf_release() accesses pipe->tmp_page without taking any extra locks. From a glance through the callers of pipe_buf_release(), it looks like FUSE is the only one that calls pipe_buf_release() without having the pipe locked.
This bug should only lead to a memory leak, nothing terrible.
--- fs/fuse/dev.c | 2 ++ 1 file changed, 2 insertions(+)
fs/fuse/dev.c +2 -0
@@ -2024,8 +2024,10 @@ static ssize_t fuse_dev_splice_write(str ret =fuse_dev_do_write (fud, &cs, len); +pipe_lock (pipe);for (idx =0 ; idx < nbuf; idx++)pipe_buf_release (pipe, &bufs[idx]); +pipe_unlock (pipe); out:kfree (bufs);
Greg Kroah-Hartman
maintainerPATCH 152/205 fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0d9c9a238faf925823bde866182c663b6d734f2e ]
These functions are called from atomic context:
[ 9.150239] BUG: sleeping function called from invalid context at /home/scott/git/linux/mm/slab.h:421 [ 9.158159] in_atomic(): 1, irqs_disabled(): 0, pid: 4432, name: ip [ 9.163128] CPU: 8 PID: 4432 Comm: ip Not tainted 4.20.0-rc2-00169-g63d86876f324 #29 [ 9.163130] Call Trace: [ 9.170701] [c0000002e899a980] [c0000000009c1068] .dump_stack+0xa8/0xec (unreliable) [ 9.177140] [c0000002e899aa10] [c00000000007a7b4] .___might_sleep+0x138/0x164 [ 9.184440] [c0000002e899aa80] [c0000000001d5bac] .kmem_cache_alloc_trace+0x238/0x30c [ 9.191216] [c0000002e899ab40] [c00000000065ea1c] .memac_add_hash_mac_address+0x104/0x198 [ 9.199464] [c0000002e899abd0] [c00000000065a788] .set_multi+0x1c8/0x218 [ 9.206242] [c0000002e899ac80] [c0000000006615ec] .dpaa_set_rx_mode+0xdc/0x17c [ 9.213544] [c0000002e899ad00] [c00000000083d2b0] .__dev_set_rx_mode+0x80/0xd4 [ 9.219535] [c0000002e899ad90] [c00000000083d334] .dev_set_rx_mode+0x30/0x54 [ 9.225271] [c0000002e899ae10] [c00000000083d4a0] .__dev_open+0x148/0x1c8 [ 9.230751] [c0000002e899aeb0] [c00000000083d934] .__dev_change_flags+0x19c/0x1e0 [ 9.230755] [c0000002e899af60] [c00000000083d9a4] .dev_change_flags+0x2c/0x80 [ 9.242752] [c0000002e899aff0] [c0000000008554ec] .do_setlink+0x350/0xf08 [ 9.248228] [c0000002e899b170] [c000000000857ad0] .rtnl_newlink+0x588/0x7e0 [ 9.253965] [c0000002e899b740] [c000000000852424] .rtnetlink_rcv_msg+0x3e0/0x498 [ 9.261440] [c0000002e899b820] [c000000000884790] .netlink_rcv_skb+0x134/0x14c [ 9.267607] [c0000002e899b8e0] [c000000000851840] .rtnetlink_rcv+0x18/0x2c [ 9.274558] [c0000002e899b950] [c000000000883c8c] .netlink_unicast+0x214/0x318 [ 9.281163] [c0000002e899ba00] [c000000000884220] .netlink_sendmsg+0x348/0x444 [ 9.287076] [c0000002e899bae0] [c00000000080d13c] .sock_sendmsg+0x2c/0x54 [ 9.287080] [c0000002e899bb50] [c0000000008106c0] .___sys_sendmsg+0x2d0/0x2d8 [ 9.298375] [c0000002e899bd30] [c000000000811a80] .__sys_sendmsg+0x5c/0xb0 [ 9.303939] [c0000002e899be20] [c0000000000006b0] system_call+0x60/0x6c
--- drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/fman/fman_memac.c +1 -1
@@ -927,7 +927,7 @@ int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) hash =get_mac_addr_hash_code (addr) &HASH_CTRL_ADDR_MASK ;/* Create element to be added to the driver hash table */ - hash_entry =kmalloc (sizeof (*hash_entry),GFP_KERNEL ); + hash_entry =kmalloc (sizeof (*hash_entry),GFP_ATOMIC );if (!hash_entry)return -ENOMEM ; hash_entry->addr = addr;
drivers/net/ethernet/freescale/fman/fman_tgec.c +1 -1
@@ -551,7 +551,7 @@ int tgec_add_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) hash = (crc >>TGEC_HASH_MCAST_SHIFT ) &TGEC_HASH_ADR_MSK ;/* Create element to be added to the driver hash table */ - hash_entry =kmalloc (sizeof (*hash_entry),GFP_KERNEL ); + hash_entry =kmalloc (sizeof (*hash_entry),GFP_ATOMIC );if (!hash_entry)return -ENOMEM ; hash_entry->addr = addr;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 178/205 fuse: decrement NR_WRITEBACK_TEMP on the right page
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
commit a2ebba824106dabe79937a9f29a875f837e1b6d4 upstream.
NR_WRITEBACK_TEMP is accounted on the temporary page in the request, not the page cache page.
--- fs/fuse/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/file.c +1 -1
@@ -1777,7 +1777,7 @@ static bool fuse_writepage_in_flight(strspin_unlock (&fc->lock);dec_wb_stat (&bdi->wb,WB_WRITEBACK ); -dec_node_page_state (page,NR_WRITEBACK_TEMP ); +dec_node_page_state (new_req->pages[0 ],NR_WRITEBACK_TEMP );wb_writeout_inc (&bdi->wb);fuse_writepage_free (fc, new_req);fuse_request_free (new_req);
Greg Kroah-Hartman
maintainerPATCH 179/205 fuse: handle zero sized retrieve correctly
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
commit 97e1532ef81acb31c30f9e75bf00306c33a77812 upstream.
Dereferencing req->page_descs[0] will Oops if req->max_pages is zero.
--- fs/fuse/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/dev.c +1 -1
@@ -1691,7 +1691,6 @@ static int fuse_retrieve(struct fuse_con req->in.h.nodeid = outarg->nodeid; req->in.numargs =2 ; req->in.argpages =1 ; - req->page_descs[0 ].offset = offset; req->end = fuse_retrieve_end; index = outarg->offset >>PAGE_SHIFT ;
@@ -1706,6 +1705,7 @@ static int fuse_retrieve(struct fuse_con this_num =min_t (unsigned, num,PAGE_SIZE - offset); req->pages[req->num_pages] = page; + req->page_descs[req->num_pages].offset = offset; req->page_descs[req->num_pages].length = this_num; req->num_pages++;
Greg Kroah-Hartman
maintainerPATCH 181/205 dmaengine: bcm2835: Fix abort of transactions
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
commit 9e528c799d17a4ac37d788c81440b50377dd592d upstream.
There are multiple issues with bcm2835_dma_abort() (which is called on termination of a transaction):
* The algorithm to abort the transaction first pauses the channel by clearing the ACTIVE flag in the CS register, then waits for the PAUSED flag to clear. Page 49 of the spec documents the latter as follows:
"Indicates if the DMA is currently paused and not transferring data.
This will occur if the active bit has been cleared [...]"
https://www.raspberrypi.org/app/uploads/2012/02/BCM2835-ARM-Peripherals.pdf
So the function is entering an infinite loop because it is waiting for PAUSED to clear which is always set due to the function having cleared the ACTIVE flag. The only thing that's saving it from itself is the upper bound of 10000 loop iterations.
The code comment says that the intention is to "wait for any current AXI transfer to complete", so the author probably wanted to check the WAITING_FOR_OUTSTANDING_WRITES flag instead. Amend the function accordingly.
* The CS register is only read at the beginning of the function. It needs to be read again after pausing the channel and before checking for outstanding writes, otherwise writes which were issued between the register read at the beginning of the function and pausing the channel may not be waited for.
* The function seeks to abort the transfer by writing 0 to the NEXTCONBK register and setting the ABORT and ACTIVE flags. Thereby, the 0 in NEXTCONBK is sought to be loaded into the CONBLK_AD register. However experimentation has shown this approach to not work: The CONBLK_AD register remains the same as before and the CS register contains 0x00000030 (PAUSED | DREQ_STOPS_DMA). In other words, the control block is not aborted but merely paused and it will be resumed once the next DMA transaction is started. That is absolutely not the desired behavior.
A simpler approach is to set the channel's RESET flag instead. This reliably zeroes the NEXTCONBK as well as the CS register. It requires less code and only a single MMIO write. This is also what popular user space DMA drivers do, e.g.:
https://github.com/metachris/RPIO/blob/master/source/c_pwm/pwm.c
Note that the spec is contradictory whether the NEXTCONBK register is writeable at all. On the one hand, page 41 claims:
"The value loaded into the NEXTCONBK register can be overwritten so that the linked list of Control Block data structures can be dynamically altered. However it is only safe to do this when the DMA is paused."
On the other hand, page 40 specifies:
"Only three registers in each channel's register set are directly writeable (CS, CONBLK_AD and DEBUG). The other registers (TI, SOURCE_AD, DEST_AD, TXFR_LEN, STRIDE & NEXTCONBK), are automatically loaded from a Control Block data structure held in external memory."
--- drivers/dma/bcm2835-dma.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-)
drivers/dma/bcm2835-dma.c +9 -32
@@ -415,13 +415,11 @@ static void bcm2835_dma_fill_cb_chain_wi } } -static int bcm2835_dma_abort (void __iomem *chan_base) +static int bcm2835_dma_abort (struct bcm2835_chan *c) { -unsigned long cs; +void __iomem *chan_base = c->chan_base;long int timeout =10000 ; - cs =readl (chan_base +BCM2835_DMA_CS ); -/* * A zero control block address means the channel is idle. * (The ACTIVE flag in the CS register is not a reliable indicator.)
@@ -433,25 +431,16 @@ static int bcm2835_dma_abort(void __iomewritel (0 , chan_base +BCM2835_DMA_CS );/* Wait for any current AXI transfer to complete */ -while ((cs &BCM2835_DMA_ISPAUSED ) && --timeout) { +while ((readl (chan_base +BCM2835_DMA_CS ) & +BCM2835_DMA_WAITING_FOR_WRITES ) && --timeout)cpu_relax (); - cs =readl (chan_base +BCM2835_DMA_CS ); - } -/* We'll un-pause when we set of our next DMA */ +/* Peripheral might be stuck and fail to signal AXI write responses */ if (!timeout) -return -ETIMEDOUT ; - -if (!(cs &BCM2835_DMA_ACTIVE )) -return 0 ; - -/* Terminate the control block chain */ -writel (0 , chan_base +BCM2835_DMA_NEXTCB ); - -/* Abort the whole DMA */ -writel (BCM2835_DMA_ABORT |BCM2835_DMA_ACTIVE , - chan_base +BCM2835_DMA_CS ); +dev_err (c->vc.chan.device->dev, +"failed to complete outstanding writes\n" ); +writel (BCM2835_DMA_RESET , chan_base +BCM2835_DMA_CS );return 0 ; }
@@ -804,7 +793,6 @@ static int bcm2835_dma_terminate_all(strstruct bcm2835_chan *c =to_bcm2835_dma_chan (chan);struct bcm2835_dmadev *d =to_bcm2835_dma_dev (c->vc.chan.device);unsigned long flags; -int timeout =10000 ;LIST_HEAD (head);spin_lock_irqsave (&c->vc.lock, flags);
@@ -818,18 +806,7 @@ static int bcm2835_dma_terminate_all(strif (c->desc) {bcm2835_dma_desc_free (&c->desc->vd); c->desc =NULL ; -bcm2835_dma_abort (c->chan_base); - -/* Wait for stopping */ -while (--timeout) { -if (!readl (c->chan_base +BCM2835_DMA_ADDR )) -break ; - -cpu_relax (); - } - -if (!timeout) -dev_err (d->ddev.dev,"DMA transfer could not be terminated\n" ); +bcm2835_dma_abort (c); }vchan_get_all_descriptors (&c->vc, &head);
Greg Kroah-Hartman
maintainerPATCH 155/205 kdb: Dont back trace on a cpu that didnt round up
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 162bc7f5afd75b72acbe3c5f3488ef7e64a3fe36 ]
If you have a CPU that fails to round up and then run 'btc' you'll end up crashing in kdb becaue we dereferenced NULL. Let's add a check. It's wise to also set the task to NULL when leaving the debugger so that if we fail to round up on a later entry into the debugger we won't backtrace a stale task.
--- kernel/debug/debug_core.c | 4 ++++ kernel/debug/kdb/kdb_bt.c | 11 ++++++++++- kernel/debug/kdb/kdb_debugger.c | 7 ------- 3 files changed, 14 insertions(+), 8 deletions(-)
kernel/debug/debug_core.c +4 -0
@@ -535,6 +535,8 @@ return_normal: arch_kgdb_ops.correct_hw_break ();if (trace_on)tracing_on (); + kgdb_info[cpu].debuggerinfo =NULL ; + kgdb_info[cpu].task =NULL ; kgdb_info[cpu].exception_state &= ~(DCPU_WANT_MASTER |DCPU_IS_SLAVE ); kgdb_info[cpu].enter_kgdb--;
@@ -667,6 +669,8 @@ kgdb_restore:if (trace_on)tracing_on (); + kgdb_info[cpu].debuggerinfo =NULL ; + kgdb_info[cpu].task =NULL ; kgdb_info[cpu].exception_state &= ~(DCPU_WANT_MASTER |DCPU_IS_SLAVE ); kgdb_info[cpu].enter_kgdb--;
kernel/debug/kdb/kdb_bt.c +10 -1
@@ -186,7 +186,16 @@ kdb_bt(int argc, const char **argv)kdb_printf ("btc: cpu status: " );kdb_parse ("cpu\n" );for_each_online_cpu (cpu) { -sprintf (buf,"btt 0x%px\n" ,KDB_TSK (cpu)); +void *kdb_tsk =KDB_TSK (cpu); + +/* If a CPU failed to round up we could be here */ +if (!kdb_tsk) { +kdb_printf ("WARNING: no task for cpu %ld\n" , + cpu); +continue ; + } + +sprintf (buf,"btt 0x%px\n" , kdb_tsk);kdb_parse (buf);touch_nmi_watchdog (); }
kernel/debug/kdb/kdb_debugger.c +0 -7
@@ -118,13 +118,6 @@ int kdb_stub(struct kgdb_state *ks)kdb_bp_remove ();KDB_STATE_CLEAR (DOING_SS );KDB_STATE_SET (PAGER ); -/* zero out any offline cpu data */ -for_each_present_cpu (i) { -if (!cpu_online (i)) { - kgdb_info[i].debuggerinfo =NULL ; - kgdb_info[i].task =NULL ; - } - }if (ks->err_code ==DIE_OOPS || reason ==KDB_REASON_OOPS ) { ks->pass_exception =1 ;KDB_FLAG_SET (CATASTROPHIC );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 154/205 thermal: bcm2835: enable hwmon explicitly
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d56c19d07e0bc3ceff366a49b7d7a2440c967b1b ]
By defaul of-based thermal driver do not enable hwmon. This patch does this explicitly, so that the temperature can be read through the common hwmon sysfs.
--- drivers/thermal/broadcom/bcm2835_thermal.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/thermal/broadcom/bcm2835_thermal.c +11 -0
@@ -27,6 +27,8 @@#include <linux/platform_device.h> #include <linux/thermal.h> +#include "../thermal_hwmon.h" +#define BCM2835_TS_TSENSCTL 0x00#define BCM2835_TS_TSENSSTAT 0x04
@@ -275,6 +277,15 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, tz); +/* +* Thermal_zone doesn't enable hwmon as default, +* enable it here +*/ + tz->tzp->no_hwmon = false; + err =thermal_add_hwmon_sysfs (tz); +if (err) + goto err_tz; +bcm2835_thermal_debugfs (pdev);return 0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 157/205 HID: lenovo: Add checks to fix of_led_classdev_register
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6ae16dfb61bce538d48b7fe98160fada446056c5 ]
In lenovo_probe_tpkbd(), the function of_led_classdev_register() could return an error value that is unchecked. The fix adds these checks.
--- drivers/hid/hid-lenovo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hid/hid-lenovo.c +8 -2
@@ -743,7 +743,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) data_pointer->led_mute.brightness_get = lenovo_led_brightness_get_tpkbd; data_pointer->led_mute.brightness_set = lenovo_led_brightness_set_tpkbd; data_pointer->led_mute.dev = dev; -led_classdev_register (dev, &data_pointer->led_mute); + ret =led_classdev_register (dev, &data_pointer->led_mute); +if (ret <0 ) + goto err; data_pointer->led_micmute.name = name_micmute; data_pointer->led_micmute.brightness_get =
@@ -751,7 +753,11 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) data_pointer->led_micmute.brightness_set = lenovo_led_brightness_set_tpkbd; data_pointer->led_micmute.dev = dev; -led_classdev_register (dev, &data_pointer->led_micmute); + ret =led_classdev_register (dev, &data_pointer->led_micmute); +if (ret <0 ) { +led_classdev_unregister (&data_pointer->led_mute); + goto err; + }lenovo_features_set_tpkbd (hdev);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 158/205 fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ]
Access to timerslack_ns is controlled by a process having CAP_SYS_NICE in its effective capability set, but the current check looks in the root namespace instead of the process' user namespace. Since a process is allowed to do other activities controlled by CAP_SYS_NICE inside a namespace, it should also be able to adjust timerslack_ns.
--- fs/proc/base.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/proc/base.c +9 -3
@@ -2374,10 +2374,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,return -ESRCH ;if (p != current) { -if (!capable (CAP_SYS_NICE )) { +rcu_read_lock (); +if (!ns_capable (__task_cred (p)->user_ns,CAP_SYS_NICE )) { +rcu_read_unlock (); count = -EPERM ; goto out; } +rcu_read_unlock (); err =security_task_setscheduler (p);if (err) {
@@ -2410,11 +2413,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)return -ESRCH ;if (p != current) { - -if (!capable (CAP_SYS_NICE )) { +rcu_read_lock (); +if (!ns_capable (__task_cred (p)->user_ns,CAP_SYS_NICE )) { +rcu_read_unlock (); err = -EPERM ; goto out; } +rcu_read_unlock (); + err =security_task_getscheduler (p);if (err) goto out;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 149/205 ocfs2: improve ocfs2 Makefile
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9e6aea22802b5684c7e1d69822aeb0844dd01953 ]
Included file path was hard-wired in the ocfs2 makefile, which might causes some confusion when compiling ocfs2 as an external module.
Say if we compile ocfs2 module as following.
cp -r /kernel/tree/fs/ocfs2 /other/dir/ocfs2
cd /other/dir/ocfs2
make -C /path/to/kernel_source M=pwd modules
Acutally, the compiler wil try to find included file in /kernel/tree/fs/ocfs2, rather than the directory /other/dir/ocfs2.
To fix this little bug, we introduce the var $(src) provided by kbuild. $(src) means the absolute path of the running kbuild file.
--- fs/ocfs2/Makefile | 2 +- fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlmfs/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
fs/ocfs2/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Ifs/ocfs2 +ccflags-y := -I$(src) obj-$(CONFIG_OCFS2_FS) += \ ocfs2.o \
fs/ocfs2/dlm/Makefile +1 -1
@@ -1,4 +1,4 @@ -ccflags-y := -Ifs/ocfs2 +ccflags-y := -I$(src)/.. obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o
fs/ocfs2/dlmfs/Makefile +1 -1
@@ -1,4 +1,4 @@ -ccflags-y := -Ifs/ocfs2 +ccflags-y := -I$(src)/.. obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 194/205 KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Shier <[email protected]>
commit ecec76885bcfe3294685dc363fd1273df0d5d65f upstream.
Bugzilla: 1671904
There are multiple code paths where an hrtimer may have been started to emulate an L1 VMX preemption timer that can result in a call to free_nested without an intervening L2 exit where the hrtimer is normally cancelled. Unconditionally cancel in free_nested to cover all cases.
Embargoed until Feb 7th 2019.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/vmx.c +1 -0
@@ -7708,6 +7708,7 @@ static void free_nested(struct vcpu_vmxif (!vmx->nested.vmxon)return ; +hrtimer_cancel (&vmx->nested.preemption_timer); vmx->nested.vmxon = false;free_vpid (vmx->nested.vpid02); vmx->nested.posted_intr_nv =-1 ;
Greg Kroah-Hartman
maintainerPATCH 197/205 x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Luck <[email protected]>
commit d28af26faa0b1daf3c692603d46bc4687c16f19e upstream.
Internal injection testing crashed with a console log that said:
mce: [Hardware Error]: CPU 7: Machine Check Exception: f Bank 0: bd80000000100134
This caused a lot of head scratching because the MCACOD (bits 15:0) of that status is a signature from an L1 data cache error. But Linux says that it found it in "Bank 0", which on this model CPU only reports L1 instruction cache errors.
The answer was that Linux doesn't initialize "m->bank" in the case that it finds a fatal error in the mce_no_way_out() pre-scan of banks. If this was a local machine check, then this partially initialized struct mce is being passed to mce_panic().
Fix is simple: just initialize m->bank in the case of a fatal error.
--- arch/x86/kernel/cpu/mcheck/mce.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mcheck/mce.c +1 -0
@@ -773,6 +773,7 @@ static int mce_no_way_out(struct mce *m,quirk_no_way_out (i, m, regs);if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { + m->bank = i;mce_read_aux (m, i); *msg = tmp;return 1 ;
Greg Kroah-Hartman
maintainerPATCH 199/205 perf tests evsel-tp-sched: Fix bitwise operator
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit 489338a717a0dfbbd5a3fabccf172b78f0ac9015 upstream.
Notice that the use of the bitwise OR operator '|' always leads to true in this particular case, which seems a bit suspicious due to the context in which this expression is being used.
Fix this by using bitwise AND operator '&' instead.
This bug was detected with the help of Coccinelle.
--- tools/perf/tests/evsel-tp-sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/evsel-tp-sched.c +1 -1
@@ -17,7 +17,7 @@ static int perf_evsel__test_field(structreturn -1 ; } - is_signed = !!(field->flags |FIELD_IS_SIGNED ); + is_signed = !!(field->flags &FIELD_IS_SIGNED );if (should_be_signed && !is_signed) {pr_debug ("%s: \"%s\" signedness(%d) is wrong, should be %d\n" , evsel->name, name, is_signed, should_be_signed);
Greg Kroah-Hartman
maintainerPATCH 201/205 serial: 8250_pci: Make PCI class test non fatal
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 824d17c57b0abbcb9128fb3f7327fae14761914b upstream.
As has been reported the National Instruments serial cards have broken PCI class.
The commit 7d8905d06405
("serial: 8250_pci: Enable device after we check black list")
made the PCI class check mandatory for the case when device is listed in a quirk list.
Make PCI class test non fatal to allow broken card be enumerated.
--- drivers/tty/serial/8250/8250_pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_pci.c +5 -4
@@ -3425,6 +3425,11 @@ static int serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board) { int num_iomem, num_port, first_port = -1, i; +int rc; + + rc =serial_pci_is_class_communication (dev); +if (rc) +return rc;/* * Should we try to make guesses for multiport serial devices later?
@@ -3652,10 +3657,6 @@ pciserial_init_one(struct pci_dev *dev, board = &pci_boards[ent->driver_data]; - rc =serial_pci_is_class_communication (dev); -if (rc) -return rc; - rc =serial_pci_is_blacklisted (dev);if (rc)return rc;
Greg Kroah-Hartman
maintainerPATCH 202/205 nfsd4: fix cached replies to solo SEQUENCE compounds
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: J. Bruce Fields <[email protected]>
commit 085def3ade52f2ffe3e31f42e98c27dcc222dd37 upstream.
Currently our handling of 4.1+ requests without "cachethis" set is confusing and not quite correct.
Suppose a client sends a compound consisting of only a single SEQUENCE op, and it matches the seqid in a session slot (so it's a retry), but the previous request with that seqid did not have "cachethis" set.
The obvious thing to do might be to return NFS4ERR_RETRY_UNCACHED_REP, but the protocol only allows that to be returned on the op following the SEQUENCE, and there is no such op in this case.
The protocol permits us to cache replies even if the client didn't ask us to. And it's easy to do so in the case of solo SEQUENCE compounds.
So, when we get a solo SEQUENCE, we can either return the previously cached reply or NFSERR_SEQ_FALSE_RETRY if we notice it differs in some way from the original call.
Currently, we're returning a corrupt reply in the case a solo SEQUENCE matches a previous compound with more ops. This actually matters because the Linux client recently started doing this as a way to recover from lost replies to idempotent operations in the case the process doing the original reply was killed: in that case it's difficult to keep the original arguments around to do a real retry, and the client no longer cares what the result is anyway, but it would like to make sure that the slot's sequence id has been incremented, and the solo SEQUENCE assures
that: if the server never got the original reply, it will increment the sequence id. If it did get the original reply, it won't increment, and nothing else that about the reply really matters much. But we can at least attempt to return valid xdr!
--- fs/nfsd/nfs4state.c | 20 +++++++++++++++----- fs/nfsd/state.h | 1 + fs/nfsd/xdr4.h | 13 +++++++++++-- 3 files changed, 27 insertions(+), 7 deletions(-)
fs/nfsd/nfs4state.c +15 -5
@@ -2331,14 +2331,16 @@ nfsd4_store_cache_entry(struct nfsd4_comdprintk ("--> %s slot %p\n" , __func__, slot); + slot->sl_flags |=NFSD4_SLOT_INITIALIZED ; slot->sl_opcnt = resp->opcnt; slot->sl_status = resp->cstate.status; - slot->sl_flags |=NFSD4_SLOT_INITIALIZED ; -if (nfsd4_not_cached (resp)) { - slot->sl_datalen =0 ; +if (!nfsd4_cache_this (resp)) { + slot->sl_flags &= ~NFSD4_SLOT_CACHED ;return ; } + slot->sl_flags |=NFSD4_SLOT_CACHED ; + base = resp->cstate.data_offset; slot->sl_datalen = buf->len - base;if (read_bytes_from_xdr_buf (buf, base, slot->sl_data, slot->sl_datalen))
@@ -2365,8 +2367,16 @@ nfsd4_enc_sequence_replay(struct nfsd4_c op = &args->ops[resp->opcnt -1 ];nfsd4_encode_operation (resp, op); -/* Return nfserr_retry_uncached_rep in next operation. */ -if (args->opcnt >1 && !(slot->sl_flags &NFSD4_SLOT_CACHETHIS )) { +if (slot->sl_flags &NFSD4_SLOT_CACHED ) +return op->status; +if (args->opcnt ==1 ) { +/* +* The original operation wasn't a solo sequence--we +* always cache those--so this retry must not match the +* original: +*/ + op->status = nfserr_seq_false_retry; + }else { op = &args->ops[resp->opcnt++]; op->status = nfserr_retry_uncached_rep;nfsd4_encode_operation (resp, op);
fs/nfsd/state.h +1 -0
@@ -174,6 +174,7 @@ struct nfsd4_slot {#define NFSD4_SLOT_INUSE (1 << 0)#define NFSD4_SLOT_CACHETHIS (1 << 1)#define NFSD4_SLOT_INITIALIZED (1 << 2) +#define NFSD4_SLOT_CACHED (1 << 3)u8 sl_flags;char sl_data[]; };
fs/nfsd/xdr4.h +11 -2
@@ -651,9 +651,18 @@ static inline bool nfsd4_is_solo_sequencreturn resp->opcnt ==1 && args->ops[0 ].opnum ==OP_SEQUENCE ; } -static inline bool nfsd4_not_cached (struct nfsd4_compoundres *resp) +/* +* The session reply cache only needs to cache replies that the client +* actually asked us to. But it's almost free for us to cache compounds +* consisting of only a SEQUENCE op, so we may as well cache those too. +* Also, the protocol doesn't give us a convenient response in the case +* of a replay of a solo SEQUENCE op that wasn't cached +* (RETRY_UNCACHED_REP can only be returned in the second op of a +* compound). +*/ +static inline bool nfsd4_cache_this (struct nfsd4_compoundres *resp) { -return !(resp->cstate.slot->sl_flags &NFSD4_SLOT_CACHETHIS ) +return (resp->cstate.slot->sl_flags &NFSD4_SLOT_CACHETHIS ) ||nfsd4_is_solo_sequence (resp); }
Greg Kroah-Hartman
maintainerPATCH 204/205 IB/hfi1: Add limit test for RC/UC send via loopback
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marciniszyn <[email protected]>
commit 09ce351dff8e7636af0beb72cd4a86c3904a0500 upstream.
Fix potential memory corruption and panic in loopback for IB_WR_SEND variants.
The code blindly assumes the posted length will fit in the fetched rwqe, which is not a valid assumption.
Fix by adding a limit test, and triggering the appropriate send completion and putting the QP in an error state. This mimics the handling for non-loopback QPs.
--- drivers/infiniband/hw/hfi1/ruc.c | 7 ++++++- drivers/infiniband/hw/qib/qib_ruc.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/ruc.c +6 -1
@@ -440,6 +440,8 @@ send: goto op_err;if (!ret) goto rnr_nak; +if (wqe->length > qp->r_len) + goto inv_err;break ;case IB_WR_RDMA_WRITE_WITH_IMM :
@@ -607,7 +609,10 @@ op_err: goto err; inv_err: - send_status =IB_WC_REM_INV_REQ_ERR ; + send_status = + sqp->ibqp.qp_type ==IB_QPT_RC ? +IB_WC_REM_INV_REQ_ERR : +IB_WC_SUCCESS ; wc.status =IB_WC_LOC_QP_OP_ERR ; goto err;
drivers/infiniband/hw/qib/qib_ruc.c +6 -1
@@ -425,6 +425,8 @@ again: goto op_err;if (!ret) goto rnr_nak; +if (wqe->length > qp->r_len) + goto inv_err;break ;case IB_WR_RDMA_WRITE_WITH_IMM :
@@ -585,7 +587,10 @@ op_err: goto err; inv_err: - send_status =IB_WC_REM_INV_REQ_ERR ; + send_status = + sqp->ibqp.qp_type ==IB_QPT_RC ? +IB_WC_REM_INV_REQ_ERR : +IB_WC_SUCCESS ; wc.status =IB_WC_LOC_QP_OP_ERR ; goto err;
Greg Kroah-Hartman
maintainerPATCH 185/205 usb: phy: am335x: fix race condition in _probe
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bin Liu <[email protected]>
commit a53469a68eb886e84dd8b69a1458a623d3591793 upstream.
power off the phy should be done before populate the phy. Otherwise, am335x_init() could be called by the phy owner to power on the phy first, then am335x_phy_probe() turns off the phy again without the caller knowing it.
--- drivers/usb/phy/phy-am335x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/usb/phy/phy-am335x.c +1 -4
@@ -60,9 +60,6 @@ static int am335x_phy_probe(struct platfif (ret)return ret; - ret =usb_add_phy_dev (&am_phy->usb_phy_gen.phy); -if (ret) -return ret; am_phy->usb_phy_gen.phy.init = am335x_init; am_phy->usb_phy_gen.phy.shutdown = am335x_shutdown;
@@ -81,7 +78,7 @@ static int am335x_phy_probe(struct platfdevice_set_wakeup_enable (dev, false);phy_ctrl_power (am_phy->phy_ctrl, am_phy->id, am_phy->dr_mode, false); -return 0 ; +return usb_add_phy_dev (&am_phy->usb_phy_gen.phy); }static int am335x_phy_remove (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 186/205 usb: dwc3: gadget: Handle 0 xfer length for OUT EP
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejas Joglekar <[email protected]>
commit 1e19cdc8060227b0802bda6bc0bd22b23679ba32 upstream.
For OUT endpoints, zero-length transfers require MaxPacketSize buffer as per the DWC_usb3 programming guide 3.30a section 4.2.3.3.
This patch fixes this by explicitly checking zero length transfer to correctly pad up to MaxPacketSize.
--- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +1 -1
@@ -1114,7 +1114,7 @@ static void dwc3_prepare_one_trb_linear(unsigned int maxp =usb_endpoint_maxp (dep->endpoint.desc);unsigned int rem = length % maxp; -if (rem &&usb_endpoint_dir_out (dep->endpoint.desc)) { +if ((!length || rem) &&usb_endpoint_dir_out (dep->endpoint.desc)) {struct dwc3 *dwc = dep->dwc;struct dwc3_trb *trb;
Greg Kroah-Hartman
maintainerPATCH 187/205 usb: gadget: udc: net2272: Fix bitwise and boolean operations
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit 07c69f1148da7de3978686d3af9263325d9d60bd upstream.
(!x & y) strikes again.
Fix bitwise and boolean operations by enclosing the expression:
intcsr & (1 << NET2272_PCI_IRQ)
in parentheses, before applying the boolean operator '!'.
Notice that this code has been there since 2011. So, it would be helpful if someone can double-check this.
This issue was detected with the help of Coccinelle.
--- drivers/usb/gadget/udc/net2272.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/udc/net2272.c +1 -1
@@ -2096,7 +2096,7 @@ static irqreturn_t net2272_irq(int irq,#if defined(PLX_PCI_RDK2 )/* see if PCI int for us by checking irqstat */ intcsr =readl (dev->rdk2.fpga_base_addr +RDK2_IRQSTAT ); -if (!intcsr & (1 <<NET2272_PCI_IRQ )) { +if (!(intcsr & (1 <<NET2272_PCI_IRQ ))) {spin_unlock (&dev->lock);return IRQ_NONE ; }
Greg Kroah-Hartman
maintainerPATCH 188/205 usb: gadget: musb: fix short isoc packets with inventra dma
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Elder <[email protected]>
commit c418fd6c01fbc5516a2cd1eaf1df1ec86869028a upstream.
Handling short packets (length < max packet size) in the Inventra DMA engine in the MUSB driver causes the MUSB DMA controller to hang. An example of a problem that is caused by this problem is when streaming video out of a UVC gadget, only the first video frame is transferred.
For short packets (mode-0 or mode-1 DMA), MUSB_TXCSR_TXPKTRDY must be set manually by the driver. This was previously done in musb_g_tx (musb_gadget.c), but incorrectly (all csr flags were cleared, and only MUSB_TXCSR_MODE and MUSB_TXCSR_TXPKTRDY were set). Fixing that problem allows some requests to be transferred correctly, but multiple requests were often put together in one USB packet, and caused problems if the packet size was not a multiple of 4. Instead, set MUSB_TXCSR_TXPKTRDY in dma_controller_irq (musbhsdma.c), just like host mode transfers.
This topic was originally tackled by Nicolas Boichat [0] [1] and is discussed further at [2] as part of his GSoC project [3].
[0] https://groups.google.com/forum/?hl=en#!topic/beagleboard-gsoc/k8Azwfp75CU
[1] https://gitorious.org/beagleboard-usbsniffer/beagleboard-usbsniffer-kernel/commit/b0be3b6cc195ba732189b04f1d43ec843c3e54c9?p=beagleboard-usbsniffer:beagleboard-usbsniffer-kernel.git;a=patch;h=b0be3b6cc195ba732189b04f1d43ec843c3e54c9
[2] http://beagleboard-usbsniffer.blogspot.com/2010/07/musb-isochronous-transfers-fixed.html
[3] http://elinux.org/BeagleBoard/GSoC/USBSniffer
--- drivers/usb/musb/musb_gadget.c | 13 +------------ drivers/usb/musb/musbhsdma.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 22 deletions(-)
drivers/usb/musb/musb_gadget.c +1 -12
@@ -477,13 +477,10 @@ void musb_g_tx(struct musb *musb, u8 epn }if (request) { -u8 is_dma =0 ; -bool short_packet = false;trace_musb_req_tx (req);if (dma && (csr &MUSB_TXCSR_DMAENAB )) { - is_dma =1 ; csr |=MUSB_TXCSR_P_WZC_BITS ; csr &= ~(MUSB_TXCSR_DMAENAB |MUSB_TXCSR_P_UNDERRUN |MUSB_TXCSR_TXPKTRDY |MUSB_TXCSR_AUTOSET );
@@ -501,16 +498,8 @@ void musb_g_tx(struct musb *musb, u8 epn*/ if ((request->zero && request->length) && (request->length % musb_ep->packet_sz ==0 ) - && (request->actual == request->length)) - short_packet = true; + && (request->actual == request->length)) { -if ((musb_dma_inventra (musb) ||musb_dma_ux500 (musb)) && - (is_dma && (!dma->desired_mode || - (request->actual & - (musb_ep->packet_sz -1 ))))) - short_packet = true; - -if (short_packet) {/* * On DMA completion, FIFO may not be * available yet...
drivers/usb/musb/musbhsdma.c +11 -10
@@ -320,12 +320,10 @@ static irqreturn_t dma_controller_irq(in channel->status =MUSB_DMA_STATUS_FREE ;/* completed */ -if ((devctl &MUSB_DEVCTL_HM ) - && (musb_channel->transmit) - && ((channel->desired_mode ==0 ) - || (channel->actual_len & - (musb_channel->max_packet_sz -1 ))) - ) { +if (musb_channel->transmit && + (!channel->desired_mode || + (channel->actual_len % + musb_channel->max_packet_sz))) {u8 epnum = musb_channel->epnum;int offset = musb->io.ep_offset (epnum,MUSB_TXCSR );
@@ -337,11 +335,14 @@ static irqreturn_t dma_controller_irq(in*/ musb_ep_select (mbase, epnum); txcsr =musb_readw (mbase, offset); - txcsr &= ~(MUSB_TXCSR_DMAENAB +if (channel->desired_mode ==1 ) { + txcsr &= ~(MUSB_TXCSR_DMAENAB |MUSB_TXCSR_AUTOSET ); -musb_writew (mbase, offset, txcsr); -/* Send out the packet */ - txcsr &= ~MUSB_TXCSR_DMAMODE ; +musb_writew (mbase, offset, txcsr); +/* Send out the packet */ + txcsr &= ~MUSB_TXCSR_DMAMODE ; + txcsr |=MUSB_TXCSR_DMAENAB ; + } txcsr |=MUSB_TXCSR_TXPKTRDY ;musb_writew (mbase, offset, txcsr); }
Greg Kroah-Hartman
maintainerPATCH 189/205 staging: speakup: fix tty-operation NULL derefs
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit a1960e0f1639cb1f7a3d94521760fc73091f6640 upstream.
The send_xchar() and tiocmset() tty operations are optional. Add the missing sanity checks to prevent user-space triggerable NULL-pointer dereferences.
--- drivers/staging/speakup/spk_ttyio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/speakup/spk_ttyio.c +4 -2
@@ -246,7 +246,8 @@ static void spk_ttyio_send_xchar(char chreturn ; } - speakup_tty->ops->send_xchar (speakup_tty, ch); +if (speakup_tty->ops->send_xchar) + speakup_tty->ops->send_xchar (speakup_tty, ch);mutex_unlock (&speakup_tty_mutex); }
@@ -258,7 +259,8 @@ static void spk_ttyio_tiocmset(unsignedreturn ; } - speakup_tty->ops->tiocmset (speakup_tty, set, clear); +if (speakup_tty->ops->tiocmset) + speakup_tty->ops->tiocmset (speakup_tty, set, clear);mutex_unlock (&speakup_tty_mutex); }
Greg Kroah-Hartman
maintainerPATCH 190/205 scsi: cxlflash: Prevent deadlock when adapter probe fails
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vaibhav Jain <[email protected]>
commit bb61b843ffd46978d7ca5095453e572714934eeb upstream.
Presently when an error is encountered during probe of the cxlflash adapter, a deadlock is seen with cpu thread stuck inside cxlflash_remove(). Below is the trace of the deadlock as logged by khungtaskd:
cxlflash 0006:00:00.0: cxlflash_probe: init_afu failed rc=-16
INFO: task kworker/80:1:890 blocked for more than 120 seconds.
Not tainted 5.0.0-rc4-capi2-kexec+ #2
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kworker/80:1 D 0 890 2 0x00000808
Workqueue: events work_for_cpu_fn
Call Trace:
0x4d72136320 (unreliable)
__switch_to+0x2cc/0x460
__schedule+0x2bc/0xac0
schedule+0x40/0xb0
cxlflash_remove+0xec/0x640 [cxlflash]
cxlflash_probe+0x370/0x8f0 [cxlflash]
local_pci_probe+0x6c/0x140
work_for_cpu_fn+0x38/0x60
process_one_work+0x260/0x530
worker_thread+0x280/0x5d0
kthread+0x1a8/0x1b0
ret_from_kernel_thread+0x5c/0x80
INFO: task systemd-udevd:5160 blocked for more than 120 seconds.The deadlock occurs as cxlflash_remove() is called from cxlflash_probe() without setting 'cxlflash_cfg->state' to STATE_PROBED and the probe thread starts to wait on 'cxlflash_cfg->reset_waitq'. Since the device was never successfully probed the 'cxlflash_cfg->state' never changes from STATE_PROBING hence the deadlock occurs.
We fix this deadlock by setting the variable 'cxlflash_cfg->state' to STATE_PROBED in case an error occurs during cxlflash_probe() and just before calling cxlflash_remove().
--- drivers/scsi/cxlflash/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/cxlflash/main.c +2 -0
@@ -3659,6 +3659,7 @@ static int cxlflash_probe(struct pci_dev host->max_cmd_len =CXLFLASH_MAX_CDB_LEN ; cfg =shost_priv (host); + cfg->state =STATE_PROBING ; cfg->host = host; rc =alloc_mem (cfg);if (rc) {
@@ -3741,6 +3742,7 @@ out:return rc; out_remove: + cfg->state =STATE_PROBED ;cxlflash_remove (pdev); goto out; }
Greg Kroah-Hartman
maintainerPATCH 191/205 scsi: aic94xx: fix module loading
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <[email protected]>
commit 42caa0edabd6a0a392ec36a5f0943924e4954311 upstream.
The aic94xx driver is currently failing to load with errors like
sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:03.0/0000:02:00.3/0000:07:02.0/revision'
Because the PCI code had recently added a file named 'revision' to every PCI device. Fix this by renaming the aic94xx revision file to aic_revision. This is safe to do for us because as far as I can tell, there's nothing in userspace relying on the current aic94xx revision file so it can be renamed without breaking anything.
--- drivers/scsi/aic94xx/aic94xx_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/aic94xx/aic94xx_init.c +4 -4
@@ -281,7 +281,7 @@ static ssize_t asd_show_dev_rev(struct dreturn snprintf (buf,PAGE_SIZE ,"%s\n" , asd_dev_rev[asd_ha->revision_id]); } -static DEVICE_ATTR(revision, S_IRUGO, asd_show_dev_rev, NULL); +static DEVICE_ATTR(aic_revision, S_IRUGO, asd_show_dev_rev, NULL);static ssize_t asd_show_dev_bios_build (struct device *dev,struct device_attribute *attr,char *buf)
@@ -478,7 +478,7 @@ static int asd_create_dev_attrs(struct a {int err; - err =device_create_file (&asd_ha->pcidev->dev, &dev_attr_revision); + err =device_create_file (&asd_ha->pcidev->dev, &dev_attr_aic_revision);if (err)return err;
@@ -500,13 +500,13 @@ err_update_bios: err_biosb:device_remove_file (&asd_ha->pcidev->dev, &dev_attr_bios_build); err_rev: -device_remove_file (&asd_ha->pcidev->dev, &dev_attr_revision); +device_remove_file (&asd_ha->pcidev->dev, &dev_attr_aic_revision);return err; }static void asd_remove_dev_attrs (struct asd_ha_struct *asd_ha) { -device_remove_file (&asd_ha->pcidev->dev, &dev_attr_revision); +device_remove_file (&asd_ha->pcidev->dev, &dev_attr_aic_revision);device_remove_file (&asd_ha->pcidev->dev, &dev_attr_bios_build);device_remove_file (&asd_ha->pcidev->dev, &dev_attr_pcba_sn);device_remove_file (&asd_ha->pcidev->dev, &dev_attr_update_bios);
Greg Kroah-Hartman
maintainerPATCH 182/205 dmaengine: imx-dma: fix wrong callback invoke
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonid Iziumtsev <[email protected]>
commit 341198eda723c8c1cddbb006a89ad9e362502ea2 upstream.
Once the "ld_queue" list is not empty, next descriptor will migrate into "ld_active" list. The "desc" variable will be overwritten during that transition. And later the dmaengine_desc_get_callback_invoke() will use it as an argument. As result we invoke wrong callback.
That behaviour was in place since:
commit fcaaba6c7136 ("dmaengine: imx-dma: fix callback path in tasklet"). But after commit 4cd13c21b207 ("softirq: Let ksoftirqd do its job") things got worse, since possible delay between tasklet_schedule() from DMA irq handler and actual tasklet function execution got bigger. And that gave more time for new DMA request to be submitted and to be put into "ld_queue" list.
It has been noticed that DMA issue is causing problems for "mxc-mmc" driver. While stressing the system with heavy network traffic and writing/reading to/from sd card simultaneously the timeout may happen:
10013000.sdhci: mxcmci_watchdog: read time out (status = 0x30004900)
That often lead to file system corruption.
--- drivers/dma/imx-dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/dma/imx-dma.c +4 -4
@@ -623,7 +623,7 @@ static void imxdma_tasklet(unsigned long {struct imxdma_channel *imxdmac = (void *)data;struct imxdma_engine *imxdma = imxdmac->imxdma; -struct imxdma_desc *desc; +struct imxdma_desc *desc, *next_desc;unsigned long flags;spin_lock_irqsave (&imxdma->lock, flags);
@@ -653,10 +653,10 @@ static void imxdma_tasklet(unsigned longlist_move_tail (imxdmac->ld_active.next, &imxdmac->ld_free);if (!list_empty (&imxdmac->ld_queue)) { - desc = list_first_entry(&imxdmac->ld_queue, struct imxdma_desc, - node); + next_desc =list_first_entry (&imxdmac->ld_queue, + struct imxdma_desc, node);list_move_tail (imxdmac->ld_queue.next, &imxdmac->ld_active); -if (imxdma_xfer_desc (desc) <0 ) +if (imxdma_xfer_desc (next_desc) <0 )dev_warn (imxdma->dev,"%s: channel: %d couldn't xfer desc\n" , __func__, imxdmac->channel); }
Greg Kroah-Hartman
maintainerPATCH 200/205 serial: fix race between flush_to_ldisc and tty_open
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit fedb5760648a291e949f2380d383b5b2d2749b5e upstream.
There still is a race window after the commit b027e2298bd588 ("tty: fix data race between tty_init_dev and flush of buf"), and we encountered this crash issue if receive_buf call comes before tty initialization completes in tty_open and tty->driver_data may be NULL.
CPU0 CPU1
---- ----
tty_open
tty_init_dev
tty_ldisc_unlock
scheduleflush_to_ldisc
receive_buf
tty_port_default_receive_buf
tty_ldisc_receive_buf
n_tty_receive_buf_common
__receive_buf
uart_flush_chars
uart_start
/*tty->driver_data is NULL*/
tty->ops->open
/*init tty->driver_data*/it can be fixed by extending ldisc semaphore lock in tty_init_dev to driver_data initialized completely after tty->ops->open(), but this will lead to get lock on one function and unlock in some other function, and hard to maintain, so fix this race only by checking tty->driver_data when receiving, and return if tty->driver_data is NULL, and n_tty_receive_buf_common maybe calls uart_unthrottle, so add the same check.
Because the tty layer knows nothing about the driver associated with the device, the tty layer can not do anything here, it is up to the tty driver itself to check for this type of race. Fix up the serial driver to correctly check to see if it is finished binding with the device when being called, and if not, abort the tty calls.
[Description and problem report and testing from Li RongQing, I rewrote the patch to be in the serial layer, not in the tty core - gregkh]
--- drivers/tty/serial/serial_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/serial_core.c +6 -0
@@ -143,6 +143,9 @@ static void uart_start(struct tty_structstruct uart_port *port;unsigned long flags; +if (!state) +return ; + port =uart_port_lock (state, flags);__uart_start (tty);uart_port_unlock (port, flags);
@@ -2415,6 +2418,9 @@ static void uart_poll_put_char(struct ttstruct uart_state *state = drv->state + line;struct uart_port *port; +if (!state) +return ; + port =uart_port_ref (state);if (!port)return ;
Greg Kroah-Hartman
maintainerPATCH 153/205 block/swim3: Fix -EBUSY error when re-opening device after unmount
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 296dcc40f2f2e402facf7cd26cf3f2c8f4b17d47 ]
When the block device is opened with FMODE_EXCL, ref_count is set to -1. This value doesn't get reset when the device is closed which means the device cannot be opened again. Fix this by checking for refcount <= 0 in the release method.
--- drivers/block/swim3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/block/swim3.c +5 -1
@@ -1027,7 +1027,11 @@ static void floppy_release(struct gendisk *disk, fmode_t mode)struct swim3 __iomem *sw = fs->swim3;mutex_lock (&swim3_mutex); -if (fs->ref_count >0 && --fs->ref_count ==0 ) { +if (fs->ref_count >0 ) + --fs->ref_count; +else if (fs->ref_count ==-1 ) + fs->ref_count =0 ; +if (fs->ref_count ==0 ) {swim3_action (fs,MOTOR_OFF );out_8 (&sw->control_bic,0xff );swim3_select (fs,RELAX );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 205/205 perf/x86/intel: Delay memory deallocation until x86_pmu_dead_cpu()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 602cae04c4864bb3487dfe4c2126c8d9e7e1614a upstream.
intel_pmu_cpu_prepare() allocated memory for ->shared_regs among other members of struct cpu_hw_events. This memory is released in intel_pmu_cpu_dying() which is wrong. The counterpart of the intel_pmu_cpu_prepare() callback is x86_pmu_dead_cpu().
Otherwise if the CPU fails on the UP path between CPUHP_PERF_X86_PREPARE and CPUHP_AP_PERF_X86_STARTING then it won't release the memory but allocate new memory on the next attempt to online the CPU (leaking the old memory).
Also, if the CPU down path fails between CPUHP_AP_PERF_X86_STARTING and CPUHP_PERF_X86_PREPARE then the CPU will go back online but never allocate the memory that was released in x86_pmu_dying_cpu().
Make the memory allocation/free symmetrical in regard to the CPU hotplug notifier by moving the deallocation to intel_pmu_cpu_dead().
This started in commit:
a7e3ed1e47011 ("perf: Add support for supplementary event registers").
In principle the bug was introduced in v2.6.39 (!), but it will almost certainly not backport cleanly across the big CPU hotplug rewrite between v4.7-v4.15...
[ bigeasy: Added patch description. ]
[ mingo: Added backporting guidance. ]
[ He Zhe: Fixes conflict caused by missing disable_counter_freeze which is
introduced since v4.20 af3bdb991a5cb. ]
--- arch/x86/events/intel/core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/x86/events/intel/core.c +8 -2
@@ -3420,6 +3420,11 @@ static void free_excl_cntrs(int cpu)static void intel_pmu_cpu_dying (int cpu) { +fini_debug_store_on_cpu (cpu); +} + +static void intel_pmu_cpu_dead (int cpu) +{struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);struct intel_shared_regs *pc;
@@ -3431,8 +3436,6 @@ static void intel_pmu_cpu_dying(int cpu) }free_excl_cntrs (cpu); - -fini_debug_store_on_cpu (cpu); } static void intel_pmu_sched_task(struct perf_event_context *ctx,
@@ -3521,6 +3524,7 @@ static __initconst const struct x86_pmu .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying, + .cpu_dead = intel_pmu_cpu_dead, };static struct attribute *intel_pmu_attrs[];
@@ -3560,6 +3564,8 @@ static __initconst const struct x86_pmu .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying, + .cpu_dead = intel_pmu_cpu_dead, + .guest_get_msrs = intel_guest_get_msrs, .sched_task = intel_pmu_sched_task, };
Greg Kroah-Hartman
maintainerPATCH 203/205 nfsd4: catch some false session retries
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: J. Bruce Fields <[email protected]>
commit 53da6a53e1d414e05759fa59b7032ee08f4e22d7 upstream.
The spec allows us to return NFS4ERR_SEQ_FALSE_RETRY if we notice that the client is making a call that matches a previous (slot, seqid) pair but that *isn't* actually a replay, because some detail of the call doesn't actually match the previous one.
Catching every such case is difficult, but we may as well catch a few easy ones. This also handles the case described in the previous patch, in a different way.
The spec does however require us to catch the case where the difference is in the rpc credentials. This prevents somebody from snooping another user's replies by fabricating retries.
(But the practical value of the attack is limited by the fact that the replies with the most sensitive data are READ replies, which are not normally cached.)
--- fs/nfsd/nfs4state.c | 37 ++++++++++++++++++++++++++++++++++++- fs/nfsd/state.h | 1 + 2 files changed, 37 insertions(+), 1 deletion(-)
fs/nfsd/nfs4state.c +36 -1
@@ -1472,8 +1472,10 @@ free_session_slots(struct nfsd4_session {int i; -for (i =0 ; i < ses->se_fchannel.maxreqs; i++) +for (i =0 ; i < ses->se_fchannel.maxreqs; i++) { +free_svc_cred (&ses->se_slots[i]->sl_cred);kfree (ses->se_slots[i]); + } }/*
@@ -2334,6 +2336,8 @@ nfsd4_store_cache_entry(struct nfsd4_com slot->sl_flags |=NFSD4_SLOT_INITIALIZED ; slot->sl_opcnt = resp->opcnt; slot->sl_status = resp->cstate.status; +free_svc_cred (&slot->sl_cred); +copy_cred (&slot->sl_cred, &resp->rqstp->rq_cred);if (!nfsd4_cache_this (resp)) { slot->sl_flags &= ~NFSD4_SLOT_CACHED ;
@@ -3040,6 +3044,34 @@ static bool nfsd4_request_too_big(structreturn xb->len > session->se_fchannel.maxreq_sz; } +static bool replay_matches_cache (struct svc_rqst *rqstp, +struct nfsd4_sequence *seq,struct nfsd4_slot *slot) +{ +struct nfsd4_compoundargs *argp = rqstp->rq_argp; + +if ((bool )(slot->sl_flags &NFSD4_SLOT_CACHETHIS ) != + (bool )seq->cachethis) +return false; +/* +* If there's an error than the reply can have fewer ops than +* the call. But if we cached a reply with *more* ops than the +* call you're sending us now, then this new call is clearly not +* really a replay of the old one: +*/ +if (slot->sl_opcnt < argp->opcnt) +return false; +/* This is the only check explicitly called by spec: */ +if (!same_creds (&rqstp->rq_cred, &slot->sl_cred)) +return false; +/* +* There may be more comparisons we could actually do, but the +* spec doesn't require us to catch every case where the calls +* don't match (that would require caching the call as well as +* the reply), so we don't bother. +*/ +return true; +} +__be32 nfsd4_sequence (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,union nfsd4_op_u *u)
@@ -3099,6 +3131,9 @@ nfsd4_sequence(struct svc_rqst *rqstp, s status = nfserr_seq_misordered;if (!(slot->sl_flags &NFSD4_SLOT_INITIALIZED )) goto out_put_session; + status = nfserr_seq_false_retry; +if (!replay_matches_cache (rqstp, seq, slot)) + goto out_put_session; cstate->slot = slot; cstate->session = session; cstate->clp = clp;
fs/nfsd/state.h +1 -0
@@ -169,6 +169,7 @@ static inline struct nfs4_delegation *destruct nfsd4_slot {u32 sl_seqid;__be32 sl_status; +struct svc_cred sl_cred;u32 sl_datalen;u16 sl_opcnt;#define NFSD4_SLOT_INUSE (1 << 0)
Greg Kroah-Hartman
maintainerPATCH 184/205 irqchip/gic-v3-its: Plug allocation race for devices sharing a DevID
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit 9791ec7df0e7b4d80706ccea8f24b6542f6059e9 upstream.
On systems or VMs where multiple devices share a single DevID (because they sit behind a PCI bridge, or because the HW is broken in funky ways), we reuse the save its_device structure in order to reflect this.
It turns out that there is a distinct lack of locking when looking up the its_device, and two device being probed concurrently can result in double allocations. That's obviously not nice.
A solution for this is to have a per-ITS mutex that serializes device allocation.
A similar issue exists on the freeing side, which can run concurrently with the allocation. On top of now taking the appropriate lock, we also make sure that a shared device is never freed, as we have no way to currently track the life cycle of such object.
--- drivers/irqchip/irq-gic-v3-its.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +27 -5
@@ -87,9 +87,14 @@ struct its_baser {* The ITS structure - contains most of the infrastructure, with the * top-level MSI domain, the command queue, the collections, and the * list of devices writing to it. +* +* dev_alloc_lock has to be taken for device allocations, while the +* spinlock must be taken to parse data structures such as the device +* list. */ struct its_node {raw_spinlock_t lock; +struct mutex dev_alloc_lock;struct list_head entry;void __iomem *base;phys_addr_t phys_base;
@@ -138,6 +143,7 @@ struct its_device {void *itt;u32 nr_ites;u32 device_id; +bool shared; }; static struct {
@@ -2109,6 +2115,7 @@ static int its_msi_prepare(struct irq_dostruct its_device *its_dev;struct msi_domain_info *msi_info;u32 dev_id; +int err =0 ;/* * We ignore "dev" entierely, and rely on the dev_id that has
@@ -2131,6 +2138,7 @@ static int its_msi_prepare(struct irq_doreturn -EINVAL ; } +mutex_lock (&its->dev_alloc_lock); its_dev =its_find_device (its, dev_id);if (its_dev) {/*
@@ -2138,18 +2146,22 @@ static int its_msi_prepare(struct irq_do* another alias (PCI bridge of some sort). No need to * create the device. */ + its_dev->shared = true;pr_debug ("Reusing ITT for devID %x\n" , dev_id); goto out; } its_dev =its_create_device (its, dev_id, nvec, true); -if (!its_dev) -return -ENOMEM ; +if (!its_dev) { + err = -ENOMEM ; + goto out; + }pr_debug ("ITT %d entries, %d bits\n" , nvec,ilog2 (nvec)); out: +mutex_unlock (&its->dev_alloc_lock); info->scratchpad[0 ].ptr = its_dev; -return 0 ; +return err; }static struct msi_domain_ops its_msi_domain_ops = {
@@ -2252,6 +2264,7 @@ static void its_irq_domain_free(struct i {struct irq_data *d =irq_domain_get_irq_data (domain, virq);struct its_device *its_dev =irq_data_get_irq_chip_data (d); +struct its_node *its = its_dev->its;int i;for (i =0 ; i < nr_irqs; i++) {
@@ -2266,8 +2279,14 @@ static void its_irq_domain_free(struct iirq_domain_reset_irq_data (data); } -/* If all interrupts have been freed, start mopping the floor */ -if (bitmap_empty (its_dev->event_map.lpi_map, +mutex_lock (&its->dev_alloc_lock); + +/* +* If all interrupts have been freed, start mopping the +* floor. This is conditionned on the device not being shared. +*/ +if (!its_dev->shared && +bitmap_empty (its_dev->event_map.lpi_map, its_dev->event_map.nr_lpis)) { its_lpi_free_chunks(its_dev->event_map.lpi_map, its_dev->event_map.lpi_base,
@@ -2279,6 +2298,8 @@ static void its_irq_domain_free(struct iits_free_device (its_dev); } +mutex_unlock (&its->dev_alloc_lock); +irq_domain_free_irqs_parent (domain, virq, nr_irqs); }
@@ -2966,6 +2987,7 @@ static int __init its_probe_one(struct r }raw_spin_lock_init (&its->lock); +mutex_init (&its->dev_alloc_lock);INIT_LIST_HEAD (&its->entry);INIT_LIST_HEAD (&its->its_device_list); typer =gic_read_typer (its_base +GITS_TYPER );
Greg Kroah-Hartman
maintainerPATCH 198/205 perf/core: Dont WARN() for impossible ring-buffer sizes
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
commit 9dff0aa95a324e262ffb03f425d00e4751f3294e upstream.
The perf tool uses /proc/sys/kernel/perf_event_mlock_kb to determine how large its ringbuffer mmap should be. This can be configured to arbitrary values, which can be larger than the maximum possible allocation from kmalloc.
When this is configured to a suitably large value (e.g. thanks to the perf fuzzer), attempting to use perf record triggers a WARN_ON_ONCE() in __alloc_pages_nodemask():
WARNING: CPU: 2 PID: 5666 at mm/page_alloc.c:4511 __alloc_pages_nodemask+0x3f8/0xbc8
Let's avoid this by checking that the requested allocation is possible before calling kzalloc.
--- kernel/events/ring_buffer.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/ring_buffer.c +3 -0
@@ -719,6 +719,9 @@ struct ring_buffer *rb_alloc(int nr_page size =sizeof (struct ring_buffer ); size += nr_pages *sizeof (void *); +if (order_base_2 (size) >=MAX_ORDER ) + goto fail; + rb =kzalloc (size,GFP_KERNEL );if (!rb) goto fail;
Greg Kroah-Hartman
maintainerPATCH 196/205 perf/x86/intel/uncore: Add Node ID mask
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kan Liang <[email protected]>
commit 9e63a7894fd302082cf3627fe90844421a6cbe7f upstream.
Some PCI uncore PMUs cannot be registered on an 8-socket system (HPE Superdome Flex).
To understand which Socket the PCI uncore PMUs belongs to, perf retrieves the local Node ID of the uncore device from CPUNODEID(0xC0) of the PCI configuration space, and the mapping between Socket ID and Node ID from GIDNIDMAP(0xD4). The Socket ID can be calculated accordingly.
The local Node ID is only available at bit 2:0, but current code doesn't mask it. If a BIOS doesn't clear the rest of the bits, an incorrect Node ID will be fetched.
Filter the Node ID by adding a mask.
--- arch/x86/events/intel/uncore_snbep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +3 -1
@@ -1221,6 +1221,8 @@ static struct pci_driver snbep_uncore_pc .id_table = snbep_uncore_pci_ids, }; +#define NODE_ID_MASK 0x7 +/* * build pci bus to socket mapping */
@@ -1242,7 +1244,7 @@ static int snbep_pci2phy_map_init(int de err =pci_read_config_dword (ubox_dev, nodeid_loc, &config);if (err)break ; - nodeid = config; + nodeid = config &NODE_ID_MASK ;/* get the Node ID mapping */ err =pci_read_config_dword (ubox_dev, idmap_loc, &config);if (err)