5.1.1-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH 1/30 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit a0033bd1eae4650b69be07c17cb87393da584563 upstream.
With CONFIG_DEBUG_PREEMPT=y, the put_cpu_ptr() triggers an underflow warning in preempt_count_sub().
--- drivers/hv/hv.c | 1 - 1 file changed, 1 deletion(-)
drivers/hv/hv.c +0 -1
@@ -408,7 +408,6 @@ int hv_synic_cleanup(unsigned int cpu)clockevents_unbind_device (hv_cpu->clk_evt, cpu);hv_ce_shutdown (hv_cpu->clk_evt); -put_cpu_ptr (hv_cpu); }hv_get_synint_state (VMBUS_MESSAGE_SINT , shared_sint.as_uint64);
Greg Kroah-Hartman
maintainerPATCH 10/30 USB: cdc-acm: fix unthrottle races
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 764478f41130f1b8d8057575b89e69980a0f600d upstream.
Fix two long-standing bugs which could potentially lead to memory corruption or leave the port throttled until it is reopened (on weakly ordered systems), respectively, when read-URB completion races with unthrottle().
First, the URB must not be marked as free before processing is complete to prevent it from being submitted by unthrottle() on another CPU.
CPU 1 CPU 2 ================ ================ complete() unthrottle() process_urb(); smp_mb__before_atomic(); set_bit(i, free); if (test_and_clear_bit(i, free)) submit_urb();
Second, the URB must be marked as free before checking the throttled flag to prevent unthrottle() on another CPU from failing to observe that the URB needs to be submitted if complete() sees that the throttled flag is set.
CPU 1 CPU 2 ================ ================ complete() unthrottle() set_bit(i, free); throttled = 0; smp_mb__after_atomic(); smp_mb(); if (throttled) if (test_and_clear_bit(i, free)) return; submit_urb();
Note that test_and_clear_bit() only implies barriers when the test is successful. To handle the case where the URB is still in use an explicit barrier needs to be added to unthrottle() for the second race condition.
Also note that the first race was fixed by 36e59e0d70d6 ("cdc-acm: fix race between callback and unthrottle") back in 2015, but the bug was reintroduced a year later.
--- drivers/usb/class/cdc-acm.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/usb/class/cdc-acm.c +25 -7
@@ -470,12 +470,12 @@ static void acm_read_bulk_callback(strucstruct acm *acm = rb->instance;unsigned long flags;int status = urb->status; +bool stopped = false; +bool stalled = false;dev_vdbg (&acm->data->dev,"got urb %d, len %d, status %d\n" , rb->index, urb->actual_length, status); -set_bit (rb->index, &acm->read_urbs_free); -if (!acm->dev) {dev_dbg (&acm->data->dev,"%s - disconnected\n" , __func__);return ;
@@ -488,15 +488,16 @@ static void acm_read_bulk_callback(strucbreak ;case -EPIPE :set_bit (EVENT_RX_STALL , &acm->flags); -schedule_work (&acm->work); -return ; + stalled = true; +break ;case -ENOENT :case -ECONNRESET :case -ESHUTDOWN :dev_dbg (&acm->data->dev,"%s - urb shutting down with status: %d\n" , __func__, status); -return ; + stopped = true; +break ;default : dev_dbg(&acm->data->dev, "%s - nonzero urb status received: %d\n",
@@ -505,10 +506,24 @@ static void acm_read_bulk_callback(struc }/* -* Unthrottle may run on another CPU which needs to see events -* in the same order. Submission has an implict barrier +* Make sure URB processing is done before marking as free to avoid +* racing with unthrottle() on another CPU. Matches the barriers +* implied by the test_and_clear_bit() in acm_submit_read_urb(). */ smp_mb__before_atomic (); +set_bit (rb->index, &acm->read_urbs_free); +/* +* Make sure URB is marked as free before checking the throttled flag +* to avoid racing with unthrottle() on another CPU. Matches the +* smp_mb() in unthrottle(). +*/ +smp_mb__after_atomic (); + +if (stopped || stalled) { +if (stalled) +schedule_work (&acm->work); +return ; + }/* throttle device if requested by tty */ spin_lock_irqsave (&acm->read_lock, flags);
@@ -842,6 +857,9 @@ static void acm_tty_unthrottle(struct tt acm->throttle_req =0 ;spin_unlock_irq (&acm->read_lock); +/* Matches the smp_mb__after_atomic() in acm_read_bulk_callback(). */ +smp_mb (); +if (was_throttled)acm_submit_read_urbs (acm,GFP_KERNEL ); }
Greg Kroah-Hartman
maintainerPATCH 11/30 usb-storage: Set virt_boundary_mask to avoid SG overflows
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 747668dbc061b3e62bc1982767a3a1f9815fcf0e upstream.
The USB subsystem has always had an unusual requirement for its scatter-gather transfers: Each element in the scatterlist (except the last one) must have a length divisible by the bulk maxpacket size. This is a particular issue for USB mass storage, which uses SG lists created by the block layer rather than setting up its own.
So far we have scraped by okay because most devices have a logical block size of 512 bytes or larger, and the bulk maxpacket sizes for USB 2 and below are all <= 512. However, USB 3 has a bulk maxpacket size of 1024. Since the xhci-hcd driver includes native SG support, this hasn't mattered much. But now people are trying to use USB-3 mass storage devices with USBIP, and the vhci-hcd driver currently does not have full SG support.
The result is an overflow error, when the driver attempts to implement an SG transfer of 63 512-byte blocks as a single
3584-byte (7 blocks) transfer followed by seven 4096-byte (8 blocks) transfers. The device instead sends 31 1024-byte packets followed by a 512-byte packet, and this overruns the first SG buffer.
Ideally this would be fixed by adding better SG support to vhci-hcd. But for now it appears we can work around the problem by asking the block layer to respect the maxpacket limitation, through the use of the virt_boundary_mask.
--- drivers/usb/storage/scsiglue.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/usb/storage/scsiglue.c +12 -14
@@ -65,6 +65,7 @@ static const char* host_info(struct Scsistatic int slave_alloc (struct scsi_device *sdev) {struct us_data *us =host_to_us (sdev->host); +int maxp;/* * Set the INQUIRY transfer length to 36. We don't use any of
@@ -74,20 +75,17 @@ static int slave_alloc (struct scsi_devi sdev->inquiry_len =36 ;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. -* -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* USB has unusual scatter-gather requirements: the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. Fortunately this value is always a +* power of 2. Inform the block layer about this requirement. +*/ + maxp =usb_maxpacket (us->pusb_dev, us->recv_bulk_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* Some host controllers may have alignment requirements. +* We'll play it safe by requiring 512-byte alignment always. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 12/30 genirq: Prevent use-after-free and work list corruption
In reply to Greg Kroah-HartmanFrom: Prasad Sodagudi <[email protected]>
commit 59c39840f5abf4a71e1810a8da71aaccd6c17d26 upstream.
When irq_set_affinity_notifier() replaces the notifier, then the reference count on the old notifier is dropped which causes it to be freed. But nothing ensures that the old notifier is not longer queued in the work list. If it is queued this results in a use after free and possibly in work list corruption.
Ensure that the work is canceled before the reference is dropped.
--- kernel/irq/manage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/irq/manage.c +3 -1
@@ -357,8 +357,10 @@ irq_set_affinity_notifier(unsigned int i desc->affinity_notify = notify;raw_spin_unlock_irqrestore (&desc->lock, flags); -if (old_notify) +if (old_notify) { +cancel_work_sync (&old_notify->work);kref_put (&old_notify->kref, old_notify->release); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 14/30 iio: adc: qcom-spmi-adc5: Fix of-based module autoloading
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
commit 447ccb4e0834a9f9f0dd5643e421c7f1a1649e6a upstream.
The of_device_id table needs to be registered as module alias in order for automatic module loading to pick the kernel module based on the DeviceTree compatible. So add MODULE_DEVICE_TABLE() to make this happen.
--- drivers/iio/adc/qcom-spmi-adc5.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/qcom-spmi-adc5.c +1 -0
@@ -664,6 +664,7 @@ static const struct of_device_id adc5_ma }, { } }; +MODULE_DEVICE_TABLE (of, adc5_match_table);static int adc5_get_dt_data (struct adc5_chip *adc,struct device_node *node) {
Greg Kroah-Hartman
maintainerPATCH 15/30 cpufreq: armada-37xx: fix frequency calculation for opp
In reply to Greg Kroah-HartmanFrom: Gregory CLEMENT <[email protected]>
commit 8db82563451f976597ab7b282ec655e4390a4088 upstream.
The frequency calculation was based on the current(max) frequency of the CPU. However for low frequency, the value used was already the parent frequency divided by a factor of 2.
Instead of using this frequency, this fix directly get the frequency from the parent clock.
--- drivers/cpufreq/armada-37xx-cpufreq.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/cpufreq/armada-37xx-cpufreq.c +19 -3
@@ -359,11 +359,11 @@ static int __init armada37xx_cpufreq_dristruct armada_37xx_dvfs *dvfs;struct platform_device *pdev;unsigned long freq; -unsigned int cur_frequency; +unsigned int cur_frequency, base_frequency;struct regmap *nb_pm_base, *avs_base;struct device *cpu_dev;int load_lvl, ret; -struct clk *clk; +struct clk *clk, *parent; nb_pm_base =syscon_regmap_lookup_by_compatible ("marvell,armada-3700-nb-pm" );
@@ -399,6 +399,22 @@ static int __init armada37xx_cpufreq_drireturn PTR_ERR (clk); } + parent =clk_get_parent (clk); +if (IS_ERR (parent)) { +dev_err (cpu_dev,"Cannot get parent clock for CPU0\n" ); +clk_put (clk); +return PTR_ERR (parent); + } + +/* Get parent CPU frequency */ + base_frequency =clk_get_rate (parent); + +if (!base_frequency) { +dev_err (cpu_dev,"Failed to get parent clock rate for CPU\n" ); +clk_put (clk); +return -EINVAL ; + } +/* Get nominal (current) CPU frequency */ cur_frequency =clk_get_rate (clk);if (!cur_frequency) {
@@ -431,7 +447,7 @@ static int __init armada37xx_cpufreq_drifor (load_lvl =ARMADA_37XX_DVFS_LOAD_0 ; load_lvl <LOAD_LEVEL_NR ; load_lvl++) {unsigned long u_volt = avs_map[dvfs->avs[load_lvl]] *1000 ; - freq = cur_frequency / dvfs->divider[load_lvl]; + freq = base_frequency / dvfs->divider[load_lvl]; ret =dev_pm_opp_add (cpu_dev, freq, u_volt);if (ret) goto remove_opp;
Greg Kroah-Hartman
maintainerPATCH 16/30 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit c8afd03486c26accdda4846e5561aa3f8e862a9d upstream.
Commit 48402cee6889 ("ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq") makes acpi_lpss_{suspend_late,resume_early}() bail early on BYT/CHT as resume_from_noirq is set.
This means that on resume from hibernate dw_i2c_plat_resume() doesn't get called by the restore_early callback, acpi_lpss_resume_early(). Instead it should be called by the restore_noirq callback matching how things are done when resume_from_noirq is set and we are doing a regular resume.
Change the restore_noirq callback to acpi_lpss_resume_noirq so that dw_i2c_plat_resume() gets properly called when resume_from_noirq is set and we are resuming from hibernate.
Likewise also change the poweroff_noirq callback so that dw_i2c_plat_suspend gets called properly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202139
--- drivers/acpi/acpi_lpss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpi_lpss.c +2 -2
@@ -1142,8 +1142,8 @@ static struct dev_pm_domain acpi_lpss_pm .thaw_noirq = acpi_subsys_thaw_noirq, .poweroff = acpi_subsys_suspend, .poweroff_late = acpi_lpss_suspend_late, - .poweroff_noirq = acpi_subsys_suspend_noirq, - .restore_noirq = acpi_subsys_resume_noirq, + .poweroff_noirq = acpi_lpss_suspend_noirq, + .restore_noirq = acpi_lpss_resume_noirq, .restore_early = acpi_lpss_resume_early, #endif .runtime_suspend = acpi_lpss_runtime_suspend,
Greg Kroah-Hartman
maintainerPATCH 17/30 soc: sunxi: Fix missing dependency on REGMAP_MMIO
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
commit a84014e1db35d8e7af09878d0b4bf30804fb17d5 upstream.
When enabling ARCH_SUNXI from allnoconfig, SUNXI_SRAM is enabled, but not REGMAP_MMIO, so the kernel fails to link with an undefined reference to __devm_regmap_init_mmio_clk. Select REGMAP_MMIO, as suggested in drivers/base/regmap/Kconfig.
This creates the following dependency loop:
drivers/of/Kconfig:68: symbol OF_IRQ depends on IRQ_DOMAIN kernel/irq/Kconfig:63: symbol IRQ_DOMAIN is selected by REGMAP drivers/base/regmap/Kconfig:7: symbol REGMAP default is visible depending on REGMAP_MMIO drivers/base/regmap/Kconfig:39: symbol REGMAP_MMIO is selected by SUNXI_SRAM drivers/soc/sunxi/Kconfig:4: symbol SUNXI_SRAM is selected by USB_MUSB_SUNXI drivers/usb/musb/Kconfig:63: symbol USB_MUSB_SUNXI depends on GENERIC_PHY drivers/phy/Kconfig:7: symbol GENERIC_PHY is selected by PHY_BCM_NS_USB3 drivers/phy/broadcom/Kconfig:29: symbol PHY_BCM_NS_USB3 depends on MDIO_BUS drivers/net/phy/Kconfig:12: symbol MDIO_BUS default is visible depending on PHYLIB drivers/net/phy/Kconfig:181: symbol PHYLIB is selected by ARC_EMAC_CORE drivers/net/ethernet/arc/Kconfig:18: symbol ARC_EMAC_CORE is selected by ARC_EMAC drivers/net/ethernet/arc/Kconfig:24: symbol ARC_EMAC depends on OF_IRQ
To fix the circular dependency, make USB_MUSB_SUNXI select GENERIC_PHY instead of depending on it. This matches the use of GENERIC_PHY by all but two other drivers.
--- drivers/soc/sunxi/Kconfig | 1 + drivers/usb/musb/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/soc/sunxi/Kconfig +1 -0
@@ -4,6 +4,7 @@ config SUNXI_SRAM bool default ARCH_SUNXI + select REGMAP_MMIO help Say y here to enable the SRAM controller support. This device is responsible on mapping the SRAM in the sunXi SoCs
drivers/usb/musb/Kconfig +1 -1
@@ -67,7 +67,7 @@ config USB_MUSB_SUNXI depends on NOP_USB_XCEIV depends on PHY_SUN4I_USB depends on EXTCON - depends on GENERIC_PHY + select GENERIC_PHY select SUNXI_SRAM config USB_MUSB_DAVINCI
Greg Kroah-Hartman
maintainerPATCH 19/30 scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
In reply to Greg Kroah-HartmanFrom: Andrew Vasquez <[email protected]>
commit 5cbdae10bf11f96e30b4d14de7b08c8b490e903c upstream.
Commit e6f77540c067 ("scsi: qla2xxx: Fix an integer overflow in sysfs code") incorrectly set 'optrom_region_size' to 'start+size', which can overflow option-rom boundaries when 'start' is non-zero. Continue setting optrom_region_size to the proper adjusted value of 'size'.
--- drivers/scsi/qla2xxx/qla_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -2
@@ -364,7 +364,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SREADING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
@@ -437,7 +437,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SWRITING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
Greg Kroah-Hartman
maintainerPATCH 2/30 ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit f0996bc2978e02d2ea898101462b960f6119b18f upstream.
Building lib/ubsan.c with gcc-9 results in a ton of nasty warnings like this one:
lib/ubsan.c warning: conflicting types for built-in function
‘__ubsan_handle_negate_overflow’; expected ‘void(void *, void *)’ [-Wbuiltin-declaration-mismatch]
The kernel's declarations of __ubsan_handle_*() often uses 'unsigned long' types in parameters while GCC these parameters as 'void *' types, hence the mismatch.
Fix this by using 'void *' to match GCC's declarations.
--- lib/ubsan.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)
lib/ubsan.c +23 -26
@@ -86,11 +86,13 @@ static bool is_inline_int(struct type_dereturn bits <= inline_bits; } -static s_max get_signed_val (struct type_descriptor *type,unsigned long val) +static s_max get_signed_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) {unsigned extra_bits =sizeof (s_max)*8 -type_bit_width (type); -return ((s_max )val) << extra_bits >> extra_bits; +unsigned long ulong_val = (unsigned long )val; + +return ((s_max )ulong_val) << extra_bits >> extra_bits; }if (type_bit_width (type) ==64 )
@@ -99,15 +101,15 @@ static s_max get_signed_val(struct type_return *(s_max *)val; } -static bool val_is_negative (struct type_descriptor *type,unsigned long val) +static bool val_is_negative (struct type_descriptor *type,void *val) {return type_is_signed (type) &&get_signed_val (type, val) <0 ; } -static u_max get_unsigned_val (struct type_descriptor *type,unsigned long val) +static u_max get_unsigned_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) -return val; +return (unsigned long )val;if (type_bit_width (type) ==64 )return *(u64 *)val;
@@ -116,7 +118,7 @@ static u_max get_unsigned_val(struct typ }static void val_to_string (char *str,size_t size,struct type_descriptor *type, -unsigned long value) +void *value) {if (type_is_int (type)) {if (type_bit_width (type) ==128 ) {
@@ -163,8 +165,8 @@ static void ubsan_epilogue(unsigned long current->in_ubsan--; } -static void handle_overflow (struct overflow_data *data,unsigned long lhs, -unsigned long rhs,char op) +static void handle_overflow (struct overflow_data *data,void *lhs, +void *rhs,char op) {struct type_descriptor *type = data->type;
@@ -191,8 +193,7 @@ static void handle_overflow(struct overf }void __ubsan_handle_add_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'+' );
@@ -200,23 +201,21 @@ void __ubsan_handle_add_overflow(structEXPORT_SYMBOL (__ubsan_handle_add_overflow);void __ubsan_handle_sub_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'-' ); }EXPORT_SYMBOL (__ubsan_handle_sub_overflow);void __ubsan_handle_mul_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'*' ); }EXPORT_SYMBOL (__ubsan_handle_mul_overflow);void __ubsan_handle_negate_overflow (struct overflow_data *data, -unsigned long old_val) +void *old_val) {unsigned long flags;char old_val_str[VALUE_LENGTH ];
@@ -237,8 +236,7 @@ EXPORT_SYMBOL(__ubsan_handle_negate_overvoid __ubsan_handle_divrem_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;char rhs_val_str[VALUE_LENGTH ];
@@ -323,7 +321,7 @@ static void ubsan_type_mismatch_common(s }void __ubsan_handle_type_mismatch (struct type_mismatch_data *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = { .location = &data->location,
@@ -332,12 +330,12 @@ void __ubsan_handle_type_mismatch(struct .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch);void __ubsan_handle_type_mismatch_v1 (struct type_mismatch_data_v1 *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = {
@@ -347,12 +345,12 @@ void __ubsan_handle_type_mismatch_v1(str .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch_v1);void __ubsan_handle_vla_bound_not_positive (struct vla_bound_data *data, -unsigned long bound) +void *bound) {unsigned long flags;char bound_str[VALUE_LENGTH ];
@@ -369,8 +367,7 @@ void __ubsan_handle_vla_bound_not_positi }EXPORT_SYMBOL (__ubsan_handle_vla_bound_not_positive); -void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data, -unsigned long index) +void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data,void *index) {unsigned long flags;char index_str[VALUE_LENGTH ];
@@ -388,7 +385,7 @@ void __ubsan_handle_out_of_bounds(structEXPORT_SYMBOL (__ubsan_handle_out_of_bounds);void __ubsan_handle_shift_out_of_bounds (struct shift_out_of_bounds_data *data, -unsigned long lhs,unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;struct type_descriptor *rhs_type = data->rhs_type;
@@ -439,7 +436,7 @@ void __ubsan_handle_builtin_unreachable(EXPORT_SYMBOL (__ubsan_handle_builtin_unreachable);void __ubsan_handle_load_invalid_value (struct invalid_value_data *data, -unsigned long val) +void *val) {unsigned long flags;char val_str[VALUE_LENGTH ];
Greg Kroah-Hartman
maintainerPATCH 20/30 scsi: qla2xxx: Set remote port devloss timeout to 0
In reply to Greg Kroah-HartmanFrom: Giridhar Malavali <[email protected]>
commit ffc81fc07efc94a04695a8c1d458a06aecaf9f30 upstream.
This patch sets remote_port_devloss value to 0. This indicates to FC-NVMe transport that driver is unloading and transport should not retry.
--- drivers/scsi/qla2xxx/qla_nvme.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/scsi/qla2xxx/qla_nvme.c +7 -12
@@ -615,7 +615,6 @@ static void qla_nvme_unregister_remote_p struct fc_port *fcport = container_of(work, struct fc_port, nvme_del_work);struct qla_nvme_rport *qla_rport, *trport; -scsi_qla_host_t *base_vha;if (!IS_ENABLED (CONFIG_NVME_FC ))return ;
@@ -623,23 +622,19 @@ static void qla_nvme_unregister_remote_pql_log (ql_log_warn,NULL ,0x2112 ,"%s: unregister remoteport on %p\n" ,__func__, fcport); - base_vha =pci_get_drvdata (fcport->vha->hw->pdev); -if (test_bit (PFLG_DRIVER_REMOVING , &base_vha->pci_flags)) { -ql_dbg (ql_dbg_disc, fcport->vha,0x2114 , -"%s: Notify FC-NVMe transport, set devloss=0\n" , - __func__); - -nvme_fc_set_remoteport_devloss (fcport->nvme_remote_port,0 ); - } -list_for_each_entry_safe (qla_rport, trport, &fcport->vha->nvme_rport_list, list) {if (qla_rport->fcport == fcport) {ql_log (ql_log_info, fcport->vha,0x2113 ,"%s: fcport=%p\n" , __func__, fcport); +nvme_fc_set_remoteport_devloss + (fcport->nvme_remote_port,0 );init_completion (&fcport->nvme_del_done); -nvme_fc_unregister_remoteport ( - fcport->nvme_remote_port); +if (nvme_fc_unregister_remoteport + (fcport->nvme_remote_port)) +ql_log (ql_log_info, fcport->vha,0x2114 , +"%s: Failed to unregister nvme_remote_port\n" , + __func__);wait_for_completion (&fcport->nvme_del_done);break ; }
Greg Kroah-Hartman
maintainerPATCH 22/30 Bluetooth: hidp: fix buffer overflow
In reply to Greg Kroah-HartmanFrom: Young Xiao <[email protected]>
commit a1616a5ac99ede5d605047a9012481ce7ff18b16 upstream.
Struct ca is copied from userspace. It is not checked whether the "name" field is NULL terminated, which allows local users to obtain potentially sensitive information from kernel stack memory, via a HIDPCONNADD command.
This vulnerability is similar to CVE-2011-1079.
--- net/bluetooth/hidp/sock.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/hidp/sock.c +1 -0
@@ -75,6 +75,7 @@ static int do_hidp_sock_ioctl(struct socsockfd_put (csock);return err; } + ca.name[sizeof (ca.name)-1 ] =0 ; err =hidp_connection_add (&ca, csock, isock);if (!err &©_to_user (argp, &ca,sizeof (ca)))
Greg Kroah-Hartman
maintainerPATCH 21/30 scsi: qla2xxx: Fix device staying in blocked state
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 2137490f2147a8d0799b72b9a1023efb012d40c7 upstream.
This patch fixes issue reported by some of the customers, who discovered that after cable pull scenario the devices disappear and path seems to remain in blocked state. Once the device reappears, driver does not seem to update path to online. This issue appears because of the defer flag creating race condition where the same session reappears. This patch fixes this issue by indicating SCSI-ML of device lost when qlt_free_session_done() is called from qlt_unreg_sess().
--- drivers/scsi/qla2xxx/qla_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +2 -2
@@ -980,6 +980,8 @@ void qlt_free_session_done(struct work_s sess->send_els_logo);if (!IS_SW_RESV_ADDR (sess->d_id)) { +qla2x00_mark_device_lost (vha, sess,0 ,0 ); +if (sess->send_els_logo) {qlt_port_logo_t logo;
@@ -1160,8 +1162,6 @@ void qlt_unreg_sess(struct fc_port *sessif (sess->se_sess) vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map (sess); -qla2x00_mark_device_lost (vha, sess,0 ,0 ); - sess->deleted =QLA_SESS_DELETION_IN_PROGRESS ; sess->disc_state =DSC_DELETE_PEND ; sess->last_rscn_gen = sess->rscn_gen;
Greg Kroah-Hartman
maintainerPATCH 23/30 Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
The minimum encryption key size for LE connections is 56 bits and to align LE with BR/EDR, enforce 56 bits of minimum encryption key size for BR/EDR connections as well.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_conn.c | 8 ++++++++ 2 files changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -190,6 +190,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
net/bluetooth/hci_conn.c +8 -0
@@ -1276,6 +1276,14 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +*/ +if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) +return 0 ; +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 4/30 staging: wilc1000: Avoid GFP_KERNEL allocation from atomic context.
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit ae26aa844679cdf660e12c7055f958cb90889eb6 upstream.
Since wilc_set_multicast_list() is called with dev->addr_list_lock spinlock held, we can't use GFP_KERNEL memory allocation.
--- drivers/staging/wilc1000/wilc_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/wilc_netdev.c +1 -1
@@ -708,7 +708,7 @@ static void wilc_set_multicast_list(strureturn ; } - mc_list =kmalloc_array (dev->mc.count,ETH_ALEN ,GFP_KERNEL ); + mc_list =kmalloc_array (dev->mc.count,ETH_ALEN ,GFP_ATOMIC );if (!mc_list)return ;
Greg Kroah-Hartman
maintainerPATCH 5/30 staging: most: cdev: fix chrdev_region leak in mod_exit
In reply to Greg Kroah-HartmanFrom: Suresh Udipi <[email protected]>
commit af708900e9a48c0aa46070c8a8cdf0608a1d2025 upstream.
It looks like v4.18-rc1 commit [0] which upstreams mld-1.8.0 commit [1] missed to fix the memory leak in mod_exit function.
Do it now.
[0] aba258b7310167 ("staging: most: cdev: fix chrdev_region leak")
[1] https://github.com/microchip-ais/linux/commit/a2d8f7ae7ea381
("staging: most: cdev: fix leak for chrdev_region")
--- drivers/staging/most/cdev/cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/cdev/cdev.c +1 -1
@@ -549,7 +549,7 @@ static void __exit mod_exit(void)destroy_cdev (c);destroy_channel (c); } -unregister_chrdev_region (comp.devno,1 ); +unregister_chrdev_region (comp.devno,CHRDEV_REGION_SIZE );ida_destroy (&comp.minor_id);class_destroy (comp.class); }
Greg Kroah-Hartman
maintainerPATCH 7/30 usb: dwc3: Allow building USB_DWC3_QCOM without EXTCON
In reply to Greg Kroah-HartmanFrom: Marc Gonzalez <[email protected]>
commit 77a4946516fe488b6a33390de6d749f934a243ba upstream.
Keep EXTCON support optional, as some platforms do not need it.
Do the same for USB_DWC3_OMAP while we're at it.
--- drivers/usb/dwc3/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/dwc3/Kconfig +4 -2
@@ -54,7 +54,8 @@ comment "Platform Glue Driver Support" config USB_DWC3_OMAP tristate "Texas Instruments OMAP5 and similar Platforms" - depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST) + depends on ARCH_OMAP2PLUS || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
@@ -115,7 +116,8 @@ config USB_DWC3_ST config USB_DWC3_QCOM tristate "Qualcomm Platform" - depends on EXTCON && (ARCH_QCOM || COMPILE_TEST) + depends on ARCH_QCOM || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
Greg Kroah-Hartman
maintainerPATCH 9/30 USB: serial: f81232: fix interrupt worker not stop
In reply to Greg Kroah-HartmanFrom: Ji-Ze Hong (Peter Hong) <[email protected]>
commit 804dbee1e49774918339c1e5a87400988c0819e8 upstream.
The F81232 will use interrupt worker to handle MSR change. This patch will fix the issue that interrupt work should stop in close() and suspend().
This also fixes line-status events being disabled after a suspend cycle until the port is re-opened.
--- drivers/usb/serial/f81232.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/usb/serial/f81232.c +39 -0
@@ -556,9 +556,12 @@ static int f81232_open(struct tty_structstatic void f81232_close (struct usb_serial_port *port) { +struct f81232_private *port_priv =usb_get_serial_port_data (port); +f81232_port_disable (port);usb_serial_generic_close (port);usb_kill_urb (port->interrupt_in_urb); +flush_work (&port_priv->interrupt_work); }static void f81232_dtr_rts (struct usb_serial_port *port,int on)
@@ -632,6 +635,40 @@ static int f81232_port_remove(struct usbreturn 0 ; } +static int f81232_suspend (struct usb_serial *serial,pm_message_t message) +{ +struct usb_serial_port *port = serial->port[0 ]; +struct f81232_private *port_priv =usb_get_serial_port_data (port); +int i; + +for (i =0 ; i <ARRAY_SIZE (port->read_urbs); ++i) +usb_kill_urb (port->read_urbs[i]); + +usb_kill_urb (port->interrupt_in_urb); + +if (port_priv) +flush_work (&port_priv->interrupt_work); + +return 0 ; +} + +static int f81232_resume (struct usb_serial *serial) +{ +struct usb_serial_port *port = serial->port[0 ]; +int result; + +if (tty_port_initialized (&port->port)) { + result =usb_submit_urb (port->interrupt_in_urb,GFP_NOIO ); +if (result) { +dev_err (&port->dev,"submit interrupt urb failed: %d\n" , + result); +return result; + } + } + +return usb_serial_generic_resume (serial); +} +static struct usb_serial_driver f81232_device = { .driver = { .owner =THIS_MODULE ,
@@ -655,6 +692,8 @@ static struct usb_serial_driver f81232_d .read_int_callback = f81232_read_int_callback, .port_probe = f81232_port_probe, .port_remove = f81232_port_remove, + .suspend = f81232_suspend, + .resume = f81232_resume, };static struct usb_serial_driver *const serial_drivers[] = {
Greg Kroah-Hartman
maintainercover 5.1.1-stable review
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-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-5.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.1.1-rc1
Will Deacon <[email protected]>
arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
Will Deacon <[email protected]>
locking/futex: Allow low-level atomic operations to return -EAGAIN
Dan Carpenter <[email protected]>
i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()
Ross Zwisler <[email protected]>
ASoC: Intel: avoid Oops if DMA setup fails
Oliver Neukum <[email protected]>
UAS: fix alignment of scatter/gather segments
Chen-Yu Tsai <[email protected]>
Bluetooth: hci_bcm: Fix empty regulator supplies for Intel Macs
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix not initializing L2CAP tx_credits
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Young Xiao <[email protected]>
Bluetooth: hidp: fix buffer overflow
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix device staying in blocked state
Giridhar Malavali <[email protected]>
scsi: qla2xxx: Set remote port devloss timeout to 0
Andrew Vasquez <[email protected]>
scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
Silvio Cesare <[email protected]>
scsi: lpfc: change snprintf to scnprintf for possible overflow
Samuel Holland <[email protected]>
soc: sunxi: Fix missing dependency on REGMAP_MMIO
Hans de Goede <[email protected]>
ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
Gregory CLEMENT <[email protected]>
cpufreq: armada-37xx: fix frequency calculation for opp
Bjorn Andersson <[email protected]>
iio: adc: qcom-spmi-adc5: Fix of-based module autoloading
Alexander Shishkin <[email protected]>
intel_th: pci: Add Comet Lake support
Prasad Sodagudi <[email protected]>
genirq: Prevent use-after-free and work list corruption
Alan Stern <[email protected]>
usb-storage: Set virt_boundary_mask to avoid SG overflows
Johan Hovold <[email protected]>
USB: cdc-acm: fix unthrottle races
Ji-Ze Hong (Peter Hong) <[email protected]>
USB: serial: f81232: fix interrupt worker not stop
Thinh Nguyen <[email protected]>
usb: dwc3: Fix default lpm_nyet_threshold value
Marc Gonzalez <[email protected]>
usb: dwc3: Allow building USB_DWC3_QCOM without EXTCON
Christian Gromm <[email protected]>
staging: most: sound: pass correct device when creating a sound card
Suresh Udipi <[email protected]>
staging: most: cdev: fix chrdev_region leak in mod_exit
Tetsuo Handa <[email protected]>
staging: wilc1000: Avoid GFP_KERNEL allocation from atomic context.
Johan Hovold <[email protected]>
staging: greybus: power_supply: fix prop-descriptor request size
Andrey Ryabinin <[email protected]>
ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
Dexuan Cui <[email protected]>
Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
-------------
Diffstat:
Makefile | 4 +- arch/arm64/include/asm/futex.h | 55 ++-- drivers/acpi/acpi_lpss.c | 4 +- drivers/bluetooth/hci_bcm.c | 20 +- drivers/cpufreq/armada-37xx-cpufreq.c | 22 +- drivers/hv/hv.c | 1 - drivers/hwtracing/intel_th/pci.c | 5 + drivers/i3c/master.c | 5 +- drivers/iio/adc/qcom-spmi-adc5.c | 1 + drivers/scsi/lpfc/lpfc_attr.c | 196 +++++++------- drivers/scsi/lpfc/lpfc_ct.c | 12 +- drivers/scsi/lpfc/lpfc_debugfs.c | 474 +++++++++++++++++---------------- drivers/scsi/lpfc/lpfc_debugfs.h | 6 +- drivers/scsi/qla2xxx/qla_attr.c | 4 +- drivers/scsi/qla2xxx/qla_nvme.c | 19 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/soc/sunxi/Kconfig | 1 + drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/most/cdev/cdev.c | 2 +- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/wilc1000/wilc_netdev.c | 2 +- drivers/usb/class/cdc-acm.c | 32 ++- drivers/usb/dwc3/Kconfig | 6 +- drivers/usb/dwc3/core.c | 2 +- drivers/usb/musb/Kconfig | 2 +- drivers/usb/serial/f81232.c | 39 +++ drivers/usb/storage/scsiglue.c | 26 +- drivers/usb/storage/uas.c | 35 ++- include/net/bluetooth/hci_core.h | 3 + kernel/futex.c | 188 ++++++++----- kernel/irq/manage.c | 4 +- lib/ubsan.c | 49 ++-- net/bluetooth/hci_conn.c | 8 + net/bluetooth/hidp/sock.c | 1 + net/bluetooth/l2cap_core.c | 9 +- sound/soc/intel/common/sst-firmware.c | 8 +- 36 files changed, 716 insertions(+), 537 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 27/30 ASoC: Intel: avoid Oops if DMA setup fails
From: Ross Zwisler <[email protected]>
commit 0efa3334d65b7f421ba12382dfa58f6ff5bf83c4 upstream.
Currently in sst_dsp_new() if we get an error return from sst_dma_new() we just print an error message and then still complete the function successfully. This means that we are trying to run without sst->dma properly set up, which will result in NULL pointer dereference when sst->dma is later used. This was happening for me in sst_dsp_dma_get_channel():
struct sst_dma *dma = dsp->dma;
...
dma->ch = dma_request_channel(mask, dma_chan_filter, dsp);This resulted in:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: sst_dsp_dma_get_channel+0x4f/0x125 [snd_soc_sst_firmware]
Fix this by adding proper error handling for the case where we fail to set up DMA.
This change only affects Haswell and Broadwell systems. Baytrail systems explicilty opt-out of DMA via sst->pdata->resindex_dma_base being set to -1.
--- sound/soc/intel/common/sst-firmware.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/intel/common/sst-firmware.c +6 -2
@@ -1251,11 +1251,15 @@ struct sst_dsp *sst_dsp_new(struct devic goto irq_err; err =sst_dma_new (sst); -if (err) -dev_warn (dev,"sst_dma_new failed %d\n" , err); +if (err) { +dev_err (dev,"sst_dma_new failed %d\n" , err); + goto dma_err; + }return sst; +dma_err: +free_irq (sst->irq, sst); irq_err:if (sst->ops->free) sst->ops->free (sst);
Greg Kroah-Hartman
maintainerPATCH 28/30 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 476c7e1d34f2a03b1aa5a924c50703053fe5f77c upstream.
The problem here is that addr can be I3C_BROADCAST_ADDR (126). That means we're shifting by (126 * 2) % 64 which is 60. The I3C_ADDR_SLOT_STATUS_MASK is an enum which is an unsigned int in GCC so shifts greater than 31 are undefined.
--- drivers/i3c/master.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/i3c/master.c +3 -2
@@ -385,8 +385,9 @@ static void i3c_bus_set_addr_slot_statusreturn ; ptr = bus->addrslots + (bitpos /BITS_PER_LONG ); - *ptr &= ~(I3C_ADDR_SLOT_STATUS_MASK << (bitpos %BITS_PER_LONG )); - *ptr |= status << (bitpos %BITS_PER_LONG ); + *ptr &= ~((unsigned long )I3C_ADDR_SLOT_STATUS_MASK << + (bitpos %BITS_PER_LONG )); + *ptr |= (unsigned long )status << (bitpos %BITS_PER_LONG ); }static bool i3c_bus_dev_addr_is_avail (struct i3c_bus *bus,u8 addr)
Greg Kroah-Hartman
maintainerPATCH 30/30 arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 03110a5cb2161690ae5ac04994d47ed0cd6cef75 upstream.
Our futex implementation makes use of LDXR/STXR loops to perform atomic updates to user memory from atomic context. This can lead to latency problems if we end up spinning around the LL/SC sequence at the expense of doing something useful.
Rework our futex atomic operations so that we return -EAGAIN if we fail to update the futex word after 128 attempts. The core futex code will reschedule if necessary and we'll try again later.
--- arch/arm64/include/asm/futex.h | 55 +++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-)
arch/arm64/include/asm/futex.h +34 -21
@@ -23,26 +23,34 @@#include <asm/errno.h> +#define FUTEX_MAX_LOOPS 128/* What's the largest number you can think of? */ +#define __futex_atomic_op (insn, ret, oldval, uaddr, tmp, oparg) \ do { \ + unsigned int loops = FUTEX_MAX_LOOPS; \ + \ uaccess_enable(); \ asm volatile( \ " prfm pstl1strm, %2\n" \ "1: ldxr %w1, %2\n" \ insn "\n" \ "2: stlxr %w0, %w3, %2\n" \ -" cbnz %w0, 1b\n" \ -" dmb ish\n" \ +" cbz %w0, 3f\n" \ +" sub %w4, %w4, %w0\n" \ +" cbnz %w4, 1b\n" \ +" mov %w0, %w7\n" \ "3:\n" \ +" dmb ish\n" \ " .pushsection .fixup,\"ax\"\n" \ " .align 2\n" \ -"4: mov %w0, %w5\n" \ +"4: mov %w0, %w6\n" \ " b 3b\n" \ " .popsection\n" \ _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ - : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp) \ - : "r" (oparg), "Ir" (-EFAULT) \ + : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp), \ + "+r" (loops) \ + : "r" (oparg), "Ir" (-EFAULT), "Ir" (-EAGAIN) \ : "memory"); \ uaccess_disable(); \ } while (0)
@@ -57,23 +65,23 @@ arch_futex_atomic_op_inuser(int op, intswitch (op) {case FUTEX_OP_SET : -__futex_atomic_op ("mov %w3, %w4" , +__futex_atomic_op ("mov %w3, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ADD : -__futex_atomic_op ("add %w3, %w1, %w4" , +__futex_atomic_op ("add %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_OR : -__futex_atomic_op ("orr %w3, %w1, %w4" , +__futex_atomic_op ("orr %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ANDN : -__futex_atomic_op ("and %w3, %w1, %w4" , +__futex_atomic_op ("and %w3, %w1, %w5" , ret, oldval, uaddr, tmp, ~oparg);break ;case FUTEX_OP_XOR : -__futex_atomic_op ("eor %w3, %w1, %w4" , +__futex_atomic_op ("eor %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;default :
@@ -93,6 +101,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 oldval, u32 newval) {int ret =0 ; +unsigned int loops =FUTEX_MAX_LOOPS ;u32 val, tmp;u32 __user *uaddr;
@@ -104,20 +113,24 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, asmvolatile ("// futex_atomic_cmpxchg_inatomic\n" " prfm pstl1strm, %2\n" "1: ldxr %w1, %2\n" -" sub %w3, %w1, %w4\n" -" cbnz %w3, 3f\n" -"2: stlxr %w3, %w5, %2\n" -" cbnz %w3, 1b\n" -" dmb ish\n" +" sub %w3, %w1, %w5\n" +" cbnz %w3, 4f\n" +"2: stlxr %w3, %w6, %2\n" +" cbz %w3, 3f\n" +" sub %w4, %w4, %w3\n" +" cbnz %w4, 1b\n" +" mov %w0, %w8\n" "3:\n" +" dmb ish\n" +"4:\n" " .pushsection .fixup,\"ax\"\n" -"4: mov %w0, %w6\n" -" b 3b\n" +"5: mov %w0, %w7\n" +" b 4b\n" " .popsection\n" - _ASM_EXTABLE(1b, 4b) - _ASM_EXTABLE(2b, 4b) - : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp) - : "r" (oldval), "r" (newval), "Ir" (-EFAULT) + _ASM_EXTABLE(1b, 5b) + _ASM_EXTABLE(2b, 5b) + : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp), "+r" (loops) + : "r" (oldval), "r" (newval), "Ir" (-EFAULT), "Ir" (-EAGAIN) : "memory");uaccess_disable ();
Greg Kroah-Hartman
maintainerPATCH 25/30 Bluetooth: hci_bcm: Fix empty regulator supplies for Intel Macs
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 62611abc8f37d00e3b0cff0eb2d72fa92b05fd27 upstream.
The code path for Macs goes through bcm_apple_get_resources(), which skips over the code that sets up the regulator supplies. As a result, the call to regulator_bulk_enable() / regulator_bulk_disable() results in a NULL pointer dereference.
This was reported on the kernel.org Bugzilla, bug 202963.
Unbreak Broadcom Bluetooth support on Intel Macs by checking if the supplies were set up before enabling or disabling them.
The same does not need to be done for the clocks, as the common clock framework API checks for NULL pointers.
--- drivers/bluetooth/hci_bcm.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/bluetooth/hci_bcm.c +16 -4
@@ -228,9 +228,15 @@ static int bcm_gpio_set_power(struct bcmint err;if (powered && !dev->res_enabled) { - err =regulator_bulk_enable (BCM_NUM_SUPPLIES , dev->supplies); -if (err) -return err; +/* Intel Macs use bcm_apple_get_resources() and don't +* have regulator supplies configured. +*/ +if (dev->supplies[0 ].supply) { + err =regulator_bulk_enable (BCM_NUM_SUPPLIES , + dev->supplies); +if (err) +return err; + }/* LPO clock needs to be 32.768 kHz */ err =clk_set_rate (dev->lpo_clk,32768 );
@@ -259,7 +265,13 @@ static int bcm_gpio_set_power(struct bcmif (!powered && dev->res_enabled) {clk_disable_unprepare (dev->txco_clk);clk_disable_unprepare (dev->lpo_clk); -regulator_bulk_disable (BCM_NUM_SUPPLIES , dev->supplies); + +/* Intel Macs use bcm_apple_get_resources() and don't +* have regulator supplies configured. +*/ +if (dev->supplies[0 ].supply) +regulator_bulk_disable (BCM_NUM_SUPPLIES , + dev->supplies); }/* wait for device to power on and come out of reset */
Greg Kroah-Hartman
maintainerPATCH 29/30 locking/futex: Allow low-level atomic operations to return -EAGAIN
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 6b4f4bc9cb22875f97023984a625386f0c7cc1c0 upstream.
Some futex() operations, including FUTEX_WAKE_OP, require the kernel to perform an atomic read-modify-write of the futex word via the userspace mapping. These operations are implemented by each architecture in arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which are called in atomic context with the relevant hash bucket locks held.
Although these routines may return -EFAULT in response to a page fault generated when accessing userspace, they are expected to succeed (i.e. return 0) in all other cases. This poses a problem for architectures that do not provide bounded forward progress guarantees or fairness of contended atomic operations and can lead to starvation in some cases.
In these problematic scenarios, we must return back to the core futex code so that we can drop the hash bucket locks and reschedule if necessary, much like we do in the case of a page fault.
Allow architectures to return -EAGAIN from their implementations of arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which will cause the core futex code to reschedule if necessary and return back to the architecture code later on.
--- kernel/futex.c | 188 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 117 insertions(+), 71 deletions(-)
kernel/futex.c +117 -71
@@ -1311,13 +1311,15 @@ static int lookup_pi_state(u32 __user *ustatic int lock_pi_update_atomic (u32 __user *uaddr,u32 uval,u32 newval) { +int err;u32 uninitialized_var (curval );if (unlikely (should_fail_futex (true)))return -EFAULT ; -if (unlikely (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval))) -return -EFAULT ; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (unlikely (err)) +return err;/* If user space value changed, let the caller retry */ return curval != uval ? -EAGAIN :0 ;
@@ -1502,10 +1504,8 @@ static int wake_futex_pi(u32 __user *uadif (unlikely (should_fail_futex (true))) ret = -EFAULT ; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) { - ret = -EFAULT ; - - }else if (curval != uval) { + ret =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (!ret && (curval != uval)) {/* * If a unconditional UNLOCK_PI operation (user space did not * try the TID->0 transition) raced with a waiter setting the
@@ -1700,32 +1700,32 @@ retry_private:double_lock_hb (hb1, hb2); op_ret =futex_atomic_op_inuser (op, uaddr2);if (unlikely (op_ret <0 )) { -double_unlock_hb (hb1, hb2); -#ifndef CONFIG_MMU -/* -* we don't get EFAULT from MMU faults if we don't have an MMU, -* but we might get them from range checking -*/ - ret = op_ret; - goto out_put_keys; -#endif - -if (unlikely (op_ret != -EFAULT )) { +if (!IS_ENABLED (CONFIG_MMU ) || +unlikely (op_ret != -EFAULT && op_ret != -EAGAIN )) { +/* +* we don't get EFAULT from MMU faults if we don't have +* an MMU, but we might get them from range checking +*/ ret = op_ret; goto out_put_keys; } - ret =fault_in_user_writeable (uaddr2); -if (ret) - goto out_put_keys; +if (op_ret == -EFAULT ) { + ret =fault_in_user_writeable (uaddr2); +if (ret) + goto out_put_keys; + } -if (!(flags &FLAGS_SHARED )) +if (!(flags &FLAGS_SHARED )) { +cond_resched (); goto retry_private; + }put_futex_key (&key2);put_futex_key (&key1); +cond_resched (); goto retry; }
@@ -2350,7 +2350,7 @@ static int fixup_pi_state_owner(u32 __usu32 uval,uninitialized_var (curval ), newval;struct task_struct *oldowner, *newowner;u32 newtid; -int ret; +int ret, err =0 ;lockdep_assert_held (q->lock_ptr);
@@ -2421,14 +2421,17 @@ retry:if (!pi_state->owner) newtid |=FUTEX_OWNER_DIED ; -if (get_futex_value_locked (&uval, uaddr)) - goto handle_fault; + err =get_futex_value_locked (&uval, uaddr); +if (err) + goto handle_err;for (;;) { newval = (uval &FUTEX_OWNER_DIED ) | newtid; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) - goto handle_fault; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (err) + goto handle_err; +if (curval == uval)break ; uval = curval;
@@ -2456,23 +2459,37 @@ retry:return 0 ;/* -* To handle the page fault we need to drop the locks here. That gives -* the other task (either the highest priority waiter itself or the -* task which stole the rtmutex) the chance to try the fixup of the -* pi_state. So once we are back from handling the fault we need to -* check the pi_state after reacquiring the locks and before trying to -* do another fixup. When the fixup has been done already we simply -* return. +* In order to reschedule or handle a page fault, we need to drop the +* locks here. In the case of a fault, this gives the other task +* (either the highest priority waiter itself or the task which stole +* the rtmutex) the chance to try the fixup of the pi_state. So once we +* are back from handling the fault we need to check the pi_state after +* reacquiring the locks and before trying to do another fixup. When +* the fixup has been done already we simply return. * * Note: we hold both hb->lock and pi_mutex->wait_lock. We can safely * drop hb->lock since the caller owns the hb -> futex_q relation. * Dropping the pi_mutex->wait_lock requires the state revalidate. */ -handle_fault: +handle_err:raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (q->lock_ptr); - ret =fault_in_user_writeable (uaddr); +switch (err) { +case -EFAULT : + ret =fault_in_user_writeable (uaddr); +break ; + +case -EAGAIN : +cond_resched (); + ret =0 ; +break ; + +default : +WARN_ON_ONCE (1 ); + ret = err; +break ; + }spin_lock (q->lock_ptr);raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);
@@ -3041,10 +3058,8 @@ retry:* A unconditional UNLOCK_PI op raced against a waiter * setting the FUTEX_WAITERS bit. Try again. */ -if (ret == -EAGAIN ) { -put_futex_key (&key); - goto retry; - } +if (ret == -EAGAIN ) + goto pi_retry;/* * wake_futex_pi has detected invalid state. Tell user * space.
@@ -3059,9 +3074,19 @@ retry:* preserve the WAITERS bit not the OWNER_DIED one. We are the * owner. */ -if (cmpxchg_futex_value_locked (&curval, uaddr, uval,0 )) { +if ((ret =cmpxchg_futex_value_locked (&curval, uaddr, uval,0 ))) {spin_unlock (&hb->lock); - goto pi_faulted; +switch (ret) { +case -EFAULT : + goto pi_faulted; + +case -EAGAIN : + goto pi_retry; + +default : +WARN_ON_ONCE (1 ); + goto out_putkey; + } }/*
@@ -3075,6 +3100,11 @@ out_putkey:put_futex_key (&key);return ret; +pi_retry: +put_futex_key (&key); +cond_resched (); + goto retry; + pi_faulted:put_futex_key (&key);
@@ -3435,6 +3465,7 @@ err_unlock:static int handle_futex_death (u32 __user *uaddr,struct task_struct *curr,int pi) {u32 uval,uninitialized_var (nval ), mval; +int err;/* Futex address must be 32bit aligned */ if ((((unsigned long )uaddr) %sizeof (*uaddr)) !=0 )
@@ -3444,42 +3475,57 @@ retry:if (get_user (uval, uaddr))return -1 ; -if ((uval &FUTEX_TID_MASK ) ==task_pid_vnr (curr)) { -/* -* Ok, this dying thread is truly holding a futex -* of interest. Set the OWNER_DIED bit atomically -* via cmpxchg, and if the value had FUTEX_WAITERS -* set, wake up a waiter (if any). (We have to do a -* futex_wake() even if OWNER_DIED is already set - -* to handle the rare but possible case of recursive -* thread-death.) The rest of the cleanup is done in -* userspace. -*/ - mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; -/* -* We are not holding a lock here, but we want to have -* the pagefault_disable/enable() protection because -* we want to handle the fault gracefully. If the -* access fails we try to fault in the futex with R/W -* verification via get_user_pages. get_user() above -* does not guarantee R/W access. If that fails we -* give up and leave the futex locked. -*/ -if (cmpxchg_futex_value_locked (&nval, uaddr, uval, mval)) { +if ((uval &FUTEX_TID_MASK ) !=task_pid_vnr (curr)) +return 0 ; + +/* +* Ok, this dying thread is truly holding a futex +* of interest. Set the OWNER_DIED bit atomically +* via cmpxchg, and if the value had FUTEX_WAITERS +* set, wake up a waiter (if any). (We have to do a +* futex_wake() even if OWNER_DIED is already set - +* to handle the rare but possible case of recursive +* thread-death.) The rest of the cleanup is done in +* userspace. +*/ + mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; + +/* +* We are not holding a lock here, but we want to have +* the pagefault_disable/enable() protection because +* we want to handle the fault gracefully. If the +* access fails we try to fault in the futex with R/W +* verification via get_user_pages. get_user() above +* does not guarantee R/W access. If that fails we +* give up and leave the futex locked. +*/ +if ((err =cmpxchg_futex_value_locked (&nval, uaddr, uval, mval))) { +switch (err) { +case -EFAULT :if (fault_in_user_writeable (uaddr))return -1 ; goto retry; - } -if (nval != uval) + +case -EAGAIN : +cond_resched (); goto retry; -/* -* Wake robust non-PI futexes here. The wakeup of -* PI futexes happens in exit_pi_state(): -*/ -if (!pi && (uval &FUTEX_WAITERS )) -futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +default : +WARN_ON_ONCE (1 ); +return err; + } } + +if (nval != uval) + goto retry; + +/* +* Wake robust non-PI futexes here. The wakeup of +* PI futexes happens in exit_pi_state(): +*/ +if (!pi && (uval &FUTEX_WAITERS )) +futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 26/30 UAS: fix alignment of scatter/gather segments
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 3ae62a42090f1ed48e2313ed256a1182a85fb575 upstream.
This is the UAS version of
747668dbc061b3e62bc1982767a3a1f9815fcf0e
usb-storage: Set virt_boundary_mask to avoid SG overflows
We are not as likely to be vulnerable as storage, as it is unlikelier that UAS is run over a controller without native support for SG, but the issue exists.
The issue has been existing since the inception of the driver.
--- drivers/usb/storage/uas.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
drivers/usb/storage/uas.c +22 -13
@@ -789,24 +789,33 @@ static int uas_slave_alloc(struct scsi_d {struct uas_dev_info *devinfo = (struct uas_dev_info *)sdev->host->hostdata; +int maxp; sdev->hostdata = devinfo;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. +* We have two requirements here. We must satisfy the requirements +* of the physical HC and the demands of the protocol, as we +* definitely want no additional memory allocation in this path +* ruling out using bounce buffers. * -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* For a transmission on USB to continue we must never send +* a package that is smaller than maxpacket. Hence the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. +* If the HC does not ensure that through SG, +* the upper layer must do that. We must assume nothing +* about the capabilities off the HC, so we use the most +* pessimistic requirement. +*/ + + maxp =usb_maxpacket (devinfo->udev, devinfo->data_in_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* The protocol has no requirements on alignment in the strict sense. +* Controllers may or may not have alignment restrictions. +* As this is not exported, we use an extremely conservative guess. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 8/30 usb: dwc3: Fix default lpm_nyet_threshold value
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 8d791929b2fbdf7734c1596d808e55cb457f4562 upstream.
The max possible value for DCTL.LPM_NYET_THRES is 15 and not 255. Change the default value to 15.
--- drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/core.c +1 -1
@@ -1218,7 +1218,7 @@ static void dwc3_get_properties(struct du8 tx_max_burst_prd;/* default to highest possible threshold */ - lpm_nyet_threshold =0xff ; + lpm_nyet_threshold =0xf ;/* default to -3.5dB de-emphasis */ tx_de_emphasis =1 ;
Greg Kroah-Hartman
maintainerPATCH 6/30 staging: most: sound: pass correct device when creating a sound card
In reply to Greg Kroah-HartmanFrom: Christian Gromm <[email protected]>
commit 98592c1faca82a9024a64e4ecead68b19f81c299 upstream.
This patch fixes the usage of the wrong struct device when calling function snd_card_new.
--- drivers/staging/most/sound/sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/sound/sound.c +1 -1
@@ -622,7 +622,7 @@ static int audio_probe_channel(struct moINIT_LIST_HEAD (&adpt->dev_list); iface->priv = adpt;list_add_tail (&adpt->list, &adpt_list); - ret =snd_card_new (&iface->dev,-1 ,"INIC" ,THIS_MODULE , + ret =snd_card_new (iface->driver_dev,-1 ,"INIC" ,THIS_MODULE ,sizeof (*channel), &adpt->card);if (ret <0 ) goto err_free_adpt;
Greg Kroah-Hartman
maintainerPATCH 3/30 staging: greybus: power_supply: fix prop-descriptor request size
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 47830c1127ef166af787caf2f871f23089610a7f upstream.
Since moving the message buffers off the stack, the dynamically allocated get-prop-descriptor request buffer is incorrectly sized due to using the pointer rather than request-struct size when creating the operation.
Fortunately, the pointer size is always larger than this one-byte request, but this could still cause trouble on the remote end due to the unexpected message size.
--- drivers/staging/greybus/power_supply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/greybus/power_supply.c +1 -1
@@ -520,7 +520,7 @@ static int gb_power_supply_prop_descript op =gb_operation_create (connection,GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS , -sizeof (req),sizeof (*resp) + props_count * +sizeof (*req),sizeof (*resp) + props_count *sizeof (struct gb_power_supply_props_desc ),GFP_KERNEL );if (!op)
Greg Kroah-Hartman
maintainerPATCH 24/30 Bluetooth: Fix not initializing L2CAP tx_credits
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
commit ba8f5289f706aed94cc95b15cc5b89e22062f61f upstream.
l2cap_le_flowctl_init was reseting the tx_credits which works only for outgoing connection since that set the tx_credits on the response, for incoming connections that was not the case which leaves the channel without any credits causing it to be suspended.
--- net/bluetooth/l2cap_core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +4 -5
@@ -510,12 +510,12 @@ void l2cap_chan_set_defaults(struct l2ca }EXPORT_SYMBOL_GPL (l2cap_chan_set_defaults); -static void l2cap_le_flowctl_init (struct l2cap_chan *chan) +static void l2cap_le_flowctl_init (struct l2cap_chan *chan,u16 tx_credits) { chan->sdu =NULL ; chan->sdu_last_frag =NULL ; chan->sdu_len =0 ; - chan->tx_credits =0 ; + chan->tx_credits = tx_credits;/* Derive MPS from connection MTU to stop HCI fragmentation */ chan->mps =min_t (u16, chan->imtu, chan->conn->mtu -L2CAP_HDR_SIZE );/* Give enough credits for a full packet */
@@ -1281,7 +1281,7 @@ static void l2cap_le_connect(struct l2caif (test_and_set_bit (FLAG_LE_CONN_REQ_SENT , &chan->flags))return ; -l2cap_le_flowctl_init (chan); +l2cap_le_flowctl_init (chan,0 ); req.psm = chan->psm; req.scid =cpu_to_le16 (chan->scid);
@@ -5532,11 +5532,10 @@ static int l2cap_le_connect_req(struct l chan->dcid = scid; chan->omtu = mtu; chan->remote_mps = mps; - chan->tx_credits =__le16_to_cpu (req->credits);__l2cap_chan_add (conn, chan); -l2cap_le_flowctl_init (chan); +l2cap_le_flowctl_init (chan,__le16_to_cpu (req->credits)); dcid = chan->scid; credits = chan->rx_credits;
Greg Kroah-Hartman
maintainerPATCH 18/30 scsi: lpfc: change snprintf to scnprintf for possible overflow
In reply to Greg Kroah-HartmanFrom: Silvio Cesare <[email protected]>
commit e7f7b6f38a44697428f5a2e7c606de028df2b0e3 upstream.
Change snprintf to scnprintf. There are generally two cases where using snprintf causes problems.
1) Uses of size += snprintf(buf, SIZE - size, fmt, ...)
In this case, if snprintf would have written more characters than what the buffer size (SIZE) is, then size will end up larger than SIZE. In later uses of snprintf, SIZE - size will result in a negative number, leading to problems. Note that size might already be too large by using size = snprintf before the code reaches a case of size += snprintf.
2) If size is ultimately used as a length parameter for a copy back to user space, then it will potentially allow for a buffer overflow and information disclosure when size is greater than SIZE. When the size is used to index the buffer directly, we can have memory corruption. This also means when size = snprintf... is used, it may also cause problems since size may become large. Copying to userspace is mitigated by the HARDENED_USERCOPY kernel configuration.
The solution to these issues is to use scnprintf which returns the number of characters actually written to the buffer, so the size variable will never exceed SIZE.
--- drivers/scsi/lpfc/lpfc_attr.c | 196 ++++++++-------- drivers/scsi/lpfc/lpfc_ct.c | 12 drivers/scsi/lpfc/lpfc_debugfs.c | 474 +++++++++++++++++++-------------------- drivers/scsi/lpfc/lpfc_debugfs.h | 6 4 files changed, 349 insertions(+), 339 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +100 -96
@@ -114,7 +114,7 @@ static ssize_t lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n"); + return scnprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n"); }/**
@@ -134,9 +134,9 @@ lpfc_enable_fip_show(struct device *dev,struct lpfc_hba *phba = vport->phba;if (phba->hba_flag &HBA_FIP_SUPPORT ) -return snprintf (buf,PAGE_SIZE ,"1\n" ); +return scnprintf (buf,PAGE_SIZE ,"1\n" );else -return snprintf (buf,PAGE_SIZE ,"0\n" ); +return scnprintf (buf,PAGE_SIZE ,"0\n" ); } static ssize_t
@@ -564,14 +564,15 @@ lpfc_bg_info_show(struct device *dev, ststruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -if (phba->cfg_enable_bg) +if (phba->cfg_enable_bg) {if (phba->sli3_options &LPFC_SLI3_BG_ENABLED ) -return snprintf (buf,PAGE_SIZE ,"BlockGuard Enabled\n" ); +return scnprintf (buf,PAGE_SIZE , +"BlockGuard Enabled\n" );else -return snprintf (buf,PAGE_SIZE , +return scnprintf (buf,PAGE_SIZE ,"BlockGuard Not Supported\n" ); -else -return snprintf (buf,PAGE_SIZE , + }else +return scnprintf (buf,PAGE_SIZE ,"BlockGuard Disabled\n" ); }
@@ -583,7 +584,7 @@ lpfc_bg_guard_err_show(struct device *destruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_guard_err_cnt); }
@@ -595,7 +596,7 @@ lpfc_bg_apptag_err_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_apptag_err_cnt); }
@@ -607,7 +608,7 @@ lpfc_bg_reftag_err_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_reftag_err_cnt); }
@@ -625,7 +626,7 @@ lpfc_info_show(struct device *dev, struc {struct Scsi_Host *host =class_to_shost (dev); -return snprintf (buf,PAGE_SIZE ,"%s\n" ,lpfc_info (host)); +return scnprintf (buf,PAGE_SIZE ,"%s\n" ,lpfc_info (host)); }/**
@@ -644,7 +645,7 @@ lpfc_serialnum_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->SerialNumber); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->SerialNumber); }/**
@@ -666,7 +667,7 @@ lpfc_temp_sensor_show(struct device *devstruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" ,phba->temp_sensor_support); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->temp_sensor_support); }/**
@@ -685,7 +686,7 @@ lpfc_modeldesc_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ModelDesc); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ModelDesc); }/**
@@ -704,7 +705,7 @@ lpfc_modelname_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ModelName); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ModelName); }/**
@@ -723,7 +724,7 @@ lpfc_programtype_show(struct device *devstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ProgramType); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ProgramType); }/**
@@ -741,7 +742,7 @@ lpfc_mlomgmt_show(struct device *dev, ststruct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (phba->sli.sli_flag &LPFC_MENLO_MAINT )); }
@@ -761,7 +762,7 @@ lpfc_vportnum_show(struct device *dev, sstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->Port); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->Port); }/**
@@ -789,10 +790,10 @@ lpfc_fwrev_show(struct device *dev, stru sli_family = phba->sli4_hba.pc_sli4_params.sli_family;if (phba->sli_rev <LPFC_SLI_REV4 ) - len =snprintf (buf,PAGE_SIZE ,"%s, sli-%d\n" , + len =scnprintf (buf,PAGE_SIZE ,"%s, sli-%d\n" , fwrev, phba->sli_rev);else - len =snprintf (buf,PAGE_SIZE ,"%s, sli-%d:%d:%x\n" , + len =scnprintf (buf,PAGE_SIZE ,"%s, sli-%d:%d:%x\n" , fwrev, phba->sli_rev, if_type, sli_family);return len;
@@ -816,7 +817,7 @@ lpfc_hdw_show(struct device *dev, structlpfc_vpd_t *vp = &phba->vpd;lpfc_jedec_to_ascii (vp->rev.biuRev, hdw); -return snprintf (buf,PAGE_SIZE ,"%s\n" , hdw); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , hdw); }/**
@@ -837,10 +838,11 @@ lpfc_option_rom_version_show(struct devichar fwrev[FW_REV_STR_SIZE ];if (phba->sli_rev <LPFC_SLI_REV4 ) -return snprintf (buf,PAGE_SIZE ,"%s\n" , phba->OptionROMVersion); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , + phba->OptionROMVersion);lpfc_decode_firmware_rev (phba, fwrev,1 ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , fwrev); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , fwrev); }/**
@@ -871,20 +873,20 @@ lpfc_link_state_show(struct device *dev,case LPFC_LINK_DOWN :case LPFC_HBA_ERROR :if (phba->hba_flag &LINK_DISABLED ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Down - User disabled\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Down\n" );break ;case LPFC_LINK_UP :case LPFC_CLEAR_LA :case LPFC_HBA_READY : - len +=snprintf (buf + len,PAGE_SIZE -len,"Link Up - " ); + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Up - " );switch (vport->port_state) {case LPFC_LOCAL_CFG_LINK : - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Configuring Link\n" );break ;case LPFC_FDISC :
@@ -894,38 +896,40 @@ lpfc_link_state_show(struct device *dev,case LPFC_NS_QRY :case LPFC_BUILD_DISC_LIST :case LPFC_DISC_AUTH : - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Discovery\n" );break ;case LPFC_VPORT_READY : - len +=snprintf (buf + len,PAGE_SIZE - len,"Ready\n" ); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Ready\n" );break ;case LPFC_VPORT_FAILED : - len +=snprintf (buf + len,PAGE_SIZE - len,"Failed\n" ); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Failed\n" );break ;case LPFC_VPORT_UNKNOWN : - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Unknown\n" );break ; }if (phba->sli.sli_flag &LPFC_MENLO_MAINT ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Menlo Maint Mode\n" );else if (phba->fc_topology ==LPFC_TOPOLOGY_LOOP ) {if (vport->fc_flag &FC_PUBLIC_LOOP ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Public Loop\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Private Loop\n" ); }else {if (vport->fc_flag &FC_FABRIC ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Fabric\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Point-2-Point\n" ); } }
@@ -937,28 +941,28 @@ lpfc_link_state_show(struct device *dev,struct lpfc_trunk_link link = phba->trunk_link;if (bf_get (lpfc_conf_trunk_port0, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 0: Link %s %s\n" , (link.link0.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link0.fault]);if (bf_get (lpfc_conf_trunk_port1, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 1: Link %s %s\n" , (link.link1.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link1.fault]);if (bf_get (lpfc_conf_trunk_port2, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 2: Link %s %s\n" , (link.link2.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link2.fault]);if (bf_get (lpfc_conf_trunk_port3, &phba->sli4_hba)) - len += snprintf(buf + len, PAGE_SIZE - len, + len += scnprintf(buf + len, PAGE_SIZE - len, "Trunk port 3: Link %s %s\n", (link.link3.state == LPFC_LINK_UP) ? "Up" : "Down. ",
@@ -986,15 +990,15 @@ lpfc_sli4_protocol_show(struct device *dstruct lpfc_hba *phba = vport->phba;if (phba->sli_rev <LPFC_SLI_REV4 ) -return snprintf (buf,PAGE_SIZE ,"fc\n" ); +return scnprintf (buf,PAGE_SIZE ,"fc\n" );if (phba->sli4_hba.lnk_info.lnk_dv ==LPFC_LNK_DAT_VAL ) {if (phba->sli4_hba.lnk_info.lnk_tp ==LPFC_LNK_TYPE_GE ) -return snprintf (buf,PAGE_SIZE ,"fcoe\n" ); +return scnprintf (buf,PAGE_SIZE ,"fcoe\n" );if (phba->sli4_hba.lnk_info.lnk_tp ==LPFC_LNK_TYPE_FC ) -return snprintf (buf,PAGE_SIZE ,"fc\n" ); +return scnprintf (buf,PAGE_SIZE ,"fc\n" ); } -return snprintf (buf,PAGE_SIZE ,"unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"unknown\n" ); }/**
@@ -1014,7 +1018,7 @@ lpfc_oas_supported_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->sli4_hba.pc_sli4_params.oas_supported); }
@@ -1072,7 +1076,7 @@ lpfc_num_discovered_ports_show(struct destruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , vport->fc_map_cnt + vport->fc_unmap_cnt); }
@@ -1586,7 +1590,7 @@ lpfc_nport_evt_cnt_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->nport_event_cnt); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->nport_event_cnt); }int
@@ -1675,7 +1679,7 @@ lpfc_board_mode_show(struct device *dev,else state ="online" ; -return snprintf (buf,PAGE_SIZE ,"%s\n" , state); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , state); }/**
@@ -1901,8 +1905,8 @@ lpfc_max_rpi_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba,NULL ,NULL , &cnt,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1929,8 +1933,8 @@ lpfc_used_rpi_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba,NULL ,NULL , &cnt, &acnt,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1957,8 +1961,8 @@ lpfc_max_xri_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba, &cnt,NULL ,NULL ,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1985,8 +1989,8 @@ lpfc_used_xri_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba, &cnt, &acnt,NULL ,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -2013,8 +2017,8 @@ lpfc_max_vpi_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba,NULL ,NULL ,NULL ,NULL , &cnt,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -2041,8 +2045,8 @@ lpfc_used_vpi_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba,NULL ,NULL ,NULL ,NULL , &cnt, &acnt)) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -2067,10 +2071,10 @@ lpfc_npiv_info_show(struct device *dev,struct lpfc_hba *phba = vport->phba;if (!(phba->max_vpi)) -return snprintf (buf,PAGE_SIZE ,"NPIV Not Supported\n" ); +return scnprintf (buf,PAGE_SIZE ,"NPIV Not Supported\n" );if (vport->port_type ==LPFC_PHYSICAL_PORT ) -return snprintf (buf,PAGE_SIZE ,"NPIV Physical\n" ); -return snprintf (buf,PAGE_SIZE ,"NPIV Virtual (VPI %d)\n" , vport->vpi); +return scnprintf (buf,PAGE_SIZE ,"NPIV Physical\n" ); +return scnprintf (buf,PAGE_SIZE ,"NPIV Virtual (VPI %d)\n" , vport->vpi); }/**
@@ -2092,7 +2096,7 @@ lpfc_poll_show(struct device *dev, strucstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%#x\n" , phba->cfg_poll); +return scnprintf (buf,PAGE_SIZE ,"%#x\n" , phba->cfg_poll); }/**
@@ -2196,7 +2200,7 @@ lpfc_fips_level_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_level); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_level); }/**
@@ -2215,7 +2219,7 @@ lpfc_fips_rev_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_spec_rev); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_spec_rev); }/**
@@ -2234,7 +2238,7 @@ lpfc_dss_show(struct device *dev, structstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s - %sOperational\n" , +return scnprintf (buf,PAGE_SIZE ,"%s - %sOperational\n" , (phba->cfg_enable_dss) ?"Enabled" :"Disabled" , (phba->sli3_options &LPFC_SLI3_DSS_ENABLED ) ?"" :"Not " );
@@ -2263,7 +2267,7 @@ lpfc_sriov_hw_max_virtfn_show(struct devuint16_t max_nr_virtfn; max_nr_virtfn =lpfc_sli_sriov_nr_virtfn_get (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , max_nr_virtfn); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , max_nr_virtfn); }static inline bool lpfc_rangecheck (uint val,uint min,uint max)
@@ -2323,7 +2327,7 @@ lpfc_##attr##_show(struct device *dev, sstruct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\struct lpfc_hba *phba = vport->phba;\ -return snprintf (buf,PAGE_SIZE ,"%d\n" ,\ +return scnprintf (buf,PAGE_SIZE ,"%d\n" ,\ phba->cfg_##attr);\ }
@@ -2351,7 +2355,7 @@ lpfc_##attr##_show(struct device *dev, sstruct lpfc_hba *phba = vport->phba;\uint val =0 ;\ val = phba->cfg_##attr;\ - return snprintf(buf, PAGE_SIZE, "%#x\n",\ + return scnprintf(buf, PAGE_SIZE, "%#x\n",\ phba->cfg_##attr);\ }
@@ -2487,7 +2491,7 @@ lpfc_##attr##_show(struct device *dev, s { \struct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\ - return snprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\ + return scnprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\ }/**
@@ -2512,7 +2516,7 @@ lpfc_##attr##_show(struct device *dev, s { \struct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\ - return snprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\ + return scnprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\ }/**
@@ -2784,7 +2788,7 @@ lpfc_soft_wwpn_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , (unsigned long long )phba->cfg_soft_wwpn); }
@@ -2881,7 +2885,7 @@ lpfc_soft_wwnn_show(struct device *dev, {struct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , (unsigned long long )phba->cfg_soft_wwnn); }
@@ -2947,7 +2951,7 @@ lpfc_oas_tgt_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" ,wwn_to_u64 (phba->cfg_oas_tgt_wwpn)); }
@@ -3015,7 +3019,7 @@ lpfc_oas_priority_show(struct device *destruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_priority); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_priority); }/**
@@ -3078,7 +3082,7 @@ lpfc_oas_vpt_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" ,wwn_to_u64 (phba->cfg_oas_vpt_wwpn)); }
@@ -3149,7 +3153,7 @@ lpfc_oas_lun_state_show(struct device *dstruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_state); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_state); }/**
@@ -3213,7 +3217,7 @@ lpfc_oas_lun_status_show(struct device *if (!(phba->cfg_oas_flags &OAS_LUN_VALID ))return -EFAULT ; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_status); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_status); } static DEVICE_ATTR(lpfc_xlane_lun_status, S_IRUGO, lpfc_oas_lun_status_show, NULL);
@@ -3365,7 +3369,7 @@ lpfc_oas_lun_show(struct device *dev, stif (oas_lun !=NOT_OAS_ENABLED_LUN ) phba->cfg_oas_flags |=OAS_LUN_VALID ; - len +=snprintf (buf + len,PAGE_SIZE -len,"0x%llx" , oas_lun); + len +=scnprintf (buf + len,PAGE_SIZE -len,"0x%llx" , oas_lun);return len; }
@@ -3499,7 +3503,7 @@ lpfc_iocb_hw_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->iocb_max); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->iocb_max); } static DEVICE_ATTR(iocb_hw, S_IRUGO,
@@ -3511,7 +3515,7 @@ lpfc_txq_hw_show(struct device *dev, strstruct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba;struct lpfc_sli_ring *pring =lpfc_phba_elsring (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , pring ? pring->txq_max :0 ); }
@@ -3525,7 +3529,7 @@ lpfc_txcmplq_hw_show(struct device *dev,struct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba;struct lpfc_sli_ring *pring =lpfc_phba_elsring (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , pring ? pring->txcmplq_max :0 ); }
@@ -3561,7 +3565,7 @@ lpfc_nodev_tmo_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -return snprintf (buf,PAGE_SIZE ,"%d\n" , vport->cfg_devloss_tmo); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , vport->cfg_devloss_tmo); }/**
@@ -5169,12 +5173,12 @@ lpfc_fcp_cpu_map_show(struct device *devswitch (phba->cfg_fcp_cpu_map) {case 0 : - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"fcp_cpu_map: No mapping (%d)\n" , phba->cfg_fcp_cpu_map);return len;case 1 : - len += snprintf(buf + len, PAGE_SIZE-len, + len += scnprintf(buf + len, PAGE_SIZE-len, "fcp_cpu_map: HBA centric mapping (%d): " "%d of %d CPUs online from %d possible CPUs\n", phba->cfg_fcp_cpu_map, num_online_cpus(),
@@ -5188,12 +5192,12 @@ lpfc_fcp_cpu_map_show(struct device *dev cpup = &phba->sli4_hba.cpu_map[phba->sli4_hba.curr_disp_cpu];if (!cpu_present (phba->sli4_hba.curr_disp_cpu)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"CPU %02d not present\n" , phba->sli4_hba.curr_disp_cpu);else if (cpup->irq ==LPFC_VECTOR_MAP_EMPTY ) {if (cpup->hdwq ==LPFC_VECTOR_MAP_EMPTY ) - len += snprintf( + len += scnprintf( buf + len, PAGE_SIZE - len, "CPU %02d hdwq None " "physid %d coreid %d ht %d\n",
@@ -5201,7 +5205,7 @@ lpfc_fcp_cpu_map_show(struct device *dev cpup->phys_id, cpup->core_id, cpup->hyper); else - len += snprintf( + len += scnprintf( buf + len, PAGE_SIZE - len, "CPU %02d EQ %04d hdwq %04d " "physid %d coreid %d ht %d\n",
@@ -5210,7 +5214,7 @@ lpfc_fcp_cpu_map_show(struct device *dev cpup->core_id, cpup->hyper); }else {if (cpup->hdwq ==LPFC_VECTOR_MAP_EMPTY ) - len += snprintf( + len += scnprintf( buf + len, PAGE_SIZE - len, "CPU %02d hdwq None " "physid %d coreid %d ht %d IRQ %d\n",
@@ -5218,7 +5222,7 @@ lpfc_fcp_cpu_map_show(struct device *dev cpup->phys_id, cpup->core_id, cpup->hyper, cpup->irq); else - len += snprintf( + len += scnprintf( buf + len, PAGE_SIZE - len, "CPU %02d EQ %04d hdwq %04d " "physid %d coreid %d ht %d IRQ %d\n",
@@ -5233,7 +5237,7 @@ lpfc_fcp_cpu_map_show(struct device *devif (phba->sli4_hba.curr_disp_cpu < phba->sli4_hba.num_possible_cpu && (len >= (PAGE_SIZE -64 ))) { - len +=snprintf (buf + len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"more...\n" );break ; }
@@ -5753,10 +5757,10 @@ lpfc_sg_seg_cnt_show(struct device *dev,struct lpfc_hba *phba = vport->phba;int len; - len =snprintf (buf,PAGE_SIZE ,"SGL sz: %d total SGEs: %d\n" , + len =scnprintf (buf,PAGE_SIZE ,"SGL sz: %d total SGEs: %d\n" , phba->cfg_sg_dma_buf_size, phba->cfg_total_seg_cnt); - len +=snprintf (buf + len,PAGE_SIZE ,"Cfg: %d SCSI: %d NVME: %d\n" , + len +=scnprintf (buf + len,PAGE_SIZE ,"Cfg: %d SCSI: %d NVME: %d\n" , phba->cfg_sg_seg_cnt, phba->cfg_scsi_seg_cnt, phba->cfg_nvme_seg_cnt);return len;
@@ -6755,7 +6759,7 @@ lpfc_show_rport_##field (struct device * { \struct fc_rport *rport =transport_class_to_rport (dev); \struct lpfc_rport_data *rdata = rport->hostdata; \ -return snprintf (buf, sz, format_string, \ +return scnprintf (buf, sz, format_string, \ (rdata->target) ? cast rdata->target->field : 0); \ }
drivers/scsi/lpfc/lpfc_ct.c +6 -6
@@ -1430,7 +1430,7 @@ lpfc_vport_symbolic_port_name(struct lpf* Name object. NPIV is not in play so this integer * value is sufficient and unique per FC-ID. */ - n =snprintf (symbol, size,"%d" , vport->phba->brd_no); + n =scnprintf (symbol, size,"%d" , vport->phba->brd_no);return n; }
@@ -1444,26 +1444,26 @@ lpfc_vport_symbolic_node_name(struct lpflpfc_decode_firmware_rev (vport->phba, fwrev,0 ); - n =snprintf (symbol, size,"Emulex %s" , vport->phba->ModelName); + n =scnprintf (symbol, size,"Emulex %s" , vport->phba->ModelName);if (size < n)return n; - n +=snprintf (symbol + n, size - n," FV%s" , fwrev); + n +=scnprintf (symbol + n, size - n," FV%s" , fwrev);if (size < n)return n; - n +=snprintf (symbol + n, size - n," DV%s." , + n +=scnprintf (symbol + n, size - n," DV%s." , lpfc_release_version);if (size < n)return n; - n +=snprintf (symbol + n, size - n," HN:%s." , + n +=scnprintf (symbol + n, size - n," HN:%s." ,init_utsname ()->nodename);if (size < n)return n;/* Note :- OS name is "Linux" */ - n +=snprintf (symbol + n, size - n," OS:%s\n" , + n +=scnprintf (symbol + n, size - n," OS:%s\n" ,init_utsname ()->sysname);return n; }
drivers/scsi/lpfc/lpfc_debugfs.c +240 -234
1,430 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_debugfs.h +3 -3
@@ -348,7 +348,7 @@ lpfc_debug_dump_qe(struct lpfc_queue *q, pword = q->qe[idx].address; len =0 ; - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len,"QE[%04d]: " , idx); + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"QE[%04d]: " , idx);if (qe_word_cnt >8 )printk (KERN_ERR "%s\n" , line_buf);
@@ -359,11 +359,11 @@ lpfc_debug_dump_qe(struct lpfc_queue *q,if (qe_word_cnt >8 ) { len =0 ;memset (line_buf,0 ,LPFC_LBUF_SZ ); - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len, + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"%03d: " , i); } } - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len,"%08x " , + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"%08x " , ((uint32_t )*pword) &0xffffffff ); pword++; }
Greg Kroah-Hartman
maintainerPATCH 13/30 intel_th: pci: Add Comet Lake support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit e60e9a4b231a20a199d7a61caadc48693c30d695 upstream.
This adds support for Intel TH on Comet Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -165,6 +165,11 @@ static const struct pci_device_id intel_ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Comet Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x02a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.1:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 5.1.1-rc1-ge4f05f7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Greg Kroah-Hartman
maintainerQuoted 23 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.1:
Quoted 9 lines
12 builds: 12 pass, 0 fail 22 boots: 22 pass, 0 fail 32 tests: 32 pass, 0 failLinux version: 5.1.1-rc1-ge4f05f7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra30-cardhu-a04
Wonderful, thanks for testing all of these and letting me know.
greg k-h
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.1.1-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.1.y
git commit: e4f05f7add176a1379bcd3e582b0ca615cf58000
git describe: v5.1-31-ge4f05f7add17
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.1-oe/build/v5.1-31-ge4f05f7add17
No regressions (compared to build v5.1)
No fixes (compared to build v5.1)
Ran 23855 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-fs-tests
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 349 pass: 349 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
Compiled , booted and no regressions on my system.
Thanks,
Vandana.
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 349 pass: 349 fail: 0
Wonderful, thanks for testing all of these and letting me know.
greg k-h
Greg Kroah-Hartman
maintainerQuoted 11 lines · Dan Rue
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Great, thanks!
Greg Kroah-Hartman
maintainerQuoted 9 lines · shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
Quoted 8 lines
Quoted 6 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.Compiled and booted on my test system. No dmesg regressions.
Thanks for testingn all of these and letting me know.
greg k-h
Greg Kroah-Hartman
maintainerQuoted 16 lines · Vandana BN
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.1 release. There are 30 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:35 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 5 lines
Quoted 3 lines
thanks,
greg k-h
Compiled , booted and no regressions on my system.
Wonderful, thansk!