4.14.130-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 4.14.130-stable review
This is the start of the stable review cycle for the 4.14.130 release. There are 51 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 26 Jun 2019 09:22:03 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.130-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.14.130-rc1
Jouni Malinen <[email protected]>
mac80211: Do not use stack memory with scatterlist for GMAC
Yu Wang <[email protected]>
mac80211: handle deauthentication/disassociation from TDLS peer
Johannes Berg <[email protected]>
mac80211: drop robust management frames from unknown TA
Eric Biggers <[email protected]>
cfg80211: fix memory leak of wiphy device name
Steve French <[email protected]>
SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
Marcel Holtmann <[email protected]>
Bluetooth: Fix regression with minimum encryption key size alignment
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Faiz Abbas <[email protected]>
ARM: dts: am57xx-idk: Remove support for voltage switching for SD card
Fabio Estevam <[email protected]>
ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
Naveen N. Rao <[email protected]>
powerpc/bpf: use unsigned division instruction for 64-bit operations
Willem de Bruijn <[email protected]>
can: purge socket error queue on sock destruct
Joakim Zhang <[email protected]>
can: flexcan: fix timeout when set small bitrate
Naohiro Aota <[email protected]>
btrfs: start readahead also in seed devices
Jaesoo Lee <[email protected]>
nvme: Fix u32 overflow in the number of namespace list calculation
Robert Hancock <[email protected]>
hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
Eduardo Valentin <[email protected]>
hwmon: (core) add thermal sensors only if dev->of_node is present
Alexandra Winter <[email protected]>
s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
Miaohe Lin <[email protected]>
net: ipvlan: Fix ipvlan device tso disabled while NETIF_F_IP_CSUM is set
Dan Carpenter <[email protected]>
scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
Avri Altman <[email protected]>
scsi: ufs: Check that space was properly alloced in copy_query_response
George G. Davis <[email protected]>
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
Robin Murphy <[email protected]>
drm/arm/hdlcd: Allow a bit of clock tolerance
Robin Murphy <[email protected]>
drm/arm/hdlcd: Actually validate CRTC modes
Sean Wang <[email protected]>
net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled
Sean Wang <[email protected]>
net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported
Young Xiao <[email protected]>
sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
Gen Zhang <[email protected]>
mdesc: fix a missing-check bug in get_vdev_port_node_info()
Yonglong Liu <[email protected]>
net: hns: Fix loopback test failed at copper ports
Nikita Yushchenko <[email protected]>
net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
Guenter Roeck <[email protected]>
xtensa: Fix section mismatch between memblock_reserve and mem_reserve
YueHaibing <[email protected]>
MIPS: uprobes: remove set but not used variable 'epc'
Kamenee Arumugam <[email protected]>
IB/hfi1: Validate page aligned for a given virtual address
Mike Marciniszyn <[email protected]>
IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
Mike Marciniszyn <[email protected]>
IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
Mike Marciniszyn <[email protected]>
IB/rdmavt: Fix alloc_qpn() WARN_ON()
Helge Deller <[email protected]>
parisc: Fix compiler warnings in float emulation code
YueHaibing <[email protected]>
parport: Fix mem leak in parport_register_dev_model
Jose Abreu <[email protected]>
ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node
Jose Abreu <[email protected]>
ARC: [plat-hsdk]: Add missing multicast filter bins number to GMAC node
Vineet Gupta <[email protected]>
ARC: fix build warnings
Jann Horn <[email protected]>
apparmor: enforce nullbyte at end of tag string
Andrey Smirnov <[email protected]>
Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
Alexander Mikhaylenko <[email protected]>
Input: synaptics - enable SMBus on ThinkPad E480 and E580
Mike Marciniszyn <[email protected]>
IB/hfi1: Silence txreq allocation warnings
Peter Chen <[email protected]>
usb: chipidea: udc: workaround for endpoint conflict issue
Stanley Chu <[email protected]>
scsi: ufs: Avoid runtime suspend possibly being blocked forever
Ulf Hansson <[email protected]>
mmc: core: Prevent processing SDIO IRQs when the card is suspended
Florian Fainelli <[email protected]>
net: phy: broadcom: Use strlcpy() for ethtool::get_strings
Linus Torvalds <[email protected]>
gcc-9: silence 'address-of-packed-member' warning
Allan Xavier <[email protected]>
objtool: Support per-function rodata sections
Miguel Ojeda <[email protected]>
tracing: Silence GCC 9 array bounds warning
-------------
Diffstat:
Makefile | 6 ++-- arch/arc/boot/dts/hsdk.dts | 4 +++ arch/arc/include/asm/cmpxchg.h | 14 ++++++--- arch/arc/mm/tlb.c | 13 ++++---- arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + arch/arm/mach-imx/cpuidle-imx6sx.c | 3 +- arch/mips/kernel/uprobes.c | 3 -- arch/parisc/math-emu/cnv_float.h | 8 ++--- arch/powerpc/include/asm/ppc-opcode.h | 1 + arch/powerpc/net/bpf_jit.h | 2 +- arch/powerpc/net/bpf_jit_comp64.c | 8 ++--- arch/sparc/kernel/mdesc.c | 2 ++ arch/sparc/kernel/perf_event.c | 4 +++ arch/xtensa/kernel/setup.c | 3 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 14 ++++----- drivers/hwmon/hwmon.c | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 34 ++++++++++++++++++--- drivers/infiniband/hw/hfi1/chip.c | 1 + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 3 ++ drivers/infiniband/hw/hfi1/verbs.c | 2 -- drivers/infiniband/hw/hfi1/verbs_txreq.c | 2 +- drivers/infiniband/hw/hfi1/verbs_txreq.h | 3 +- drivers/infiniband/hw/qib/qib_verbs.c | 2 -- drivers/infiniband/sw/rdmavt/mr.c | 2 ++ drivers/infiniband/sw/rdmavt/qp.c | 3 +- drivers/input/misc/uinput.c | 22 ++++++++++++-- drivers/input/mouse/synaptics.c | 2 ++ drivers/mmc/core/sdio.c | 13 +++++++- drivers/mmc/core/sdio_irq.c | 4 +++ drivers/net/can/flexcan.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +++ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 +++++----- drivers/net/ipvlan/ipvlan_main.c | 2 +- drivers/net/phy/bcm-phy-lib.c | 4 +-- drivers/nvme/host/core.c | 3 +- drivers/parport/share.c | 2 ++ drivers/s390/net/qeth_l2_main.c | 2 +- drivers/scsi/smartpqi/smartpqi_init.c | 6 ++-- drivers/scsi/ufs/ufshcd-pltfrm.c | 11 +++---- drivers/scsi/ufs/ufshcd.c | 3 +- drivers/usb/chipidea/udc.c | 20 +++++++++++++ fs/btrfs/reada.c | 5 ++++ fs/cifs/smb2maperror.c | 2 +- include/net/bluetooth/hci_core.h | 3 ++ kernel/trace/trace.c | 6 +--- kernel/trace/trace.h | 18 +++++++++++ kernel/trace/trace_kdb.c | 6 +--- net/bluetooth/hci_conn.c | 10 ++++++- net/bluetooth/l2cap_core.c | 33 ++++++++++++++++---- net/can/af_can.c | 1 + net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/mlme.c | 12 +++++++- net/mac80211/rx.c | 2 ++ net/mac80211/tdls.c | 23 ++++++++++++++ net/mac80211/wpa.c | 7 ++++- net/wireless/core.c | 2 +- scripts/checkstack.pl | 2 +- security/apparmor/policy_unpack.c | 2 +- tools/objtool/check.c | 38 ++++++++++++++++++++---- tools/objtool/check.h | 4 +-- tools/objtool/elf.c | 1 + tools/objtool/elf.h | 3 +- 63 files changed, 337 insertions(+), 103 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/51 tracing: Silence GCC 9 array bounds warning
From: Miguel Ojeda <[email protected]>
commit 0c97bf863efce63d6ab7971dad811601e6171d2f upstream.
Starting with GCC 9, -Warray-bounds detects cases when memset is called starting on a member of a struct but the size to be cleared ends up writing over further members.
Such a call happens in the trace code to clear, at once, all members after and including seq on struct trace_iterator:
In function 'memset',
inlined from 'ftrace_dump' at kernel/trace/trace.c:8914:3:
./include/linux/string.h:344:9: warning: '__builtin_memset' offset [8505, 8560] from the object at 'iter' is out of the bounds of referenced subobject 'seq' with type 'struct trace_seq' at offset 4368 [-Warray-bounds]
344 | return __builtin_memset(p, c, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In order to avoid GCC complaining about it, we compute the address ourselves by adding the offsetof distance instead of referring directly to the member.
Since there are two places doing this clear (trace.c and trace_kdb.c), take the chance to move the workaround into a single place in the internal header.
--- kernel/trace/trace.c | 6 +----- kernel/trace/trace.h | 18 ++++++++++++++++++ kernel/trace/trace_kdb.c | 6 +----- 3 files changed, 20 insertions(+), 10 deletions(-)
kernel/trace/trace.c +1 -5
@@ -8249,12 +8249,8 @@ void ftrace_dump(enum ftrace_dump_mode o cnt++; -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (trace_find_next_entry_inc (&iter) !=NULL ) {int ret;
kernel/trace/trace.h +18 -0
@@ -1871,4 +1871,22 @@ static inline int tracing_alloc_snapshotextern struct trace_iterator *tracepoint_print_iter; +/* +* Reset the state of the trace_iterator so that it can read consumed data. +* Normally, the trace_iterator is used for reading the data when it is not +* consumed, and must retain state. +*/ +static __always_inline void trace_iterator_reset(struct trace_iterator *iter) +{ +const size_t offset = offsetof(struct trace_iterator , seq); + +/* +* Keep gcc from complaining about overwriting more than just one +* member in the structure. +*/ +memset ((char *)iter + offset,0 ,sizeof (struct trace_iterator ) - offset); + + iter->pos =-1 ; +} +#endif /* _LINUX_KERNEL_TRACE_H */
kernel/trace/trace_kdb.c +1 -5
@@ -41,12 +41,8 @@ static void ftrace_dump_buf(int skip_linkdb_printf ("Dumping ftrace buffer:\n" ); -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) {
Greg Kroah-Hartman
maintainerPATCH 2/51 objtool: Support per-function rodata sections
In reply to Greg Kroah-HartmanFrom: Allan Xavier <[email protected]>
commit 4a60aa05a0634241ce17f957bf9fb5ac1eed6576 upstream.
Add support for processing switch jump tables in objects with multiple .rodata sections, such as those created by '-ffunction-sections' and '-fdata-sections'. Currently, objtool always looks in .rodata for jump table information, which results in many "sibling call from callable instruction with modified stack frame" warnings with objects compiled using those flags.
The fix is comprised of three parts:
1. Flagging all .rodata sections when importing ELF information for easier checking later.
2. Keeping a reference to the section each relocation is from in order to get the list_head for the other relocations in that section.
3. Finding jump tables by following relocations to .rodata sections, rather than always referencing a single global .rodata section.
The patch has been tested without data sections enabled and no differences in the resulting orc unwind information were seen.
Note that as objtool adds terminators to end of each .text section the unwind information generated between a function+data sections build and a normal build aren't directly comparable. Manual inspection suggests that objtool is now generating the correct information, or at least making more of an effort to do so than it did previously.
--- tools/objtool/check.c | 38 ++++++++++++++++++++++++++++++++------ tools/objtool/check.h | 4 ++-- tools/objtool/elf.c | 1 + tools/objtool/elf.h | 3 ++- 4 files changed, 37 insertions(+), 9 deletions(-)
tools/objtool/check.c +32 -6
@@ -814,7 +814,7 @@ static int add_switch_table(struct objtostruct symbol *pfunc = insn->func->pfunc;unsigned int prev_offset =0 ; -list_for_each_entry_from (rela, &file->rodata->rela->rela_list, list) { +list_for_each_entry_from (rela, &table->rela_sec->rela_list, list) {if (rela == next_table)break ;
@@ -904,6 +904,7 @@ static struct rela *find_switch_table(st {struct rela *text_rela, *rodata_rela;struct instruction *orig_insn = insn; +struct section *rodata_sec;unsigned long table_offset;/*
@@ -931,10 +932,13 @@ static struct rela *find_switch_table(st/* look for a relocation which references .rodata */ text_rela =find_rela_by_dest_range (insn->sec, insn->offset, insn->len); -if (!text_rela || text_rela->sym != file->rodata->sym) +if (!text_rela || text_rela->sym->type !=STT_SECTION || + !text_rela->sym->sec->rodata)continue ; table_offset = text_rela->addend; + rodata_sec = text_rela->sym->sec; +if (text_rela->type ==R_X86_64_PC32 ) table_offset +=4 ;
@@ -942,10 +946,10 @@ static struct rela *find_switch_table(st* Make sure the .rodata address isn't associated with a * symbol. gcc jump tables are anonymous data. */ -if (find_symbol_containing (file->rodata, table_offset)) +if (find_symbol_containing (rodata_sec, table_offset))continue ; - rodata_rela =find_rela_by_dest (file->rodata, table_offset); + rodata_rela =find_rela_by_dest (rodata_sec, table_offset);if (rodata_rela) {/* * Use of RIP-relative switch jumps is quite rare, and
@@ -1030,7 +1034,7 @@ static int add_switch_table_alts(structstruct symbol *func;int ret; -if (!file->rodata || !file->rodata->rela) +if (!file->rodata)return 0 ;for_each_sec (file, sec) {
@@ -1175,10 +1179,33 @@ static int read_retpoline_hints(struct oreturn 0 ; } +static void mark_rodata (struct objtool_file *file) +{ +struct section *sec; +bool found = false; + +/* +* This searches for the .rodata section or multiple .rodata.func_name +* sections if -fdata-sections is being used. The .str.1.1 and .str.1.8 +* rodata sections are ignored as they don't contain jump tables. +*/ +for_each_sec (file, sec) { +if (!strncmp (sec->name,".rodata" ,7 ) && + !strstr (sec->name,".str1." )) { + sec->rodata = true; + found = true; + } + } + + file->rodata = found; +} +static int decode_sections (struct objtool_file *file) {int ret; +mark_rodata (file); + ret =decode_instructions (file);if (ret)return ret;
@@ -2150,7 +2177,6 @@ int check(const char *_objname, bool orcINIT_LIST_HEAD (&file.insn_list);hash_init (file.insn_hash); file.whitelist =find_section_by_name (file.elf,".discard.func_stack_frame_non_standard" ); - file.rodata =find_section_by_name (file.elf,".rodata" ); file.c_file =find_section_by_name (file.elf,".comment" ); file.ignore_unreachables = no_unreachable; file.hints = false;
tools/objtool/check.h +2 -2
@@ -60,8 +60,8 @@ struct objtool_file {struct elf *elf;struct list_head insn_list;DECLARE_HASHTABLE (insn_hash,16 ); -struct section *rodata, *whitelist; -bool ignore_unreachables, c_file, hints; +struct section *whitelist; +bool ignore_unreachables, c_file, hints, rodata; };int check (const char *objname,bool orc);
tools/objtool/elf.c +1 -0
@@ -390,6 +390,7 @@ static int read_relas(struct elf *elf) rela->offset = rela->rela.r_offset; symndx =GELF_R_SYM (rela->rela.r_info); rela->sym =find_symbol_by_index (elf, symndx); + rela->rela_sec = sec;if (!rela->sym) {WARN ("can't find rela entry symbol %d for %s" , symndx, sec->name);
tools/objtool/elf.h +2 -1
@@ -48,7 +48,7 @@ struct section {char *name;int idx;unsigned int len; -bool changed, text; +bool changed, text, rodata; };struct symbol {
@@ -68,6 +68,7 @@ struct rela {struct list_head list;struct hlist_node hash;GElf_Rela rela; +struct section *rela_sec;struct symbol *sym;unsigned int type;unsigned long offset;
Greg Kroah-Hartman
maintainerPATCH 3/51 gcc-9: silence address-of-packed-member warning
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 6f303d60534c46aa1a239f29c321f95c83dda748 upstream.
We already did this for clang, but now gcc has that warning too. Yes, yes, the address may be unaligned. And that's kind of the point.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -650,6 +650,7 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) +KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -716,7 +717,6 @@ ifeq ($(cc-name),clang) KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,) KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) KBUILD_CFLAGS += $(call cc-disable-warning, gnu) -KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) # Quiet clang warning: comparison of unsigned expression < 0 is always false KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) # CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
Greg Kroah-Hartman
maintainerPATCH 4/51 net: phy: broadcom: Use strlcpy() for ethtool::get_strings
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
commit 8a17eefa235f73b60c0ca7d397d2e4f66f85f413 upstream.
Our statistics strings are allocated at initialization without being bound to a specific size, yet, we would copy ETH_GSTRING_LEN bytes using memcpy() which would create out of bounds accesses, this was flagged by KASAN. Replace this with strlcpy() to make sure we are bound the source buffer size and we also always NUL-terminate strings.
--- drivers/net/phy/bcm-phy-lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/bcm-phy-lib.c +2 -2
@@ -341,8 +341,8 @@ void bcm_phy_get_strings(struct phy_deviunsigned int i;for (i =0 ; i <ARRAY_SIZE (bcm_phy_hw_stats); i++) -memcpy (data + i *ETH_GSTRING_LEN , - bcm_phy_hw_stats[i].string,ETH_GSTRING_LEN ); +strlcpy (data + i *ETH_GSTRING_LEN , + bcm_phy_hw_stats[i].string,ETH_GSTRING_LEN ); }EXPORT_SYMBOL_GPL (bcm_phy_get_strings);
Greg Kroah-Hartman
maintainerPATCH 5/51 mmc: core: Prevent processing SDIO IRQs when the card is suspended
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
commit 83293386bc95cf5e9f0c0175794455835bd1cb4a upstream.
Processing of SDIO IRQs must obviously be prevented while the card is system suspended, otherwise we may end up trying to communicate with an uninitialized SDIO card.
Reports throughout the years shows that this is not only a theoretical problem, but a real issue. So, let's finally fix this problem, by keeping track of the state for the card and bail out before processing the SDIO IRQ, in case the card is suspended.
--- drivers/mmc/core/sdio.c | 13 ++++++++++++- drivers/mmc/core/sdio_irq.c | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-)
drivers/mmc/core/sdio.c +12 -1
@@ -907,6 +907,10 @@ static int mmc_sdio_pre_suspend(struct m*/ static int mmc_sdio_suspend (struct mmc_host *host) { +/* Prevent processing of SDIO IRQs in suspended state. */ +mmc_card_set_suspended (host->card); +cancel_delayed_work_sync (&host->sdio_irq_work); +mmc_claim_host (host);if (mmc_card_keep_power (host) &&mmc_card_wake_sdio_irq (host))
@@ -962,13 +966,20 @@ static int mmc_sdio_resume(struct mmc_ho err =sdio_enable_4bit_bus (host->card); } -if (!err && host->sdio_irqs) { +if (err) + goto out; + +/* Allow SDIO IRQs to be processed again. */ +mmc_card_clr_suspended (host->card); + +if (host->sdio_irqs) {if (!(host->caps2 &MMC_CAP2_SDIO_IRQ_NOTHREAD ))wake_up_process (host->sdio_irq_thread);else if (host->caps &MMC_CAP_SDIO_IRQ ) host->ops->enable_sdio_irq (host,1 ); } +out:mmc_release_host (host); host->pm_flags &= ~MMC_PM_KEEP_POWER ;
drivers/mmc/core/sdio_irq.c +4 -0
@@ -38,6 +38,10 @@ static int process_sdio_pending_irqs(strunsigned char pending;struct sdio_func *func; +/* Don't process SDIO IRQs if the card is suspended. */ +if (mmc_card_suspended (card)) +return 0 ; +/* * Optimization, if there is only 1 function interrupt registered * and we know an IRQ was signaled then call irq handler directly.
Greg Kroah-Hartman
maintainerPATCH 6/51 scsi: ufs: Avoid runtime suspend possibly being blocked forever
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
commit 24e2e7a19f7e4b83d0d5189040d997bce3596473 upstream.
UFS runtime suspend can be triggered after pm_runtime_enable() is invoked in ufshcd_pltfrm_init(). However if the first runtime suspend is triggered before binding ufs_hba structure to ufs device structure via platform_set_drvdata(), then UFS runtime suspend will be no longer triggered in the future because its dev->power.runtime_error was set in the first triggering and does not have any chance to be cleared.
To be more clear, dev->power.runtime_error is set if hba is NULL in ufshcd_runtime_suspend() which returns -EINVAL to rpm_callback() where dev->power.runtime_error is set as -EINVAL. In this case, any future rpm_suspend() for UFS device fails because rpm_check_suspend_allowed() fails due to non-zerodev->power.runtime_error.
To resolve this issue, make sure the first UFS runtime suspend get valid "hba" in ufshcd_runtime_suspend(): Enable UFS runtime PM only after hba is successfully bound to UFS device structure.
--- drivers/scsi/ufs/ufshcd-pltfrm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd-pltfrm.c +4 -7
@@ -340,24 +340,21 @@ int ufshcd_pltfrm_init(struct platform_d goto dealloc_host; } -pm_runtime_set_active (&pdev->dev); -pm_runtime_enable (&pdev->dev); -ufshcd_init_lanes_per_dir (hba); err =ufshcd_init (hba, mmio_base, irq);if (err) {dev_err (dev,"Initialization failed\n" ); - goto out_disable_rpm; + goto dealloc_host; }platform_set_drvdata (pdev, hba); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +return 0 ; -out_disable_rpm: -pm_runtime_disable (&pdev->dev); -pm_runtime_set_suspended (&pdev->dev); dealloc_host:ufshcd_dealloc_host (hba); out:
Greg Kroah-Hartman
maintainerPATCH 7/51 usb: chipidea: udc: workaround for endpoint conflict issue
In reply to Greg Kroah-HartmanFrom: Peter Chen <[email protected]>
commit c19dffc0a9511a7d7493ec21019aefd97e9a111b upstream.
An endpoint conflict occurs when the USB is working in device mode during an isochronous communication. When the endpointA IN direction is an isochronous IN endpoint, and the host sends an IN token to endpointA on another device, then the OUT transaction may be missed regardless the OUT endpoint number. Generally, this occurs when the device is connected to the host through a hub and other devices are connected to the same hub.
The affected OUT endpoint can be either control, bulk, isochronous, or an interrupt endpoint. After the OUT endpoint is primed, if an IN token to the same endpoint number on another device is received, then the OUT endpoint may be unprimed (cannot be detected by software), which causes this endpoint to no longer respond to the host OUT token, and thus, no corresponding interrupt occurs.
There is no good workaround for this issue, the only thing the software could do is numbering isochronous IN from the highest endpoint since we have observed most of device number endpoint from the lowest.
--- drivers/usb/chipidea/udc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/usb/chipidea/udc.c +20 -0
@@ -1620,6 +1620,25 @@ static int ci_udc_pullup(struct usb_gadgstatic int ci_udc_start (struct usb_gadget *gadget,struct usb_gadget_driver *driver);static int ci_udc_stop (struct usb_gadget *gadget); + +/* Match ISOC IN from the highest endpoint */ +static struct usb_ep *ci_udc_match_ep (struct usb_gadget *gadget, +struct usb_endpoint_descriptor *desc, +struct usb_ss_ep_comp_descriptor *comp_desc) +{ + struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget); +struct usb_ep *ep; + +if (usb_endpoint_xfer_isoc (desc) &&usb_endpoint_dir_in (desc)) { +list_for_each_entry_reverse (ep, &ci->gadget.ep_list, ep_list) { +if (ep->caps.dir_in && !ep->claimed) +return ep; + } + } + +return NULL ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -1633,6 +1652,7 @@ static const struct usb_gadget_ops usb_g .vbus_draw = ci_udc_vbus_draw, .udc_start = ci_udc_start, .udc_stop = ci_udc_stop, + .match_ep = ci_udc_match_ep, };static int init_eps (struct ci_hdrc *ci)
Greg Kroah-Hartman
maintainerPATCH 8/51 IB/hfi1: Silence txreq allocation warnings
In reply to Greg Kroah-HartmanFrom: Mike Marciniszyn <[email protected]>
commit 3230f4a8d44e4a0bb7afea814b280b5129521f52 upstream.
The following warning can happen when a memory shortage occurs during txreq allocation:
[10220.939246] SLUB: Unable to allocate memory on node -1, gfp=0xa20(GFP_ATOMIC) [10220.939246] Hardware name: Intel Corporation S2600WT2R/S2600WT2R, BIOS SE5C610.86B.01.01.0018.C4.072020161249 07/20/2016 [10220.939247] cache: mnt_cache, object size: 384, buffer size: 384, default order: 2, min order: 0 [10220.939260] Workqueue: hfi0_0 _hfi1_do_send [hfi1] [10220.939261] node 0: slabs: 1026568, objs: 43115856, free: 0 [10220.939262] Call Trace: [10220.939262] node 1: slabs: 820872, objs: 34476624, free: 0 [10220.939263] dump_stack+0x5a/0x73 [10220.939265] warn_alloc+0x103/0x190 [10220.939267] ? wake_all_kswapds+0x54/0x8b [10220.939268] __alloc_pages_slowpath+0x86c/0xa2e [10220.939270] ? __alloc_pages_nodemask+0x2fe/0x320 [10220.939271] __alloc_pages_nodemask+0x2fe/0x320 [10220.939273] new_slab+0x475/0x550 [10220.939275] ___slab_alloc+0x36c/0x520 [10220.939287] ? hfi1_make_rc_req+0x90/0x18b0 [hfi1] [10220.939299] ? __get_txreq+0x54/0x160 [hfi1] [10220.939310] ? hfi1_make_rc_req+0x90/0x18b0 [hfi1] [10220.939312] __slab_alloc+0x40/0x61 [10220.939323] ? hfi1_make_rc_req+0x90/0x18b0 [hfi1] [10220.939325] kmem_cache_alloc+0x181/0x1b0 [10220.939336] hfi1_make_rc_req+0x90/0x18b0 [hfi1] [10220.939348] ? hfi1_verbs_send_dma+0x386/0xa10 [hfi1] [10220.939359] ? find_prev_entry+0xb0/0xb0 [hfi1] [10220.939371] hfi1_do_send+0x1d9/0x3f0 [hfi1] [10220.939372] process_one_work+0x171/0x380 [10220.939374] worker_thread+0x49/0x3f0 [10220.939375] kthread+0xf8/0x130 [10220.939377] ? max_active_store+0x80/0x80 [10220.939378] ? kthread_bind+0x10/0x10 [10220.939379] ret_from_fork+0x35/0x40 [10220.939381] SLUB: Unable to allocate memory on node -1, gfp=0xa20(GFP_ATOMIC)
The shortage is handled properly so the message isn't needed. Silence by adding the no warn option to the slab allocation.
--- drivers/infiniband/hw/hfi1/verbs_txreq.c | 2 +- drivers/infiniband/hw/hfi1/verbs_txreq.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/verbs_txreq.c +1 -1
@@ -100,7 +100,7 @@ struct verbs_txreq *__get_txreq(struct hif (ib_rvt_state_ops[qp->state] &RVT_PROCESS_RECV_OK ) {struct hfi1_qp_priv *priv; - tx =kmem_cache_alloc (dev->verbs_txreq_cache,GFP_ATOMIC ); + tx =kmem_cache_alloc (dev->verbs_txreq_cache,VERBS_TXREQ_GFP );if (tx) goto out; priv = qp->priv;
drivers/infiniband/hw/hfi1/verbs_txreq.h +2 -1
@@ -72,6 +72,7 @@ struct hfi1_ibdev;struct verbs_txreq *__get_txreq (struct hfi1_ibdev *dev,struct rvt_qp *qp); +#define VERBS_TXREQ_GFP (GFP_ATOMIC | __GFP_NOWARN)static inline struct verbs_txreq *get_txreq (struct hfi1_ibdev *dev,struct rvt_qp *qp) __must_hold(&qp->slock)
@@ -79,7 +80,7 @@ static inline struct verbs_txreq *get_txstruct verbs_txreq *tx;struct hfi1_qp_priv *priv = qp->priv; - tx =kmem_cache_alloc (dev->verbs_txreq_cache,GFP_ATOMIC ); + tx =kmem_cache_alloc (dev->verbs_txreq_cache,VERBS_TXREQ_GFP );if (unlikely (!tx)) {/* call slow path to get the lock */ tx =__get_txreq (dev, qp);
Greg Kroah-Hartman
maintainerPATCH 9/51 Input: synaptics - enable SMBus on ThinkPad E480 and E580
In reply to Greg Kroah-HartmanFrom: Alexander Mikhaylenko <[email protected]>
commit 9843f3e08e2144724be7148e08d77a195dea257a upstream.
They are capable of using intertouch and it works well with psmouse.synaptics_intertouch=1, so add them to the list.
Without it, scrolling and gestures are jumpy, three-finger pinch gesture doesn't work and three- or four-finger swipes sometimes get stuck.
--- drivers/input/mouse/synaptics.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/mouse/synaptics.c +2 -0
@@ -179,6 +179,8 @@ static const char * const smbus_pnp_ids["LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f" ,/* T450s */ +"LEN2054" ,/* E480 */ +"LEN2055" ,/* E580 */ "SYN3052" ,/* HP EliteBook 840 G4 */ "SYN3221" ,/* HP 15-ay000 */ NULL
Greg Kroah-Hartman
maintainerPATCH 10/51 Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
commit 7c7da40da1640ce6814dab1e8031b44e19e5a3f6 upstream.
In the case of compat syscall ioctl numbers for UI_BEGIN_FF_UPLOAD and UI_END_FF_UPLOAD need to be adjusted before being passed on uinput_ioctl_handler() since code built with -m32 will be passing slightly different values. Extend the code already covering UI_SET_PHYS to cover UI_BEGIN_FF_UPLOAD and UI_END_FF_UPLOAD as well.
--- drivers/input/misc/uinput.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/input/misc/uinput.c +20 -2
@@ -1012,13 +1012,31 @@ static long uinput_ioctl(struct file *fi#ifdef CONFIG_COMPAT -#define UI_SET_PHYS_COMPAT _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +/* +* These IOCTLs change their size and thus their numbers between +* 32 and 64 bits. +*/ +#define UI_SET_PHYS_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +#define UI_BEGIN_FF_UPLOAD_COMPAT \ + _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload_compat) +#define UI_END_FF_UPLOAD_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload_compat)static long uinput_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -if (cmd ==UI_SET_PHYS_COMPAT ) +switch (cmd) { +case UI_SET_PHYS_COMPAT : cmd =UI_SET_PHYS ; +break ; +case UI_BEGIN_FF_UPLOAD_COMPAT : + cmd =UI_BEGIN_FF_UPLOAD ; +break ; +case UI_END_FF_UPLOAD_COMPAT : + cmd =UI_END_FF_UPLOAD ; +break ; + }return uinput_ioctl_handler (file, cmd, arg,compat_ptr (arg)); }
Greg Kroah-Hartman
maintainerPATCH 11/51 apparmor: enforce nullbyte at end of tag string
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 8404d7a674c49278607d19726e0acc0cae299357 upstream.
A packed AppArmor policy contains null-terminated tag strings that are read by unpack_nameX(). However, unpack_nameX() uses string functions on them without ensuring that they are actually null-terminated, potentially leading to out-of-bounds accesses.
Make sure that the tag string is null-terminated before passing it to strcmp().
--- security/apparmor/policy_unpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/apparmor/policy_unpack.c +1 -1
@@ -259,7 +259,7 @@ static bool unpack_nameX(struct aa_ext *char *tag =NULL ;size_t size =unpack_u16_chunk (e, &tag);/* if a name is specified it must match. otherwise skip tag */ -if (name && (!size ||strcmp (name, tag))) +if (name && (!size || tag[size-1 ] !='\0' ||strcmp (name, tag))) goto fail; }else if (name) {/* if a name is specified and there is no name tag fail */
Greg Kroah-Hartman
maintainerPATCH 12/51 ARC: fix build warnings
In reply to Greg Kroah-Hartman[ Upstream commit 89c92142f75eb80064f5b9f1111484b1b4d81790 ]
| arch/arc/mm/tlb.c:914:2: warning: variable length array 'pd0' is used [-Wvla] | arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value]
--- arch/arc/include/asm/cmpxchg.h | 14 ++++++++++---- arch/arc/mm/tlb.c | 13 ++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-)
arch/arc/include/asm/cmpxchg.h +10 -4
@@ -92,8 +92,11 @@ __cmpxchg(volatile void *ptr, unsigned long expected, unsigned long new)#endif /* CONFIG_ARC_HAS_LLSC */ -#define cmpxchg (ptr, o, n) ((typeof(*(ptr)))__cmpxchg((ptr), \ - (unsigned long)(o), (unsigned long)(n))) +#define cmpxchg (ptr, o, n) ({ \ + (typeof(*(ptr)))__cmpxchg((ptr), \ + (unsigned long)(o), \ + (unsigned long)(n)); \ +})/* * atomic_cmpxchg is same as cmpxchg
@@ -198,8 +201,11 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr, return __xchg_bad_pointer(); } -#define xchg (ptr, with) ((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), \ - sizeof(*(ptr)))) +#define xchg (ptr, with) ({ \ + (typeof(*(ptr)))__xchg((unsigned long)(with), \ + (ptr), \ + sizeof(*(ptr))); \ +})#endif /* CONFIG_ARC_PLAT_EZNPS */
arch/arc/mm/tlb.c +8 -5
@@ -902,9 +902,11 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address, struct pt_regs *regs) {struct cpuinfo_arc_mmu *mmu = &cpuinfo_arc700[smp_processor_id ()].mmu; -unsigned int pd0[mmu->ways];unsigned long flags; -int set; +int set, n_ways = mmu->ways; + + n_ways =min (n_ways,4 ); +BUG_ON (mmu->ways >4 );local_irq_save (flags);
@@ -912,9 +914,10 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,for (set =0 ; set < mmu->sets; set++) {int is_valid, way; +unsigned int pd0[4 ];/* read out all the ways of current set */ -for (way =0 , is_valid =0 ; way < mmu->ways; way++) { +for (way =0 , is_valid =0 ; way < n_ways; way++) {write_aux_reg (ARC_REG_TLBINDEX ,SET_WAY_TO_IDX (mmu, set, way));write_aux_reg (ARC_REG_TLBCOMMAND , TLBRead);
@@ -928,14 +931,14 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,continue ;/* Scan the set for duplicate ways: needs a nested loop */ -for (way =0 ; way < mmu->ways -1 ; way++) { +for (way =0 ; way < n_ways -1 ; way++) {int n;if (!pd0[way])continue ; -for (n = way +1 ; n < mmu->ways; n++) { +for (n = way +1 ; n < n_ways; n++) {if (pd0[way] != pd0[n])continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/51 ARC: [plat-hsdk]: Add missing multicast filter bins number to GMAC node
In reply to Greg Kroah-Hartman[ Upstream commit ecc906a11c2a0940e1a380debd8bd5bc09faf454 ]
GMAC controller on HSDK boards supports 256 Hash Table size so we need to add the multicast filter bins property. This allows for the Hash filter to work properly using stmmac driver.
--- arch/arc/boot/dts/hsdk.dts | 1 + 1 file changed, 1 insertion(+)
arch/arc/boot/dts/hsdk.dts +1 -0
@@ -163,6 +163,7 @@ interrupt-names = "macirq"; phy-mode = "rgmii"; snps,pbl = <32>; + snps,multicast-filter-bins = <256>; clocks = <&gmacclk>; clock-names = "stmmaceth"; phy-handle = <&phy0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/51 ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node
In reply to Greg Kroah-Hartman[ Upstream commit 4c70850aeb2e40016722cd1abd43c679666d3ca0 ]
Add the binding for RX/TX fifo size of GMAC node.
--- arch/arc/boot/dts/hsdk.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arc/boot/dts/hsdk.dts +3 -0
@@ -170,6 +170,9 @@ resets = <&cgu_rst HSDK_ETH_RESET>; reset-names = "stmmaceth"; + tx-fifo-depth = <4096>; + rx-fifo-depth = <4096>; + mdio { #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/51 parport: Fix mem leak in parport_register_dev_model
In reply to Greg Kroah-Hartman[ Upstream commit 1c7ebeabc9e5ee12e42075a597de40fdb9059530 ]
BUG: memory leak
unreferenced object 0xffff8881df48cda0 (size 16):
comm "syz-executor.0", pid 5077, jiffies 4295994670 (age 22.280s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d2d0d5fe>] parport_register_dev_model+0x141/0x6e0 [parport]
[<00000000782f6dab>] 0xffffffffc15d1196
[<00000000d2ca6ae4>] platform_drv_probe+0x7e/0x100
[<00000000628c2a94>] really_probe+0x342/0x4d0
[<000000006874f5da>] driver_probe_device+0x8c/0x170
[<00000000424de37a>] __device_attach_driver+0xda/0x100
[<000000002acab09a>] bus_for_each_drv+0xfe/0x170
[<000000003d9e5f31>] __device_attach+0x190/0x230
[<0000000035d32f80>] bus_probe_device+0x123/0x140
[<00000000a05ba627>] device_add+0x7cc/0xce0
[<000000003f7560bf>] platform_device_add+0x230/0x3c0
[<000000002a0be07d>] 0xffffffffc15d0949
[<000000007361d8d2>] port_check+0x3b/0x50 [parport]
[<000000004d67200f>] bus_for_each_dev+0x115/0x180
[<000000003ccfd11c>] __parport_register_driver+0x1f0/0x210 [parport]
[<00000000987f06fc>] 0xffffffffc15d803eAfter commit 4e5a74f1db8d ("parport: Revert "parport: fix memory leak""), free_pardevice do not free par_dev->state, we should free it in error path of parport_register_dev_model before return.
--- drivers/parport/share.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/parport/share.c +2 -0
@@ -895,6 +895,7 @@ parport_register_dev_model(struct parport *port, const char *name, par_dev->devmodel = true; ret =device_register (&par_dev->dev);if (ret) { +kfree (par_dev->state);put_device (&par_dev->dev); goto err_put_port; }
@@ -912,6 +913,7 @@ parport_register_dev_model(struct parport *port, const char *name,spin_unlock (&port->physport->pardevice_lock);pr_debug ("%s: cannot grant exclusive access for device %s\n" , port->name, name); +kfree (par_dev->state);device_unregister (&par_dev->dev); goto err_put_port; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/51 parisc: Fix compiler warnings in float emulation code
In reply to Greg Kroah-Hartman[ Upstream commit 6b98d9134e14f5ef4bcf64b27eedf484ed19a1ec ]
Avoid such compiler warnings:arch/parisc/math-emu/cnv_float.h:71:27: warning: ‘<<’ in boolean context, did you mean ‘<’ ? [-Wint-in-bool-context]
((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) || Dintp2(dint_valueB))
arch/parisc/math-emu/fcnvxf.c:257:6: note: in expansion of macro ‘Dint_isinexact_to_sgl’
if (Dint_isinexact_to_sgl(srcp1,srcp2)) {
--- arch/parisc/math-emu/cnv_float.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/parisc/math-emu/cnv_float.h +4 -4
@@ -60,19 +60,19 @@ ((exponent < (SGL_P -1 )) ? \ (Sall(sgl_value) << (SGL_EXP_LENGTH + 1 + exponent)) : FALSE) -#define Int_isinexact_to_sgl (int_value) (int_value << 33 - SGL_EXP_LENGTH) +#define Int_isinexact_to_sgl (int_value) ((int_value << 33 - SGL_EXP_LENGTH) != 0) #define Sgl_roundnearest_from_int(int_value,sgl_value) \ if (int_value & 1<<(SGL_EXP_LENGTH - 2)) /* round bit */ \ - if ((int_value << 34 - SGL_EXP_LENGTH) || Slow(sgl_value)) \ + if (((int_value << 34 - SGL_EXP_LENGTH) != 0) || Slow(sgl_value)) \ Sall(sgl_value)++#define Dint_isinexact_to_sgl (dint_valueA,dint_valueB) \ - ((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) || Dintp2(dint_valueB)) + (((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) != 0) || Dintp2(dint_valueB))#define Sgl_roundnearest_from_dint (dint_valueA,dint_valueB,sgl_value) \ if (Dintp1(dint_valueA) & 1<<(SGL_EXP_LENGTH - 2)) \ - if ((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) || \ + if (((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) != 0) || \ Dintp2(dint_valueB) || Slow(sgl_value)) Sall(sgl_value)++#define Dint_isinexact_to_dbl (dint_value) \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/51 IB/rdmavt: Fix alloc_qpn() WARN_ON()
In reply to Greg Kroah-Hartman[ Upstream commit 2abae62a26a265129b364d8c1ef3be55e2c01309 ]
The qpn allocation logic has a WARN_ON() that intends to detect the use of an index that will introduce bits in the lower order bits of the QOS bits in the QPN.
Unfortunately, it has the following bugs:
- it misfires when wrapping QPN allocation for non-QOS
- it doesn't correctly detect low order QOS bits (despite the comment)
The WARN_ON() should not be applied to non-QOS (qos_shift == 1).
Additionally, it SHOULD test the qpn bits per the table below:
2 data VLs: [qp7, qp6, qp5, qp4, qp3, qp2, qp1] ^
[ 0, 0, 0, 0, 0, 0, sc0], qp bit 1 always 0*
3-4 data VLs: [qp7, qp6, qp5, qp4, qp3, qp2, qp1] ^
[ 0, 0, 0, 0, 0, sc1, sc0], qp bits [21] always 0
5-8 data VLs: [qp7, qp6, qp5, qp4, qp3, qp2, qp1] ^
[ 0, 0, 0, 0, sc2, sc1, sc0] qp bits [321] always 0Fix by qualifying the warning for qos_shift > 1 and producing the correct mask to insure the above bits are zero without generating a superfluous warning.
--- drivers/infiniband/sw/rdmavt/qp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rdmavt/qp.c +2 -1
@@ -412,7 +412,8 @@ static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt, offset = qpt->incr | ((offset &1 ) ^1 ); }/* there can be no set bits in low-order QoS bits */ -WARN_ON (offset & (BIT (rdi->dparms.qos_shift) -1 )); +WARN_ON (rdi->dparms.qos_shift >1 && + offset & ((BIT (rdi->dparms.qos_shift -1 ) -1 ) <<1 )); qpn =mk_qpn (qpt, map, offset); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/51 IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
In reply to Greg Kroah-Hartman[ Upstream commit 6d517353c70bb0818b691ca003afdcb5ee5ea44e ]
By code inspection, the freeze_work is never canceled.
Fix by adding a cancel_work_sync in the shutdown path to insure it is no longer running.
--- drivers/infiniband/hw/hfi1/chip.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/hfi1/chip.c +1 -0
@@ -9823,6 +9823,7 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd)/* disable the port */ clear_rcvctrl (dd,RCV_CTRL_RCV_PORT_ENABLE_SMASK ); +cancel_work_sync (&ppd->freeze_work); }static inline int init_cpu_counters (struct hfi1_devdata *dd)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/51 IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
In reply to Greg Kroah-Hartman[ Upstream commit 35164f5259a47ea756fa1deb3e463ac2a4f10dc9 ]
The command 'ibv_devinfo -v' reports 0 for max_mr.
Fix by assigning the query values after the mr lkey_table has been built rather than early on in the driver.
--- drivers/infiniband/hw/hfi1/verbs.c | 2 -- drivers/infiniband/hw/qib/qib_verbs.c | 2 -- drivers/infiniband/sw/rdmavt/mr.c | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hfi1/verbs.c +0 -2
@@ -1400,8 +1400,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd) rdi->dparms.props.max_cq = hfi1_max_cqs; rdi->dparms.props.max_ah = hfi1_max_ahs; rdi->dparms.props.max_cqe = hfi1_max_cqes; - rdi->dparms.props.max_mr = rdi->lkey_table.max; - rdi->dparms.props.max_fmr = rdi->lkey_table.max; rdi->dparms.props.max_map_per_fmr =32767 ; rdi->dparms.props.max_pd = hfi1_max_pds; rdi->dparms.props.max_qp_rd_atom =HFI1_MAX_RDMA_ATOMIC ;
drivers/infiniband/hw/qib/qib_verbs.c +0 -2
@@ -1495,8 +1495,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd) rdi->dparms.props.max_cq = ib_qib_max_cqs; rdi->dparms.props.max_cqe = ib_qib_max_cqes; rdi->dparms.props.max_ah = ib_qib_max_ahs; - rdi->dparms.props.max_mr = rdi->lkey_table.max; - rdi->dparms.props.max_fmr = rdi->lkey_table.max; rdi->dparms.props.max_map_per_fmr =32767 ; rdi->dparms.props.max_qp_rd_atom =QIB_MAX_RDMA_ATOMIC ; rdi->dparms.props.max_qp_init_rd_atom =255 ;
drivers/infiniband/sw/rdmavt/mr.c +2 -0
@@ -96,6 +96,8 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi)for (i =0 ; i < rdi->lkey_table.max; i++)RCU_INIT_POINTER (rdi->lkey_table.table[i],NULL ); + rdi->dparms.props.max_mr = rdi->lkey_table.max; + rdi->dparms.props.max_fmr = rdi->lkey_table.max;return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/51 IB/hfi1: Validate page aligned for a given virtual address
In reply to Greg Kroah-Hartman[ Upstream commit 97736f36dbebf2cda2799db3b54717ba5b388255 ]
User applications can register memory regions for TID buffers that are not aligned on page boundaries. Hfi1 is expected to pin those pages in memory and cache the pages with mmu_rb. The rb tree will fail to insert pages that are not aligned correctly.
Validate whether a given virtual address is page aligned before pinning.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +3 -0
@@ -324,6 +324,9 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,u32 *tidlist =NULL ;struct tid_user_buf *tidbuf; +if (!PAGE_ALIGNED (tinfo->vaddr)) +return -EINVAL ; + tidbuf =kzalloc (sizeof (*tidbuf),GFP_KERNEL );if (!tidbuf)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/51 MIPS: uprobes: remove set but not used variable epc
In reply to Greg Kroah-Hartman[ Upstream commit f532beeeff0c0a3586cc15538bc52d249eb19e7c ]
Fixes gcc '-Wunused-but-set-variable' warning:
arch/mips/kernel/uprobes.c: In function 'arch_uprobe_pre_xol':arch/mips/kernel/uprobes.c:115:17: warning: variable 'epc' set but not used [-Wunused-but-set-variable]
It's never used since introduction in commit 40e084a506eb ("MIPS: Add uprobes support.")
--- arch/mips/kernel/uprobes.c | 3 --- 1 file changed, 3 deletions(-)
arch/mips/kernel/uprobes.c +0 -3
@@ -112,9 +112,6 @@ int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs)*/ aup->resume_epc = regs->cp0_epc +4 ;if (insn_has_delay_slot ((union mips_instruction ) aup->insn[0 ])) { -unsigned long epc; - - epc = regs->cp0_epc;__compute_return_epc_for_insn (regs, (union mips_instruction ) aup->insn[0 ]); aup->resume_epc = regs->cp0_epc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/51 xtensa: Fix section mismatch between memblock_reserve and mem_reserve
In reply to Greg Kroah-Hartman[ Upstream commit adefd051a6707a6ca0ebad278d3c1c05c960fc3b ]
Since commit 9012d011660ea5cf2 ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING"), xtensa:tinyconfig fails to build with section mismatch errors.
WARNING: vmlinux.o(.text.unlikely+0x68): Section mismatch in reference
from the function ___pa()
to the function .meminit.text:memblock_reserve()
WARNING: vmlinux.o(.text.unlikely+0x74): Section mismatch in reference
from the function mem_reserve()
to the function .meminit.text:memblock_reserve()
FATAL: modpost: Section mismatches detected.
This was not seen prior to the above mentioned commit because mem_reserve() was always inlined.
Mark mem_reserve(() as __init_memblock to have it reside in the same section as memblock_reserve().
Message-Id: <[email protected]>
--- arch/xtensa/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/xtensa/kernel/setup.c +2 -1
@@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start;extern char _SecondaryResetVector_text_end;#endif -static inline int mem_reserve (unsigned long start,unsigned long end) +static inline int __init_memblock mem_reserve(unsigned long start, +unsigned long end) {return memblock_reserve (start, end - start); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/51 net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
In reply to Greg Kroah-Hartman[ Upstream commit 62394708f3e01c9f2be6be74eb6305bae1ed924f ]
When non-bridged, non-vlan'ed mv88e6xxx port is moving down, error message is logged:
failed to kill vid 0081/0 for device eth_cu_1000_4
This is caused by call from __vlan_vid_del() with vin set to zero, over call chain this results into _mv88e6xxx_port_vlan_del() called with vid=0, and mv88e6xxx_vtu_get() called from there returns -EINVAL.
On symmetric path moving port up, call goes through mv88e6xxx_port_vlan_prepare() that calls mv88e6xxx_port_check_hw_vlan() that returns -EOPNOTSUPP for zero vid.
This patch changes mv88e6xxx_vtu_get() to also return -EOPNOTSUPP for zero vid, then this error code is explicitly cleared in dsa_slave_vlan_rx_kill_vid() and error message is no longer logged.
--- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/chip.c +1 -1
@@ -1075,7 +1075,7 @@ static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid,int err;if (!vid) -return -EINVAL ; +return -EOPNOTSUPP ; entry->vid = vid -1 ; entry->valid = false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/51 net: hns: Fix loopback test failed at copper ports
In reply to Greg Kroah-Hartman[ Upstream commit 2e1f164861e500f4e068a9d909bbd3fcc7841483 ]
When doing a loopback test at copper ports, the serdes loopback and the phy loopback will fail, because of the adjust link had not finished, and phy not ready.
Adds sleep between adjust link and test process to fix it.
--- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +4 -0
@@ -338,6 +338,7 @@ static int __lb_setup(struct net_device *ndev,static int __lb_up (struct net_device *ndev,enum hnae_loop loop_mode) { +#define NIC_LB_TEST_WAIT_PHY_LINK_TIME 300struct hns_nic_priv *priv =netdev_priv (ndev);struct hnae_handle *h = priv->ae_handle;int speed, duplex;
@@ -364,6 +365,9 @@ static int __lb_up(struct net_device *ndev, h->dev->ops->adjust_link (h, speed, duplex); +/* wait adjust link done and phy ready */ +msleep (NIC_LB_TEST_WAIT_PHY_LINK_TIME ); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/51 mdesc: fix a missing-check bug in get_vdev_port_node_info()
In reply to Greg Kroah-Hartman[ Upstream commit 80caf43549e7e41a695c6d1e11066286538b336f ]
In get_vdev_port_node_info(), 'node_info->vdev_port.name' is allcoated by kstrdup_const(), and it returns NULL when fails. So 'node_info->vdev_port.name' should be checked.
--- arch/sparc/kernel/mdesc.c | 2 ++ 1 file changed, 2 insertions(+)
arch/sparc/kernel/mdesc.c +2 -0
@@ -355,6 +355,8 @@ static int get_vdev_port_node_info(struct mdesc_handle *md, u64 node, node_info->vdev_port.id = *idp; node_info->vdev_port.name =kstrdup_const (name,GFP_KERNEL ); +if (!node_info->vdev_port.name) +return -1 ; node_info->vdev_port.parent_cfg_hdl = *parent_cfg_hdlp;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/51 sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
In reply to Greg Kroah-Hartman[ Upstream commit 56cd0aefa475079e9613085b14a0f05037518fed ]
The PERF_EVENT_IOC_PERIOD ioctl command can be used to change the sample period of a running perf_event. Consequently, when calculating the next event period, the new period will only be considered after the previous one has overflowed.
This patch changes the calculation of the remaining event ticks so that they are offset if the period has changed.
See commit 3581fe0ef37c ("ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD") for details.
--- arch/sparc/kernel/perf_event.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/sparc/kernel/perf_event.c +4 -0
@@ -891,6 +891,10 @@ static int sparc_perf_event_set_period(struct perf_event *event,s64 period = hwc->sample_period;int ret =0 ; +/* The period may have been changed by PERF_EVENT_IOC_PERIOD */ +if (unlikely (period != hwc->last_period)) + left = period - (hwc->last_period - left); +if (unlikely (left <= -period)) { left = period;local64_set (&hwc->period_left, left);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/51 net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported
In reply to Greg Kroah-Hartman[ Upstream commit 9e4f56f1a7f3287718d0083b5cb85298dc05a5fd ]
Should hw_feature as hardware capability flags to check if hardware LRO got support.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +6 -6
@@ -2304,13 +2304,13 @@ static int mtk_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,switch (cmd->cmd) {case ETHTOOL_GRXRINGS : -if (dev->features &NETIF_F_LRO ) { +if (dev->hw_features &NETIF_F_LRO ) { cmd->data =MTK_MAX_RX_RING_NUM ; ret =0 ; }break ;case ETHTOOL_GRXCLSRLCNT : -if (dev->features &NETIF_F_LRO ) { +if (dev->hw_features &NETIF_F_LRO ) {struct mtk_mac *mac =netdev_priv (dev); cmd->rule_cnt = mac->hwlro_ip_cnt;
@@ -2318,11 +2318,11 @@ static int mtk_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, }break ;case ETHTOOL_GRXCLSRULE : -if (dev->features &NETIF_F_LRO ) +if (dev->hw_features &NETIF_F_LRO ) ret =mtk_hwlro_get_fdir_entry (dev, cmd);break ;case ETHTOOL_GRXCLSRLALL : -if (dev->features &NETIF_F_LRO ) +if (dev->hw_features &NETIF_F_LRO ) ret =mtk_hwlro_get_fdir_all (dev, cmd, rule_locs);break ;
@@ -2339,11 +2339,11 @@ static int mtk_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)switch (cmd->cmd) {case ETHTOOL_SRXCLSRLINS : -if (dev->features &NETIF_F_LRO ) +if (dev->hw_features &NETIF_F_LRO ) ret =mtk_hwlro_add_ipaddr (dev, cmd);break ;case ETHTOOL_SRXCLSRLDEL : -if (dev->features &NETIF_F_LRO ) +if (dev->hw_features &NETIF_F_LRO ) ret =mtk_hwlro_del_ipaddr (dev, cmd);break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/51 net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled
In reply to Greg Kroah-Hartman[ Upstream commit 880c2d4b2fdfd580ebcd6bb7240a8027a1d34751 ]
Should only enable HW RX_2BYTE_OFFSET function in the case NET_IP_ALIGN equals to 2.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -1
@@ -1788,6 +1788,7 @@ static void mtk_poll_controller(struct net_device *dev)static int mtk_start_dma (struct mtk_eth *eth) { +u32 rx_2b_offset = (NET_IP_ALIGN ==2 ) ?MTK_RX_2B_OFFSET :0 ;int err; err =mtk_dma_init (eth);
@@ -1804,7 +1805,7 @@ static int mtk_start_dma(struct mtk_eth *eth) MTK_QDMA_GLO_CFG);mtk_w32 (eth, -MTK_RX_DMA_EN |MTK_RX_2B_OFFSET | +MTK_RX_DMA_EN | rx_2b_offset |MTK_RX_BT_32DWORDS |MTK_MULTI_EN ,MTK_PDMA_GLO_CFG );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/51 drm/arm/hdlcd: Actually validate CRTC modes
In reply to Greg Kroah-Hartman[ Upstream commit b96151edced4edb6a18aa89a5fa02c7066efff45 ]
Rather than allowing any old mode through, then subsequently refusing unmatchable clock rates in atomic_check when it's too late to back out and pick a different mode, let's do that validation up-front where it will cause unsupported modes to be correctly pruned in the first place.
This also eliminates an issue whereby a perceived clock rate of 0 would cause atomic disable to fail and prevent the module from being unloaded.
--- drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +5 -6
@@ -186,20 +186,19 @@ static void hdlcd_crtc_atomic_disable(struct drm_crtc *crtc,clk_disable_unprepare (hdlcd->clk); } -static int hdlcd_crtc_atomic_check (struct drm_crtc *crtc, -struct drm_crtc_state *state) +static enum drm_mode_status hdlcd_crtc_mode_valid (struct drm_crtc *crtc, +const struct drm_display_mode *mode) {struct hdlcd_drm_private *hdlcd =crtc_to_hdlcd_priv (crtc); -struct drm_display_mode *mode = &state->adjusted_mode;long rate, clk_rate = mode->clock *1000 ; rate =clk_round_rate (hdlcd->clk, clk_rate);if (rate != clk_rate) {/* clock required by mode not supported by hardware */ -return -EINVAL ; +return MODE_NOCLOCK ; } -return 0 ; +return MODE_OK ; } static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -220,7 +219,7 @@ static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, }static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = { - .atomic_check = hdlcd_crtc_atomic_check, + .mode_valid = hdlcd_crtc_mode_valid, .atomic_begin = hdlcd_crtc_atomic_begin, .atomic_enable = hdlcd_crtc_atomic_enable, .atomic_disable = hdlcd_crtc_atomic_disable,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/51 drm/arm/hdlcd: Allow a bit of clock tolerance
In reply to Greg Kroah-Hartman[ Upstream commit 1c810739097fdeb31b393b67a0a1e3d7ffdd9f63 ]
On the Arm Juno platform, the HDLCD pixel clock is constrained to 250KHz resolution in order to avoid the tiny System Control Processor spending aeons trying to calculate exact PLL coefficients. This means that modes like my oddball 1600x1200 with 130.89MHz clock get rejected since the rate cannot be matched exactly. In practice, though, this mode works quite happily with the clock at 131MHz, so let's relax the check to allow a little bit of slop.
--- drivers/gpu/drm/arm/hdlcd_crtc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +2 -1
@@ -193,7 +193,8 @@ static enum drm_mode_status hdlcd_crtc_mode_valid(struct drm_crtc *crtc,long rate, clk_rate = mode->clock *1000 ; rate =clk_round_rate (hdlcd->clk, clk_rate); -if (rate != clk_rate) { +/* 0.1% seems a close enough tolerance for the TDA19988 on Juno */ +if (abs (rate - clk_rate) *1000 > clk_rate) {/* clock required by mode not supported by hardware */ return MODE_NOCLOCK ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/51 scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
In reply to Greg Kroah-Hartman[ Upstream commit 4f45d62a52297b10ded963412a158685647ecdec ]
The following error occurs for the make ARCH=arm64 checkstack case:
aarch64-linux-gnu-objdump -d vmlinux $(find . -name '*.ko') | \
perl ./scripts/checkstack.pl arm64
wrong or unknown architecture "arm64"
As suggested by Masahiro Yamada, fix the above error using regular expressions in the same way it was fixed for the ARCH=x86 case via commit fda9f9903be6 ("scripts/checkstack.pl: automatically handle 32-bit and 64-bit mode for ARCH=x86").
--- scripts/checkstack.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/checkstack.pl +1 -1
@@ -45,7 +45,7 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $x = "[0-9a-f]"; # hex character $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; - if ($arch eq 'aarch64') { + if ($arch =~ '^(aarch|arm)64$') { #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/51 scsi: ufs: Check that space was properly alloced in copy_query_response
In reply to Greg Kroah-Hartman[ Upstream commit 1c90836f70f9a8ef7b7ad9e1fdd8961903e6ced6 ]
struct ufs_dev_cmd is the main container that supports device management commands. In the case of a read descriptor request, we assume that the proper space was allocated in dev_cmd to hold the returning descriptor.
This is no longer true, as there are flows that doesn't use dev_cmd for device management requests, and was wrong in the first place.
--- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -1788,7 +1788,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)memcpy (&query_res->upiu_res, &lrbp->ucd_rsp_ptr->qr,QUERY_OSF_SIZE );/* Get the descriptor */ -if (lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) { +if (hba->dev_cmd.query.descriptor && + lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) {u8 *descp = (u8 *)lrbp->ucd_rsp_ptr +GENERAL_UPIU_REQUEST_SIZE ;u16 resp_len;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/51 scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
In reply to Greg Kroah-Hartman[ Upstream commit cc8f52609bb4177febade24d11713e20c0893b0a ]
We need to drop the "ctrl_info->sync_request_sem" lock before returning.
--- drivers/scsi/smartpqi/smartpqi_init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +4 -2
@@ -3686,8 +3686,10 @@ static int pqi_submit_raid_request_synchronous(struct pqi_ctrl_info *ctrl_info,return -ETIMEDOUT ; msecs_blocked =jiffies_to_msecs (jiffies - start_jiffies); -if (msecs_blocked >= timeout_msecs) -return -ETIMEDOUT ; +if (msecs_blocked >= timeout_msecs) { + rc = -ETIMEDOUT ; + goto out; + } timeout_msecs -= msecs_blocked; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/51 net: ipvlan: Fix ipvlan device tso disabled while NETIF_F_IP_CSUM is set
In reply to Greg Kroah-Hartman[ Upstream commit ceae266bf0ae6564ac16d086bf749a096fa90ded ]
There's some NICs, such as hinic, with NETIF_F_IP_CSUM and NETIF_F_TSO on but NETIF_F_HW_CSUM off. And ipvlan device features will be NETIF_F_TSO on with NETIF_F_IP_CSUM and NETIF_F_IP_CSUM both off as IPVLAN_FEATURES only care about NETIF_F_HW_CSUM. So TSO will be disabled in netdev_fix_features.
For example:
Features for enp129s0f0:
rx-checksumming: on
tx-checksumming: on
tx-checksum-ipv4: on
tx-checksum-ip-generic: off [fixed]
tx-checksum-ipv6: on
--- drivers/net/ipvlan/ipvlan_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ipvlan/ipvlan_main.c +1 -1
@@ -188,7 +188,7 @@ static void ipvlan_port_destroy(struct net_device *dev) }#define IPVLAN_FEATURES \ - (NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ + (NETIF_F_SG | NETIF_F_CSUM_MASK | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_GSO_ROBUST | \ NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \ NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/51 s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
In reply to Greg Kroah-Hartman[ Upstream commit 335726195e460cb6b3f795b695bfd31f0ea70ef0 ]
Enabling sysfs attribute bridge_hostnotify triggers a series of udev events for the MAC addresses of all currently connected peers. In case no VLAN is set for a peer, the device reports the corresponding MAC addresses with VLAN ID 4096. This currently results in attribute VLAN=4096 for all non-VLAN interfaces in the initial series of events after host-notify is enabled.
Instead, no VLAN attribute should be reported in the udev event for non-VLAN interfaces.
Only the initial events face this issue. For dynamic changes that are reported later, the device uses a validity flag.
This also changes the code so that it now sets the VLAN attribute for MAC addresses with VID 0. On Linux, no qeth interface will ever be registered with VID 0: Linux kernel registers VID 0 on all network interfaces initially, but qeth will drop .ndo_vlan_rx_add_vid for VID 0. Peers with other OSs could register MACs with VID 0.
--- drivers/s390/net/qeth_l2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -1998,7 +1998,7 @@ static void qeth_bridgeport_an_set_cb(void *priv, l2entry = (struct qdio_brinfo_entry_l2 *)entry; code =IPA_ADDR_CHANGE_CODE_MACADDR ; -if (l2entry->addr_lnid.lnid) +if (l2entry->addr_lnid.lnid <VLAN_N_VID ) code |=IPA_ADDR_CHANGE_CODE_VLANID ; qeth_bridge_emit_host_event(card, anev_reg_unreg, code, (struct net_if_token *)&l2entry->nit,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/51 hwmon: (core) add thermal sensors only if dev->of_node is present
In reply to Greg Kroah-Hartman[ Upstream commit c41dd48e21fae3e55b3670ccf2eb562fc1f6a67d ]
Drivers may register to hwmon and request for also registering with the thermal subsystem (HWMON_C_REGISTER_TZ). However, some of these driver, e.g. marvell phy, may be probed from Device Tree or being dynamically allocated, and in the later case, it will not have a dev->of_node entry.
Registering with hwmon without the dev->of_node may result in different outcomes depending on the device tree, which may be a bit misleading. If the device tree blob has no 'thermal-zones' node, the *hwmon_device_register*() family functions are going to gracefully succeed, because of-thermal, *thermal_zone_of_sensor_register() return -ENODEV in this case, and the hwmon error path handles this error code as success to cover for the case where CONFIG_THERMAL_OF is not set. However, if the device tree blob has the 'thermal-zones' entry, the *hwmon_device_register*() will always fail on callers with no dev->of_node, propagating -EINVAL.
If dev->of_node is not present, calling of-thermal does not make sense. For this reason, this patch checks first if the device has a of_node before going over the process of registering with the thermal subsystem of-thermal interface. And in this case, when a caller of *hwmon_device_register*() with HWMON_C_REGISTER_TZ and no dev->of_node will still register with hwmon, but not with the thermal subsystem. If all the hwmon part bits are in place, the registration will succeed.
--- drivers/hwmon/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/hwmon.c +1 -1
@@ -608,7 +608,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,if (err) goto free_hwmon; -if (dev && chip && chip->ops->read && +if (dev && dev->of_node && chip && chip->ops->read && chip->info[0 ]->type == hwmon_chip && (chip->info[0 ]->config[0 ] &HWMON_C_REGISTER_TZ )) {const struct hwmon_channel_info **info = chip->info;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/51 hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
In reply to Greg Kroah-Hartman[ Upstream commit 4a60570dce658e3f8885bbcf852430b99f65aca5 ]
Some chips have attributes which exist on more than one page but the attribute is not presently marked as paged. This causes the attributes to be generated with the same label, which makes it impossible for userspace to tell them apart.
Marking all such attributes as paged would result in the page suffix being added regardless of whether they were present on more than one page or not, which might break existing setups. Therefore, we add a second check which treats the attribute as paged, even if not marked as such, if it is present on multiple pages.
--- drivers/hwmon/pmbus/pmbus_core.c | 34 ++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +30 -4
@@ -1055,7 +1055,8 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,const struct pmbus_driver_info *info, const char *name, int index, int page, - const struct pmbus_sensor_attr *attr) + const struct pmbus_sensor_attr *attr, + bool paged) { struct pmbus_sensor *base;bool upper = !!(attr->gbit &0xff00 );/* need to check STATUS_WORD */
@@ -1063,7 +1064,7 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,if (attr->label) { ret =pmbus_add_label (data, name, index, attr->label, - attr->paged ? page +1 :0 ); + paged ? page +1 :0 );if (ret)return ret; }
@@ -1096,6 +1097,30 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,return 0 ; } +static bool pmbus_sensor_is_paged (const struct pmbus_driver_info *info, +const struct pmbus_sensor_attr *attr) +{ +int p; + +if (attr->paged) +return true; + +/* +* Some attributes may be present on more than one page despite +* not being marked with the paged attribute. If that is the case, +* then treat the sensor as being paged and add the page suffix to the +* attribute name. +* We don't just add the paged attribute to all such attributes, in +* order to maintain the un-suffixed labels in the case where the +* attribute is only on page 0. +*/ +for (p =1 ; p < info->pages; p++) { +if (info->func[p] & attr->func) +return true; + } +return false; +} + static int pmbus_add_sensor_attrs(struct i2c_client *client, struct pmbus_data *data, const char *name,
@@ -1109,14 +1134,15 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, index =1 ;for (i =0 ; i < nattrs; i++) {int page, pages; +bool paged =pmbus_sensor_is_paged (info, attrs); - pages = attrs->paged ? info->pages :1 ; + pages = paged ? info->pages :1 ;for (page =0 ; page < pages; page++) {if (!(info->func[page] & attrs->func))continue ; ret =pmbus_add_sensor_attrs_one (client, data, info, name, index, page, - attrs); + attrs, paged);if (ret)return ret; index++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/51 nvme: Fix u32 overflow in the number of namespace list calculation
In reply to Greg Kroah-Hartman[ Upstream commit c8e8c77b3bdbade6e26e8e76595f141ede12b692 ]
The Number of Namespaces (nn) field in the identify controller data structure is defined as u32 and the maximum allowed value in NVMe specification is 0xFFFFFFFEUL. This change fixes the possible overflow of the DIV_ROUND_UP() operation used in nvme_scan_ns_list() by casting the nn to u64.
--- drivers/nvme/host/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +2 -1
@@ -2477,7 +2477,8 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl, unsigned nn) {struct nvme_ns *ns;__le32 *ns_list; -unsigned i, j, nsid, prev =0 , num_lists =DIV_ROUND_UP (nn,1024 ); +unsigned i, j, nsid, prev =0 ; +unsigned num_lists =DIV_ROUND_UP_ULL ((u64 )nn,1024 );int ret =0 ; ns_list =kzalloc (0x1000 ,GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/51 btrfs: start readahead also in seed devices
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit c4e0540d0ad49c8ceab06cceed1de27c4fe29f6e upstream.
Currently, btrfs does not consult seed devices to start readahead. As a result, if readahead zone is added to the seed devices, btrfs_reada_wait() indefinitely wait for the reada_ctl to finish.
You can reproduce the hung by modifying btrfs/163 to have larger initial file size (e.g. xfs_io pwrite 4M instead of current 256K).
--- fs/btrfs/reada.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/btrfs/reada.c +5 -0
@@ -759,6 +759,7 @@ static void __reada_start_machine(structu64 total =0 ;int i; +again: do { enqueued = 0; mutex_lock(&fs_devices->device_list_mutex);
@@ -770,6 +771,10 @@ static void __reada_start_machine(structmutex_unlock (&fs_devices->device_list_mutex); total += enqueued; }while (enqueued && total <10000 ); +if (fs_devices->seed) { + fs_devices = fs_devices->seed; + goto again; + }if (enqueued ==0 )return ;
Greg Kroah-Hartman
maintainerPATCH 40/51 can: flexcan: fix timeout when set small bitrate
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
commit 247e5356a709eb49a0d95ff2a7f07dac05c8252c upstream.
Current we can meet timeout issue when setting a small bitrate like 10000 as follows on i.MX6UL EVK board (ipg clock = 66MHZ, per clock = 30MHZ):
| root@imx6ul7d:~# ip link set can0 up type can bitrate 10000
A link change request failed with some changes committed already. Interface can0 may have been left with an inconsistent configuration, please check.
| RTNETLINK answers: Connection timed out
It is caused by calling of flexcan_chip_unfreeze() timeout.
Originally the code is using usleep_range(10, 20) for unfreeze operation, but the patch (8badd65 can: flexcan: avoid calling usleep_range from interrupt context) changed it into udelay(10) which is only a half delay of before, there're also some other delay changes.
After double to FLEXCAN_TIMEOUT_US to 100 can fix the issue.
Meanwhile, Rasmus Villemoes reported that even with a timeout of 100, flexcan_probe() fails on the MPC8309, which requires a value of at least 140 to work reliably. 250 works for everyone.
--- drivers/net/can/flexcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/flexcan.c +1 -1
@@ -177,7 +177,7 @@#define FLEXCAN_MB_CNT_LENGTH (x) (((x) & 0xf) << 16)#define FLEXCAN_MB_CNT_TIMESTAMP (x) ((x) & 0xffff) -#define FLEXCAN_TIMEOUT_US (50) +#define FLEXCAN_TIMEOUT_US (250)/* FLEXCAN hardware feature flags *
Greg Kroah-Hartman
maintainerPATCH 41/51 can: purge socket error queue on sock destruct
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
commit fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf upstream.
CAN supports software tx timestamps as of the below commit. Purge any queued timestamp packets on socket destroy.
--- net/can/af_can.c | 1 + 1 file changed, 1 insertion(+)
net/can/af_can.c +1 -0
@@ -105,6 +105,7 @@ EXPORT_SYMBOL(can_ioctl);static void can_sock_destruct (struct sock *sk) {skb_queue_purge (&sk->sk_receive_queue); +skb_queue_purge (&sk->sk_error_queue); }static const struct can_proto *can_get_proto (int protocol)
Greg Kroah-Hartman
maintainerPATCH 42/51 powerpc/bpf: use unsigned division instruction for 64-bit operations
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
commit 758f2046ea040773ae8ea7f72dd3bbd8fa984501 upstream.
BPF_ALU64 div/mod operations are currently using signed division, unlike BPF_ALU32 operations. Fix the same. DIV64 and MOD64 overflow tests pass with this fix.
--- arch/powerpc/include/asm/ppc-opcode.h | 1 + arch/powerpc/net/bpf_jit.h | 2 +- arch/powerpc/net/bpf_jit_comp64.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +1 -0
@@ -324,6 +324,7 @@#define PPC_INST_MULLI 0x1c000000#define PPC_INST_DIVWU 0x7c000396#define PPC_INST_DIVD 0x7c0003d2 +#define PPC_INST_DIVDU 0x7c000392#define PPC_INST_RLWINM 0x54000000#define PPC_INST_RLWIMI 0x50000000#define PPC_INST_RLDICL 0x78000000
arch/powerpc/net/bpf_jit.h +1 -1
@@ -116,7 +116,7 @@ ___PPC_RA(a) | IMM_L(i))#define PPC_DIVWU (d, a, b) EMIT(PPC_INST_DIVWU | ___PPC_RT(d) | \ ___PPC_RA(a) | ___PPC_RB(b)) -#define PPC_DIVD (d, a, b) EMIT(PPC_INST_DIVD | ___PPC_RT(d) | \ +#define PPC_DIVDU (d, a, b) EMIT(PPC_INST_DIVDU | ___PPC_RT(d) | \ ___PPC_RA(a) | ___PPC_RB(b))#define PPC_AND (d, a, b) EMIT(PPC_INST_AND | ___PPC_RA(d) | \ ___PPC_RS(a) | ___PPC_RB(b))
arch/powerpc/net/bpf_jit_comp64.c +4 -4
@@ -415,12 +415,12 @@ static int bpf_jit_build_body(struct bpfPPC_LI (b2p[BPF_REG_0 ],0 );PPC_JMP (exit_addr);if (BPF_OP (code) ==BPF_MOD ) { -PPC_DIVD (b2p[TMP_REG_1 ], dst_reg, src_reg); +PPC_DIVDU (b2p[TMP_REG_1 ], dst_reg, src_reg);PPC_MULD (b2p[TMP_REG_1 ], src_reg, b2p[TMP_REG_1 ]);PPC_SUB (dst_reg, dst_reg, b2p[TMP_REG_1 ]); }else -PPC_DIVD (dst_reg, dst_reg, src_reg); +PPC_DIVDU (dst_reg, dst_reg, src_reg);break ;case BPF_ALU |BPF_MOD |BPF_K :/* (u32) dst %= (u32) imm */ case BPF_ALU |BPF_DIV |BPF_K :/* (u32) dst /= (u32) imm */
@@ -448,7 +448,7 @@ static int bpf_jit_build_body(struct bpfbreak ;case BPF_ALU64 :if (BPF_OP (code) ==BPF_MOD ) { -PPC_DIVD (b2p[TMP_REG_2 ], dst_reg, +PPC_DIVDU (b2p[TMP_REG_2 ], dst_reg, b2p[TMP_REG_1 ]); PPC_MULD(b2p[TMP_REG_1], b2p[TMP_REG_1],
@@ -456,7 +456,7 @@ static int bpf_jit_build_body(struct bpfPPC_SUB (dst_reg, dst_reg, b2p[TMP_REG_1 ]); }else -PPC_DIVD (dst_reg, dst_reg, +PPC_DIVDU (dst_reg, dst_reg, b2p[TMP_REG_1 ]);break ; }
Greg Kroah-Hartman
maintainerPATCH 43/51 ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
commit b25af2ff7c07bd19af74e3f64ff82e2880d13d81 upstream.
Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier.
The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs.
Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case.
--- arch/arm/mach-imx/cpuidle-imx6sx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpuidle-imx6sx.c +2 -1
@@ -15,6 +15,7 @@#include "common.h" #include "cpuidle.h" +#include "hardware.h" static int imx6sx_idle_finish (unsigned long val) {
@@ -108,7 +109,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (0xf ,1 ); +imx_gpc_set_arm_power_up_timing (cpu_is_imx6sx () ?0xf :0x2 ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
Greg Kroah-Hartman
maintainerPATCH 44/51 ARM: dts: am57xx-idk: Remove support for voltage switching for SD card
In reply to Greg Kroah-HartmanFrom: Faiz Abbas <[email protected]>
commit 88a748419b84187fd1da05637b8e5928b04a1e06 upstream.
If UHS speed modes are enabled, a compatible SD card switches down to 1.8V during enumeration. If after this a software reboot/crash takes place and on-chip ROM tries to enumerate the SD card, the difference in IO voltages (host @ 3.3V and card @ 1.8V) may end up damaging the card.
The fix for this is to have support for power cycling the card in hardware (with a PORz/soft-reset line causing a power cycle of the card). Since am571x-, am572x- and am574x-idk don't have this capability, disable voltage switching for these boards.
The major effect of this is that the maximum supported speed mode is now high speed(50 MHz) down from SDR104(200 MHz).
--- arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/am57xx-idk-common.dtsi +1 -0
@@ -405,6 +405,7 @@ vqmmc-supply = <&ldo1_reg>; bus-width = <4>; cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ + no-1-8-v; }; &mmc2 {
Greg Kroah-Hartman
maintainerPATCH 45/51 Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
The minimum encryption key size for LE connections is 56 bits and to align LE with BR/EDR, enforce 56 bits of minimum encryption key size for BR/EDR connections as well.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_conn.c | 8 ++++++++ 2 files changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -178,6 +178,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
net/bluetooth/hci_conn.c +8 -0
@@ -1165,6 +1165,14 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +*/ +if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) +return 0 ; +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 46/51 Bluetooth: Fix regression with minimum encryption key size alignment
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit 693cd8ce3f882524a5d06f7800dd8492411877b3 upstream.
When trying to align the minimum encryption key size requirement for Bluetooth connections, it turns out doing this in a central location in the HCI connection handling code is not possible.
Original Bluetooth version up to 2.0 used a security model where the L2CAP service would enforce authentication and encryption. Starting with Bluetooth 2.1 and Secure Simple Pairing that model has changed into that the connection initiator is responsible for providing an encrypted ACL link before any L2CAP communication can happen.
Now connecting Bluetooth 2.1 or later devices with Bluetooth 2.0 and before devices are causing a regression. The encryption key size check needs to be moved out of the HCI connection handling into the L2CAP channel setup.
To achieve this, the current check inside hci_conn_security() has been moved into l2cap_check_enc_key_size() helper function and then called from four decisions point inside L2CAP to cover all combinations of Secure Simple Pairing enabled devices and device using legacy pairing and legacy service security model.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203643
--- net/bluetooth/hci_conn.c | 18 +++++++++--------- net/bluetooth/l2cap_core.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 14 deletions(-)
net/bluetooth/hci_conn.c +9 -9
@@ -1165,14 +1165,6 @@ 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 ; }
@@ -1289,8 +1281,16 @@ auth:return 0 ; encrypt: -if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) +if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) { +/* Ensure that the encryption key size has been read, +* otherwise stall the upper layer responses. +*/ +if (!conn->enc_key_size) +return 0 ; + +/* Nothing else needed, all requirements are met */ return 1 ; + }hci_conn_encrypt (conn);return 0 ;
net/bluetooth/l2cap_core.c +28 -5
@@ -1340,6 +1340,21 @@ static void l2cap_request_info(struct l2 sizeof(req), &req); } +static bool l2cap_check_enc_key_size (struct hci_conn *hcon) +{ +/* 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. +* +* This check might also be called for unencrypted connections +* that have no key size requirements. Ensure that the link is +* actually encrypted before enforcing a key size. +*/ +return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || + hcon->enc_key_size >HCI_MIN_ENC_KEY_SIZE ); +} +static void l2cap_do_start (struct l2cap_chan *chan) {struct l2cap_conn *conn = chan->conn;
@@ -1357,9 +1372,14 @@ static void l2cap_do_start(struct l2cap_if (!(conn->info_state &L2CAP_INFO_FEAT_MASK_REQ_DONE ))return ; -if (l2cap_chan_check_security (chan, true) && -__l2cap_no_conn_pending (chan)) +if (!l2cap_chan_check_security (chan, true) || + !__l2cap_no_conn_pending (chan)) +return ; + +if (l2cap_check_enc_key_size (conn->hcon))l2cap_start_connection (chan); +else +__set_chan_timer (chan,L2CAP_DISC_TIMEOUT ); }static inline int l2cap_mode_supported (__u8 mode,__u32 feat_mask)
@@ -1438,7 +1458,10 @@ static void l2cap_conn_start(struct l2cacontinue ; } -l2cap_start_connection (chan); +if (l2cap_check_enc_key_size (conn->hcon)) +l2cap_start_connection (chan); +else +l2cap_chan_close (chan,ECONNREFUSED ); }else if (chan->state ==BT_CONNECT2 ) {struct l2cap_conn_rsp rsp;
@@ -7455,7 +7478,7 @@ static void l2cap_security_cfm(struct hc }if (chan->state ==BT_CONNECT ) { -if (!status) +if (!status &&l2cap_check_enc_key_size (hcon))l2cap_start_connection (chan);else __set_chan_timer (chan,L2CAP_DISC_TIMEOUT );
@@ -7464,7 +7487,7 @@ static void l2cap_security_cfm(struct hcstruct l2cap_conn_rsp rsp;__u16 res, stat; -if (!status) { +if (!status &&l2cap_check_enc_key_size (hcon)) {if (test_bit (FLAG_DEFER_SETUP , &chan->flags)) { res =L2CAP_CR_PEND ; stat =L2CAP_CS_AUTHOR_PEND ;
Greg Kroah-Hartman
maintainerPATCH 47/51 SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 8d526d62db907e786fd88948c75d1833d82bd80e upstream.
Some servers such as Windows 10 will return STATUS_INSUFFICIENT_RESOURCES as the number of simultaneous SMB3 requests grows (even though the client has sufficient credits). Return EAGAIN on STATUS_INSUFFICIENT_RESOURCES so that we can retry writes which fail with this status code.
This (for example) fixes large file copies to Windows 10 on fast networks.
--- fs/cifs/smb2maperror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2maperror.c +1 -1
@@ -456,7 +456,7 @@ static const struct status_to_posix_erro {STATUS_FILE_INVALID, -EIO, "STATUS_FILE_INVALID"}, {STATUS_ALLOTTED_SPACE_EXCEEDED, -EIO, "STATUS_ALLOTTED_SPACE_EXCEEDED"}, - {STATUS_INSUFFICIENT_RESOURCES, -EREMOTEIO, + {STATUS_INSUFFICIENT_RESOURCES, -EAGAIN, "STATUS_INSUFFICIENT_RESOURCES"}, {STATUS_DFS_EXIT_PATH_FOUND, -EIO, "STATUS_DFS_EXIT_PATH_FOUND"}, {STATUS_DEVICE_DATA_ERROR, -EIO, "STATUS_DEVICE_DATA_ERROR"},
Greg Kroah-Hartman
maintainerPATCH 48/51 cfg80211: fix memory leak of wiphy device name
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 4f488fbca2a86cc7714a128952eead92cac279ab upstream.
In wiphy_new_nm(), if an error occurs after dev_set_name() and device_initialize() have already been called, it's necessary to call put_device() (via wiphy_free()) to avoid a memory leak.
--- net/wireless/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/core.c +1 -1
@@ -498,7 +498,7 @@ use_default_name: &rdev->rfkill_ops, rdev);if (!rdev->rfkill) { -kfree (rdev); +wiphy_free (&rdev->wiphy);return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 49/51 mac80211: drop robust management frames from unknown TA
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 588f7d39b3592a36fb7702ae3b8bdd9be4621e2f upstream.
When receiving a robust management frame, drop it if we don't have rx->sta since then we don't have a security association and thus couldn't possibly validate the frame.
--- net/mac80211/rx.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/rx.c +2 -0
@@ -3589,6 +3589,8 @@ static bool ieee80211_accept_frame(struccase NL80211_IFTYPE_STATION :if (!bssid && !sdata->u.mgd.use_4addr)return false; +if (ieee80211_is_robust_mgmt_frame (skb) && !rx->sta) +return false;if (multicast)return true;return ether_addr_equal (sdata->vif.addr, hdr->addr1);
Greg Kroah-Hartman
maintainerPATCH 50/51 mac80211: handle deauthentication/disassociation from TDLS peer
In reply to Greg Kroah-HartmanFrom: Yu Wang <[email protected]>
commit 79c92ca42b5a3e0ea172ea2ce8df8e125af237da upstream.
When receiving a deauthentication/disassociation frame from a TDLS peer, a station should not disconnect the current AP, but only disable the current TDLS link if it's enabled.
Without this change, a TDLS issue can be reproduced by following the steps as below:
1. STA-1 and STA-2 are connected to AP, bidirection traffic is running between STA-1 and STA-2.
2. Set up TDLS link between STA-1 and STA-2, stay for a while, then teardown TDLS link.
3. Repeat step #2 and monitor the connection between STA and AP.
During the test, one STA may send a deauthentication/disassociation frame to another, after TDLS teardown, with reason code 6/7, which
means: Class 2/3 frame received from nonassociated STA.
On receive this frame, the receiver STA will disconnect the current AP and then reconnect. It's not a expected behavior, purpose of this frame should be disabling the TDLS link, not the link with AP.
--- net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mlme.c | 12 +++++++++++- net/mac80211/tdls.c | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-)
net/mac80211/ieee80211_i.h +3 -0
@@ -2150,6 +2150,9 @@ void ieee80211_tdls_cancel_channel_switc const u8 *addr);void ieee80211_teardown_tdls_peers (struct ieee80211_sub_if_data *sdata);void ieee80211_tdls_chsw_work (struct work_struct *wk); +void ieee80211_tdls_handle_disconnect (struct ieee80211_sub_if_data *sdata, +const u8 *peer,u16 reason); +const char *ieee80211_get_reason_code_string (u16 reason_code);extern const struct ethtool_ops ieee80211_ethtool_ops;
net/mac80211/mlme.c +11 -1
@@ -2744,7 +2744,7 @@ static void ieee80211_rx_mgmt_auth(struc#define case_WLAN (type) \ case WLAN_REASON_##type: return #type -static const char *ieee80211_get_reason_code_string (u16 reason_code) +const char *ieee80211_get_reason_code_string (u16 reason_code) {switch (reason_code) {case_WLAN (UNSPECIFIED );
@@ -2809,6 +2809,11 @@ static void ieee80211_rx_mgmt_deauth(strif (len <24 +2 )return ; +if (!ether_addr_equal (mgmt->bssid, mgmt->sa)) { +ieee80211_tdls_handle_disconnect (sdata, mgmt->sa, reason_code); +return ; + } +if (ifmgd->associated &ðer_addr_equal (mgmt->bssid, ifmgd->associated->bssid)) {const u8 *bssid = ifmgd->associated->bssid;
@@ -2858,6 +2863,11 @@ static void ieee80211_rx_mgmt_disassoc(s reason_code =le16_to_cpu (mgmt->u.disassoc.reason_code); +if (!ether_addr_equal (mgmt->bssid, mgmt->sa)) { +ieee80211_tdls_handle_disconnect (sdata, mgmt->sa, reason_code); +return ; + } +sdata_info (sdata,"disassociated from %pM (Reason: %u=%s)\n" , mgmt->sa, reason_code,ieee80211_get_reason_code_string (reason_code));
net/mac80211/tdls.c +23 -0
@@ -1988,3 +1988,26 @@ void ieee80211_tdls_chsw_work(struct wor }rtnl_unlock (); } + +void ieee80211_tdls_handle_disconnect (struct ieee80211_sub_if_data *sdata, +const u8 *peer,u16 reason) +{ +struct ieee80211_sta *sta; + +rcu_read_lock (); + sta =ieee80211_find_sta (&sdata->vif, peer); +if (!sta || !sta->tdls) { +rcu_read_unlock (); +return ; + } +rcu_read_unlock (); + +tdls_dbg (sdata,"disconnected from TDLS peer %pM (Reason: %u=%s)\n" , + peer, reason, +ieee80211_get_reason_code_string (reason)); + +ieee80211_tdls_oper_request (&sdata->vif, peer, +NL80211_TDLS_TEARDOWN , +WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE , +GFP_ATOMIC ); +}
Greg Kroah-Hartman
maintainerPATCH 51/51 mac80211: Do not use stack memory with scatterlist for GMAC
In reply to Greg Kroah-HartmanFrom: Jouni Malinen <[email protected]>
commit a71fd9dac23613d96ba3c05619a8ef4fd6cdf9b9 upstream.
ieee80211_aes_gmac() uses the mic argument directly in sg_set_buf() and that does not allow use of stack memory (e.g., BUG_ON() is hit in sg_set_buf() with CONFIG_DEBUG_SG). BIP GMAC TX side is fine for this since it can use the skb data buffer, but the RX side was using a stack variable for deriving the local MIC value to compare against the received one.
Fix this by allocating heap memory for the mic buffer.
This was found with hwsim test case ap_cipher_bip_gmac_128 hitting that BUG_ON() and kernel panic.
--- net/mac80211/wpa.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/mac80211/wpa.c +6 -1
@@ -1169,7 +1169,7 @@ ieee80211_crypto_aes_gmac_decrypt(structstruct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb);struct ieee80211_key *key = rx->key;struct ieee80211_mmie_16 *mmie; -u8 aad[GMAC_AAD_LEN ], mic[GMAC_MIC_LEN ], ipn[6 ], nonce[GMAC_NONCE_LEN ]; +u8 aad[GMAC_AAD_LEN ], *mic, ipn[6 ], nonce[GMAC_NONCE_LEN ];struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;if (!ieee80211_is_mgmt (hdr->frame_control))
@@ -1200,13 +1200,18 @@ ieee80211_crypto_aes_gmac_decrypt(structmemcpy (nonce, hdr->addr2,ETH_ALEN );memcpy (nonce +ETH_ALEN , ipn,6 ); + mic =kmalloc (GMAC_MIC_LEN ,GFP_ATOMIC ); +if (!mic) +return RX_DROP_UNUSABLE ;if (ieee80211_aes_gmac (key->u.aes_gmac.tfm, aad, nonce, skb->data +24 , skb->len -24 , mic) <0 ||crypto_memneq (mic, mmie->mic,sizeof (mmie->mic))) { key->u.aes_gmac.icverrors++; +kfree (mic);return RX_DROP_UNUSABLE ; } +kfree (mic); }memcpy (key->u.aes_gmac.rx_pn, ipn,6 );
stable-rc/linux-4.14.y boot: 116 boots: 0 failed, 109 passed with 7 offline (v4.14.129-52-g57f3c9aebc30)
stable-rc/linux-4.14.y boot: 116 boots: 0 failed, 109 passed with 7 offline (v4.14.129-52-g57f3c9aebc30)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.129-52-g57f3c9aebc30/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.129-52-g57f3c9aebc30/
Tree: stable-rc
Branch: linux-4.14.y
Git Describe: v4.14.129-52-g57f3c9aebc30
Git Commit: 57f3c9aebc308dc826ec1191e750fc853e79fb3a
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 62 unique boards, 23 SoC families, 14 builds out of 201
Offline Platforms:
arm:
qcom_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
sunxi_defconfig:
gcc-8
sun5i-r8-chip: 1 offline lab
multi_v7_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
sun5i-r8-chip: 1 offline labarm64:
defconfig:
gcc-8
apq8016-sbc: 1 offline lab---
For more info write to <[email protected]>
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.130 release. There are 51 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 26 Jun 2019 09:22:03 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.130-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.130-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 57f3c9aebc308dc826ec1191e750fc853e79fb3a
git describe: v4.14.129-52-g57f3c9aebc30
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.129-52-g57f3c9aebc30
No regressions (compared to build v4.14.129)
No fixes (compared to build v4.14.129)
Ran 23741 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-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
* kselftest
* ltp-dio-tests
* ltp-io-tests
* network-basic-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
Guenter Roeck
maintainerQuoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.130 release. There are 51 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 26 Jun 2019 09:22:03 AM UTC. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 346 pass: 346 fail: 0
Guenter
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.130 release. There are 51 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 26 Jun 2019 09:22:03 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.130-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.14.130-rc1-g57f3c9aebc30
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic