KVM: arm/arm64: vgic: Use the appropriate TRACE_INCLUDE_PATH
Subsystems (11)
Sasha Levin
maintainerPATCH 1/21 KVM: arm/arm64: vgic: Use the appropriate TRACE_INCLUDE_PATH
From: Zenghui Yu <[email protected]>
[ Upstream commit aac60f1a867773de9eb164013d89c99f3ea1f009 ]
Commit 49dfe94fe5ad ("KVM: arm/arm64: Fix TRACE_INCLUDE_PATH") fixes TRACE_INCLUDE_PATH to the correct relative path to the define_trace.h and explains why did the old one work.
The same fix should be applied to virt/kvm/arm/vgic/trace.h.
--- virt/kvm/arm/vgic/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/arm/vgic/trace.h +1 -1
@@ -30,7 +30,7 @@ TRACE_EVENT(vgic_update_irq_pending,#endif /* _TRACE_VGIC_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../../virt/kvm/arm/vgic +#define TRACE_INCLUDE_PATH ../../virt/kvm/arm/vgic#undef TRACE_INCLUDE_FILE#define TRACE_INCLUDE_FILE trace
Signature · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Sasha Levin
maintainerPATCH 2/21 scsi: ufs: skip shutdown if hba is not powered
From: Stanley Chu <[email protected]>
[ Upstream commit f51913eef23f74c3bd07899dc7f1ed6df9e521d8 ]
In some cases, hba may go through shutdown flow without successful initialization and then make system hang.
For example, if ufshcd_change_power_mode() gets error and leads to ufshcd_hba_exit() to release resources of the host, future shutdown flow may hang the system since the host register will be accessed in unpowered state.
To solve this issue, simply add checking to skip shutdown for above kind of situation.
--- drivers/scsi/ufs/ufshcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +3 -0
@@ -7755,6 +7755,9 @@ int ufshcd_shutdown(struct ufs_hba *hba) {int ret =0 ; +if (!hba->is_powered) + goto out; +if (ufshcd_is_ufs_dev_poweroff (hba) &&ufshcd_is_link_off (hba)) goto out;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/21 scsi: megaraid: disable device when probe failed after enabled device
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 70054aa39a013fa52eff432f2223b8bd5c0048f8 ]
For pci device, need to disable device when probe failed after enabled device.
--- drivers/scsi/megaraid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid.c +2 -2
@@ -4221,11 +4221,11 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)*/ if (pdev->subsystem_vendor ==PCI_VENDOR_ID_COMPAQ && pdev->subsystem_device ==0xC000 ) -return -ENODEV ; + goto out_disable_device;/* Now check the magic signature byte */ pci_read_config_word (pdev,PCI_CONF_AMISIG , &magic);if (magic !=HBA_SIGNATURE_471 && magic !=HBA_SIGNATURE ) -return -ENODEV ; + goto out_disable_device;/* Ok it is probably a megaraid */ }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/21 scsi: qla2xxx: Fix unbound sleep in fcport delete path.
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit c3b6a1d397420a0fdd97af2f06abfb78adc370df ]
There are instances, though rare, where a LOGO request cannot be sent out and the thread in free session done can wait indefinitely. Fix this by putting an upper bound to sleep.
--- drivers/scsi/qla2xxx/qla_target.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_target.c +4 -0
@@ -996,6 +996,7 @@ static void qlt_free_session_done(struct work_struct *work)if (logout_started) {bool traced = false; +u16 cnt =0 ;while (!ACCESS_ONCE (sess->logout_completed)) {if (!traced) {
@@ -1005,6 +1006,9 @@ static void qlt_free_session_done(struct work_struct *work) traced = true; }msleep (100 ); + cnt++; +if (cnt >200 ) +break ; } ql_dbg(ql_dbg_disc, vha, 0xf087,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/21 ARM: OMAP2+: Fix missing reset done flag for am3 and am43
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 8ad8041b98c665b6147e607b749586d6e20ba73a ]
For ti,sysc-omap4 compatible devices with no sysstatus register, we do have reset done status available in the SOFTRESET bit that clears when the reset is done. This is documented for example in am437x TRM for DMTIMER_TIOCP_CFG register. The am335x TRM just says that SOFTRESET bit value 1 means reset is ongoing, but it behaves the same way clearing after reset is done.
With the ti-sysc driver handling this automatically based on no sysstatus register defined, we see warnings if SYSC_HAS_RESET_STATUS is missing in the legacy platform data:
ti-sysc 48042000.target-module: sysc_flags 00000222 != 00000022 ti-sysc 48044000.target-module: sysc_flags 00000222 != 00000022 ti-sysc 48046000.target-module: sysc_flags 00000222 != 00000022
...
Let's fix these warnings by adding SYSC_HAS_RESET_STATUS. Let's also remove the useless parentheses while at it.
If it turns out we do have ti,sysc-omap4 compatible devices without a working SOFTRESET bit we can set up additional quirk handling for it.
--- arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +2 -1
@@ -966,7 +966,8 @@ static struct omap_hwmod_class_sysconfig am33xx_timer_sysc = { .rev_offs = 0x0000, .sysc_offs = 0x0010, .syss_offs = 0x0014, - .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET), + .sysc_flags =SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | + SYSC_HAS_RESET_STATUS, .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | SIDLE_SMART_WKUP), .sysc_fields = &omap_hwmod_sysc_type2,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/21 kvm: x86: Improve emulation of CPUID leaves 0BH and 1FH
In reply to Sasha LevinFrom: Jim Mattson <[email protected]>
[ Upstream commit 43561123ab3759eb6ff47693aec1a307af0aef83 ]
For these CPUID leaves, the EDX output is not dependent on the ECX input (i.e. the SIGNIFCANT_INDEX flag doesn't apply to EDX). Furthermore, the low byte of the ECX output is always identical to the low byte of the ECX input. KVM does not produce the correct ECX and EDX outputs for any undefined subleaves beyond the first.
Special-case these CPUID leaves in kvm_cpuid, so that the ECX and EDX outputs are properly generated for all undefined subleaves.
--- arch/x86/kvm/cpuid.c | 83 +++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 36 deletions(-)
arch/x86/kvm/cpuid.c +47 -36
@@ -868,53 +868,64 @@ struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,EXPORT_SYMBOL_GPL (kvm_find_cpuid_entry);/* -* If no match is found, check whether we exceed the vCPU's limit -* and return the content of the highest valid _standard_ leaf instead. -* This is to satisfy the CPUID specification. +* If the basic or extended CPUID leaf requested is higher than the +* maximum supported basic or extended leaf, respectively, then it is +* out of range. */ -static struct kvm_cpuid_entry2 *check_cpuid_limit (struct kvm_vcpu *vcpu, -u32 function,u32 index) +static bool cpuid_function_in_range (struct kvm_vcpu *vcpu,u32 function) { -struct kvm_cpuid_entry2 *maxlevel; - - maxlevel =kvm_find_cpuid_entry (vcpu, function &0x80000000 ,0 ); -if (!maxlevel || maxlevel->eax >= function) -return NULL ; -if (function &0x80000000 ) { - maxlevel =kvm_find_cpuid_entry (vcpu,0 ,0 ); -if (!maxlevel) -return NULL ; - } -return kvm_find_cpuid_entry (vcpu, maxlevel->eax, index); +struct kvm_cpuid_entry2 *max; + + max =kvm_find_cpuid_entry (vcpu, function &0x80000000 ,0 ); +return max && function <= max->eax; }bool kvm_cpuid (struct kvm_vcpu *vcpu,u32 *eax,u32 *ebx,u32 *ecx,u32 *edx,bool check_limit) {u32 function = *eax, index = *ecx; -struct kvm_cpuid_entry2 *best; -bool entry_found = true; - - best =kvm_find_cpuid_entry (vcpu, function, index); - -if (!best) { - entry_found = false; -if (!check_limit) - goto out; +struct kvm_cpuid_entry2 *entry; +struct kvm_cpuid_entry2 *max; +bool found; - best =check_cpuid_limit (vcpu, function, index); + entry =kvm_find_cpuid_entry (vcpu, function, index); + found = entry; +/* +* Intel CPUID semantics treats any query for an out-of-range +* leaf as if the highest basic leaf (i.e. CPUID.0H:EAX) were +* requested. +*/ +if (!entry && check_limit && !cpuid_function_in_range (vcpu, function)) { + max =kvm_find_cpuid_entry (vcpu,0 ,0 ); +if (max) { + function = max->eax; + entry =kvm_find_cpuid_entry (vcpu, function, index); + } } - -out: -if (best) { - *eax = best->eax; - *ebx = best->ebx; - *ecx = best->ecx; - *edx = best->edx; - }else +if (entry) { + *eax = entry->eax; + *ebx = entry->ebx; + *ecx = entry->ecx; + *edx = entry->edx; + }else { *eax = *ebx = *ecx = *edx =0 ; -trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx, entry_found); -return entry_found; +/* +* When leaf 0BH or 1FH is defined, CL is pass-through +* and EDX is always the x2APIC ID, even for undefined +* subleaves. Index 1 will exist iff the leaf is +* implemented, so we pass through CL iff leaf 1 +* exists. EDX can be copied from any existing index. +*/ +if (function ==0xb || function ==0x1f ) { + entry =kvm_find_cpuid_entry (vcpu, function,1 ); +if (entry) { + *ecx = index &0xff ; + *edx = entry->edx; + } + } + } +trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx, found); +return found; }EXPORT_SYMBOL_GPL (kvm_cpuid);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/21 kvm: x86: Use AMD CPUID semantics for AMD vCPUs
In reply to Sasha LevinFrom: Jim Mattson <[email protected]>
[ Upstream commit 5f41a37b151f6459e0b650a2f4d1d59b6c02d1ab ]
When the guest CPUID information represents an AMD vCPU, return all zeroes for queries of undefined CPUID leaves, whether or not they are in range.
--- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kvm/cpuid.c +4 -2
@@ -893,9 +893,11 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,/* * Intel CPUID semantics treats any query for an out-of-range * leaf as if the highest basic leaf (i.e. CPUID.0H:EAX) were -* requested. +* requested. AMD CPUID semantics returns all zeroes for any +* undefined leaf, whether or not the leaf is in range. */ -if (!entry && check_limit && !cpuid_function_in_range (vcpu, function)) { +if (!entry && check_limit && !guest_cpuid_is_amd (vcpu) && + !cpuid_function_in_range (vcpu, function)) { max =kvm_find_cpuid_entry (vcpu,0 ,0 );if (max) { function = max->eax;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/21 ieee802154: ca8210: prevent memory leak
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 6402939ec86eaf226c8b8ae00ed983936b164908 ]
In ca8210_probe the allocated pdata needs to be assigned to spi_device->dev.platform_data before calling ca8210_get_platform_data. Othrwise when ca8210_get_platform_data fails pdata cannot be released.
--- drivers/net/ieee802154/ca8210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ieee802154/ca8210.c +1 -1
@@ -3153,12 +3153,12 @@ static int ca8210_probe(struct spi_device *spi_device) goto error; } + priv->spi->dev.platform_data = pdata; ret =ca8210_get_platform_data (priv->spi, pdata);if (ret) {dev_crit (&spi_device->dev,"ca8210_get_platform_data failed\n" ); goto error; } - priv->spi->dev.platform_data = pdata; ret =ca8210_dev_com_init (priv);if (ret) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/21 ARM: dts: am4372: Set memory bandwidth limit for DISPC
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit f90ec6cdf674248dcad85bf9af6e064bf472b841 ]
Set memory bandwidth limit to filter out resolutions above 720p@60Hz to avoid underflow errors due to the bandwidth needs of higher resolutions.
am43xx can not provide enough bandwidth to DISPC to correctly handle 'high' resolutions.
--- arch/arm/boot/dts/am4372.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/am4372.dtsi +2 -0
@@ -1118,6 +1118,8 @@ ti,hwmods = "dss_dispc"; clocks = <&disp_clk>; clock-names = "fck"; + + max-memory-bandwidth = <230000000>; }; rfbi: rfbi@4832a800 {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/21 net: dsa: qca8k: Use up to 7 ports for all operations
In reply to Sasha LevinFrom: Michal Vokáč <[email protected]>
[ Upstream commit 7ae6d93c8f052b7a77ba56ed0f654e22a2876739 ]
The QCA8K family supports up to 7 ports. So use the existing QCA8K_NUM_PORTS define to allocate the switch structure and limit all operations with the switch ports.
This was not an issue until commit 0394a63acfe2 ("net: dsa: enable and disable all ports") disabled all unused ports. Since the unused ports 7-11 are outside of the correct register range on this switch some registers were rewritten with invalid content.
--- drivers/net/dsa/qca8k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/qca8k.c +2 -2
@@ -551,7 +551,7 @@ qca8k_setup(struct dsa_switch *ds) BIT(0) << QCA8K_GLOBAL_FW_CTRL1_UC_DP_S);/* Setup connection between CPU port & user ports */ -for (i =0 ; i <DSA_MAX_PORTS ; i++) { +for (i =0 ; i <QCA8K_NUM_PORTS ; i++) {/* CPU port gets connected to all user ports of the switch */ if (dsa_is_cpu_port (ds, i)) { qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),
@@ -900,7 +900,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)if (id !=QCA8K_ID_QCA8337 )return -ENODEV ; - priv->ds =dsa_switch_alloc (&mdiodev->dev,DSA_MAX_PORTS ); + priv->ds =dsa_switch_alloc (&mdiodev->dev,QCA8K_NUM_PORTS );if (!priv->ds)return -ENOMEM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/21 MIPS: dts: ar9331: fix interrupt-controller size
In reply to Sasha LevinFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 0889d07f3e4b171c453b2aaf2b257f9074cdf624 ]
It is two registers each of 4 byte.
--- arch/mips/boot/dts/qca/ar9331.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/boot/dts/qca/ar9331.dtsi +1 -1
@@ -99,7 +99,7 @@ miscintc: interrupt-controller@18060010 { compatible = "qca,ar7240-misc-intc"; - reg = <0x18060010 0x4>; + reg = <0x18060010 0x8>; interrupt-parent = <&cpuintc>; interrupts = <6>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/21 xen/efi: Set nonblocking callbacks
In reply to Sasha LevinFrom: Ross Lagerwall <[email protected]>
[ Upstream commit df359f0d09dc029829b66322707a2f558cb720f7 ]
Other parts of the kernel expect these nonblocking EFI callbacks to exist and crash when running under Xen. Since the implementations of xen_efi_set_variable() and xen_efi_query_variable_info() do not take any locks, use them for the nonblocking callbacks too.
--- arch/arm/xen/efi.c | 2 ++ arch/x86/xen/efi.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/xen/efi.c +2 -0
@@ -31,7 +31,9 @@ void __init xen_efi_runtime_setup(void) efi.get_variable = xen_efi_get_variable; efi.get_next_variable = xen_efi_get_next_variable; efi.set_variable = xen_efi_set_variable; + efi.set_variable_nonblocking = xen_efi_set_variable; efi.query_variable_info = xen_efi_query_variable_info; + efi.query_variable_info_nonblocking = xen_efi_query_variable_info; efi.update_capsule = xen_efi_update_capsule; efi.query_capsule_caps = xen_efi_query_capsule_caps; efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
arch/x86/xen/efi.c +2 -0
@@ -77,7 +77,9 @@ static efi_system_table_t __init *xen_efi_probe(void) efi.get_variable = xen_efi_get_variable; efi.get_next_variable = xen_efi_get_next_variable; efi.set_variable = xen_efi_set_variable; + efi.set_variable_nonblocking = xen_efi_set_variable; efi.query_variable_info = xen_efi_query_variable_info; + efi.query_variable_info_nonblocking = xen_efi_query_variable_info; efi.update_capsule = xen_efi_update_capsule; efi.query_capsule_caps = xen_efi_query_capsule_caps; efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/21 kvm: vmx: Limit guest PMCs to those supported on the host
In reply to Sasha LevinFrom: Jim Mattson <[email protected]>
[ Upstream commit e1fba49cc1e965a3dacd897367ba1e7b340cf0f4 ]
KVM can only virtualize as many PMCs as the host supports.
Limit the number of generic counters and fixed counters to the number of corresponding counters supported on the host, rather than to INTEL_PMC_MAX_GENERIC and INTEL_PMC_MAX_FIXED, respectively.
Note that INTEL_PMC_MAX_GENERIC is currently 32, which exceeds the 18 contiguous MSR indices reserved by Intel for event selectors. Since the existing code relies on a contiguous range of MSR indices for event selectors, it can't possibly work for more than 18 general purpose counters.
--- arch/x86/kvm/pmu_intel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/pmu_intel.c +5 -2
@@ -260,6 +260,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)static void intel_pmu_refresh (struct kvm_vcpu *vcpu) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); +struct x86_pmu_capability x86_pmu;struct kvm_cpuid_entry2 *entry;union cpuid10_eax eax;union cpuid10_edx edx;
@@ -281,8 +282,10 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)if (!pmu->version)return ; +perf_get_x86_pmu_capability (&x86_pmu); + pmu->nr_arch_gp_counters =min_t (int, eax.split.num_counters, -INTEL_PMC_MAX_GENERIC ); + x86_pmu.num_counters_gp); pmu->counter_bitmask[KVM_PMC_GP ] = ((u64 )1 << eax.split.bit_width) -1 ; pmu->available_event_types = ~entry->ebx & ((1ull << eax.split.mask_length) -1 );
@@ -292,7 +295,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) }else { pmu->nr_arch_fixed_counters =min_t (int, edx.split.num_counters_fixed, -INTEL_PMC_MAX_FIXED ); + x86_pmu.num_counters_fixed); pmu->counter_bitmask[KVM_PMC_FIXED ] = ((u64 )1 << edx.split.bit_width_fixed) -1 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/21 nl80211: fix null pointer dereference
In reply to Sasha LevinFrom: Miaoqing Pan <[email protected]>
[ Upstream commit b501426cf86e70649c983c52f4c823b3c40d72a3 ]
If the interface is not in MESH mode, the command 'iw wlanx mpath del' will cause kernel panic.
The root cause is null pointer access in mpp_flush_by_proxy(), as the pointer 'sdata->u.mesh.mpp_paths' is NULL for non MESH interface.
Unable to handle kernel NULL pointer dereference at virtual address 00000068
[...]
PC is at _raw_spin_lock_bh+0x20/0x5c
LR is at mesh_path_del+0x1c/0x17c [mac80211]
[...]
Process iw (pid: 4537, stack limit = 0xd83e0238)
[...]
[<c021211c>] (_raw_spin_lock_bh) from [<bf8c7648>] (mesh_path_del+0x1c/0x17c [mac80211]) [<bf8c7648>] (mesh_path_del [mac80211]) from [<bf6cdb7c>] (extack_doit+0x20/0x68 [compat]) [<bf6cdb7c>] (extack_doit [compat]) from [<c05c309c>] (genl_rcv_msg+0x274/0x30c) [<c05c309c>] (genl_rcv_msg) from [<c05c25d8>] (netlink_rcv_skb+0x58/0xac) [<c05c25d8>] (netlink_rcv_skb) from [<c05c2e14>] (genl_rcv+0x20/0x34) [<c05c2e14>] (genl_rcv) from [<c05c1f90>] (netlink_unicast+0x11c/0x204) [<c05c1f90>] (netlink_unicast) from [<c05c2420>] (netlink_sendmsg+0x30c/0x370) [<c05c2420>] (netlink_sendmsg) from [<c05886d0>] (sock_sendmsg+0x70/0x84) [<c05886d0>] (sock_sendmsg) from [<c0589f4c>] (___sys_sendmsg.part.3+0x188/0x228) [<c0589f4c>] (___sys_sendmsg.part.3) from [<c058add4>] (__sys_sendmsg+0x4c/0x70) [<c058add4>] (__sys_sendmsg) from [<c0208c80>] (ret_fast_syscall+0x0/0x44)
Code: e2822c02 e2822001 e5832004 f590f000 (e1902f9f) ---[ end trace bbd717600f8f884d ]---
--- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/nl80211.c +3 -0
@@ -5464,6 +5464,9 @@ static int nl80211_del_mpath(struct sk_buff *skb, struct genl_info *info)if (!rdev->ops->del_mpath)return -EOPNOTSUPP ; +if (dev->ieee80211_ptr->iftype !=NL80211_IFTYPE_MESH_POINT ) +return -EOPNOTSUPP ; +return rdev_del_mpath (rdev, dev, dst); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/21 mac80211: fix txq null pointer dereference
In reply to Sasha LevinFrom: Miaoqing Pan <[email protected]>
[ Upstream commit 8ed31a264065ae92058ce54aa3cc8da8d81dc6d7 ]
If the interface type is P2P_DEVICE or NAN, read the file of '/sys/kernel/debug/ieee80211/phyx/netdev:wlanx/aqm' will get a NULL pointer dereference. As for those interface type, the pointer sdata->vif.txq is NULL.
Unable to handle kernel NULL pointer dereference at virtual address 00000011 CPU: 1 PID: 30936 Comm: cat Not tainted 4.14.104 #1
task: ffffffc0337e4880 task.stack: ffffff800cd20000 PC is at ieee80211_if_fmt_aqm+0x34/0xa0 [mac80211] LR is at ieee80211_if_fmt_aqm+0x34/0xa0 [mac80211] [...]
Process cat (pid: 30936, stack limit = 0xffffff800cd20000) [...]
[<ffffff8000b7cd00>] ieee80211_if_fmt_aqm+0x34/0xa0 [mac80211] [<ffffff8000b7c414>] ieee80211_if_read+0x60/0xbc [mac80211] [<ffffff8000b7ccc4>] ieee80211_if_read_aqm+0x28/0x30 [mac80211] [<ffffff80082eff94>] full_proxy_read+0x2c/0x48 [<ffffff80081eef00>] __vfs_read+0x2c/0xd4 [<ffffff80081ef084>] vfs_read+0x8c/0x108 [<ffffff80081ef494>] SyS_read+0x40/0x7c
--- net/mac80211/debugfs_netdev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/mac80211/debugfs_netdev.c +9 -2
@@ -490,9 +490,14 @@ static ssize_t ieee80211_if_fmt_aqm( const struct ieee80211_sub_if_data *sdata, char *buf, int buflen) { struct ieee80211_local *local = sdata->local; -struct txq_info *txqi =to_txq_info (sdata->vif.txq); +struct txq_info *txqi;int len; +if (!sdata->vif.txq) +return 0 ; + + txqi =to_txq_info (sdata->vif.txq); +spin_lock_bh (&local->fq.lock);rcu_read_lock ();
@@ -659,7 +664,9 @@ static void add_common_files(struct ieee80211_sub_if_data *sdata)DEBUGFS_ADD (rc_rateidx_vht_mcs_mask_5ghz);DEBUGFS_ADD (hw_queues); -if (sdata->local->ops->wake_tx_queue) +if (sdata->local->ops->wake_tx_queue && + sdata->vif.type !=NL80211_IFTYPE_P2P_DEVICE && + sdata->vif.type !=NL80211_IFTYPE_NAN )DEBUGFS_ADD (aqm); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/21 mips: Loongson: Fix the link time qualifier of 'serial_exit()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 25b69a889b638b0b7e51e2c4fe717a66bec0e566 ]
'exit' functions should be marked as __exit, not __init.
--- arch/mips/loongson64/common/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/loongson64/common/serial.c +1 -1
@@ -110,7 +110,7 @@ static int __init serial_init(void) }module_init (serial_init); -static void __init serial_exit (void ) +static void __exit serial_exit(void) {platform_device_unregister (&uart8250_device); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/21 net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write()
In reply to Sasha LevinFrom: Yizhuo <[email protected]>
[ Upstream commit 53de429f4e88f538f7a8ec2b18be8c0cd9b2c8e1 ]
In function mdio_sc_cfg_reg_write(), variable "reg_value" could be uninitialized if regmap_read() fails. However, "reg_value" is used to decide the control flow later in the if statement, which is potentially unsafe.
--- drivers/net/ethernet/hisilicon/hns_mdio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns_mdio.c +5 -1
@@ -156,11 +156,15 @@ static int mdio_sc_cfg_reg_write(struct hns_mdio_device *mdio_dev, {u32 time_cnt;u32 reg_value; +int ret;regmap_write (mdio_dev->subctrl_vbase, cfg_reg, set_val);for (time_cnt =MDIO_TIMEOUT ; time_cnt; time_cnt--) { -regmap_read (mdio_dev->subctrl_vbase, st_reg, ®_value); + ret =regmap_read (mdio_dev->subctrl_vbase, st_reg, ®_value); +if (ret) +return ret; + reg_value &= st_msk;if ((!!check_st) == (!!reg_value))break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/21 vfs: Fix EOVERFLOW testing in put_compat_statfs64
In reply to Sasha LevinFrom: Eric Sandeen <[email protected]>
[ Upstream commit cc3a7bfe62b947b423fcb2cfe89fcba92bf48fa3 ]
Today, put_compat_statfs64() disallows nearly any field value over 2^32 if f_bsize is only 32 bits, but that makes no sense. compat_statfs64 is there for the explicit purpose of providing 64-bit fields for f_files, f_ffree, etc. And f_bsize is always only 32 bits.
As a result, 32-bit userspace gets -EOVERFLOW for i.e. large file counts even with -D_FILE_OFFSET_BITS=64 set.
In reality, only f_bsize and f_frsize can legitimately overflow (fields like f_type and f_namelen should never be large), so test only those fields.
This bug was discussed at length some time ago, and this is the proposal Al suggested at https://lkml.org/lkml/2018/8/6/640. It seemed to get dropped amid the discussion of other related changes, but this part seems obviously correct on its own, so I've picked it up and sent it, for expediency.
--- fs/statfs.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
fs/statfs.c +4 -13
@@ -304,19 +304,10 @@ COMPAT_SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct compat_statfs __user *,static int put_compat_statfs64 (struct compat_statfs64 __user *ubuf,struct kstatfs *kbuf) {struct compat_statfs64 buf; -if (sizeof (ubuf->f_bsize) ==4 ) { -if ((kbuf->f_type | kbuf->f_bsize | kbuf->f_namelen | - kbuf->f_frsize | kbuf->f_flags) &0xffffffff00000000ULL ) -return -EOVERFLOW ; -/* f_files and f_ffree may be -1; it's okay -* to stuff that into 32 bits */ -if (kbuf->f_files !=0xffffffffffffffffULL - && (kbuf->f_files &0xffffffff00000000ULL )) -return -EOVERFLOW ; -if (kbuf->f_ffree !=0xffffffffffffffffULL - && (kbuf->f_ffree &0xffffffff00000000ULL )) -return -EOVERFLOW ; - } + +if ((kbuf->f_bsize | kbuf->f_frsize) &0xffffffff00000000ULL ) +return -EOVERFLOW ; +memset (&buf,0 ,sizeof (struct compat_statfs64 )); buf.f_type = kbuf->f_type; buf.f_bsize = kbuf->f_bsize;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/21 r8152: Set macpassthru in reset_resume callback
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit a54cdeeb04fc719e4c7f19d6e28dba7ea86cee5b ]
r8152 may fail to establish network connection after resume from system suspend.
If the USB port connects to r8152 lost its power during system suspend, the MAC address was written before is lost. The reason is that The MAC address doesn't get written again in its reset_resume callback.
So let's set MAC address again in reset_resume callback. Also remove unnecessary lock as no other locking attempt will happen during reset_resume.
--- drivers/net/usb/r8152.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/usb/r8152.c +1 -2
@@ -4465,10 +4465,9 @@ static int rtl8152_reset_resume(struct usb_interface *intf)struct r8152 *tp =usb_get_intfdata (intf);clear_bit (SELECTIVE_SUSPEND , &tp->flags); -mutex_lock (&tp->control); tp->rtl_ops.init (tp);queue_delayed_work (system_long_wq, &tp->hw_phy_work,0 ); -mutex_unlock (&tp->control); +set_ethernet_addr (tp);return rtl8152_resume (intf); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/21 namespace: fix namespace.pl script to support relative paths
In reply to Sasha LevinFrom: Jacob Keller <[email protected]>
[ Upstream commit 82fdd12b95727640c9a8233c09d602e4518e71f7 ]
The namespace.pl script does not work properly if objtree is not set to an absolute path. The do_nm function is run from within the find function, which changes directories.
Because of this, appending objtree, $File::Find::dir, and $source, will return a path which is not valid from the current directory.
This used to work when objtree was set to an absolute path when using "make namespacecheck". It appears to have not worked when calling ./scripts/namespace.pl directly.
This behavior was changed in 7e1c04779efd ("kbuild: Use relative path for $(objtree)", 2014-05-14)
Rather than fixing the Makefile to set objtree to an absolute path, just fix namespace.pl to work when srctree and objtree are relative. Also fix the script to use an absolute path for these by default.
Use the File::Spec module for this purpose. It's been part of perl 5 since 5.005.
The curdir() function is used to get the current directory when the objtree and srctree aren't set in the environment.
rel2abs() is used to convert possibly relative objtree and srctree environment variables to absolute paths.
Finally, the catfile() function is used instead of string appending paths together, since this is more robust when joining paths together.
--- scripts/namespace.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
scripts/namespace.pl +7 -6
@@ -65,13 +65,14 @@ use warnings; use strict; use File::Find; +use File::Spec; my $nm = ($ENV{'NM'} || "nm") . " -p"; my $objdump = ($ENV{'OBJDUMP'} || "objdump") . " -s -j .comment"; -my $srctree = ""; -my $objtree = ""; -$srctree = "$ENV{'srctree'}/" if (exists($ENV{'srctree'})); -$objtree = "$ENV{'objtree'}/" if (exists($ENV{'objtree'})); +my $srctree = File::Spec->curdir(); +my $objtree = File::Spec->curdir(); +$srctree = File::Spec->rel2abs($ENV{'srctree'}) if (exists($ENV{'srctree'})); +$objtree = File::Spec->rel2abs($ENV{'objtree'}) if (exists($ENV{'objtree'})); if ($#ARGV != -1) { print STDERR "usage: $0 takes no parameters\n";
@@ -231,9 +232,9 @@ sub do_nm } ($source = $basename) =~ s/\.o$//; if (-e "$source.c" || -e "$source.S") { - $source = "$objtree$File::Find::dir/$source"; + $source = File::Spec->catfile($objtree, $File::Find::dir, $source) } else { - $source = "$srctree$File::Find::dir/$source"; + $source = File::Spec->catfile($srctree, $File::Find::dir, $source) } if (! -e "$source.c" && ! -e "$source.S") { # No obvious source, exclude the object if it is conglomerate
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/21 Make filldir[64]() verify the directory entry filename is valid
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd ]
This has been discussed several times, and now filesystem people are talking about doing it individually at the filesystem layer, so head that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names due to filesystem corruption don't cause an immediate failure, but only an error at the end of the readdir(), so that people can still see the filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking requires this since it's about filesystem corruption. It's really more "protect user space from bad behavior" as pointed out by Jann. But since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure representing the directory entry at the current position in the directory stream specified by the argument dirp, and position the directory stream at the next entry. It shall return a null pointer upon reaching the end of the directory stream. The structure dirent defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The characters composing the name may be selected from the set of all character values excluding the slash character and the null byte. The filenames dot and dot-dot have special meaning. A filename is sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces that nobody uses.
Also note that if this ends up being noticeable as a performance regression, we can fix that to do a much more optimized model that checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for one pattern at a time anyway, and we really _should_ check for NUL too (but see the comment about "soft errors" in the code about why it currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name lookup code looks for pathname terminating characters in parallel.
--- fs/readdir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
fs/readdir.c +40 -0
@@ -65,6 +65,40 @@ int iterate_dir(struct file *file, struct dir_context *ctx) }EXPORT_SYMBOL (iterate_dir); +/* +* POSIX says that a dirent name cannot contain NULL or a '/'. +* +* It's not 100% clear what we should really do in this case. +* The filesystem is clearly corrupted, but returning a hard +* error means that you now don't see any of the other names +* either, so that isn't a perfect alternative. +* +* And if you return an error, what error do you use? Several +* filesystems seem to have decided on EUCLEAN being the error +* code for EFSCORRUPTED, and that may be the error to use. Or +* just EIO, which is perhaps more obvious to users. +* +* In order to see the other file names in the directory, the +* caller might want to make this a "soft" error: skip the +* entry, and return the error at the end instead. +* +* Note that this should likely do a "memchr(name, 0, len)" +* check too, since that would be filesystem corruption as +* well. However, that case can't actually confuse user space, +* which has to do a strlen() on the name anyway to find the +* filename length, and the above "soft error" worry means +* that it's probably better left alone until we have that +* issue clarified. +*/ +static int verify_dirent_name (const char *name,int len) +{ +if (WARN_ON_ONCE (!len)) +return -EIO ; +if (WARN_ON_ONCE (memchr (name,'/' , len))) +return -EIO ; +return 0 ; +} +/* * Traditional linux readdir() handling.. *
@@ -174,6 +208,9 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,int reclen =ALIGN (offsetof(struct linux_dirent , d_name) + namlen +2 ,sizeof (long )); + buf->error =verify_dirent_name (name, namlen); +if (unlikely (buf->error)) +return buf->error; buf->error = -EINVAL ;/* only used if we fail.. */ if (reclen > buf->count)return -EINVAL ;
@@ -260,6 +297,9 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,int reclen =ALIGN (offsetof(struct linux_dirent64 , d_name) + namlen +1 ,sizeof (u64)); + buf->error =verify_dirent_name (name, namlen); +if (unlikely (buf->error)) +return buf->error; buf->error = -EINVAL ;/* only used if we fail.. */ if (reclen > buf->count)return -EINVAL ;
Signature · 1 line
2.20.1