4.9.127-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 4.9.127-stable review
This is the start of the stable review cycle for the 4.9.127 release. There are 78 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat Sep 15 13:17:41 UTC 2018. 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.9.127-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.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.127-rc1
Suzuki K Poulose <[email protected]>
arm64: Handle mismatched cache type
Suzuki K Poulose <[email protected]>
arm64: Fix mismatched cache line size detection
Ethan Lien <[email protected]>
btrfs: use correct compare function of dirty_metadata_bytes
Gustavo A. R. Silva <[email protected]>
ASoC: wm8994: Fix missing break in switch
Martin Schwidefsky <[email protected]>
s390/lib: use expoline for all bcr instructions
Tomas Winkler <[email protected]>
mei: me: allow runtime pm for platform with D0i3
Nikolay Aleksandrov <[email protected]>
sch_tbf: fix two null pointer dereferences on init failure
Nikolay Aleksandrov <[email protected]>
sch_netem: avoid null pointer deref on init failure
Nikolay Aleksandrov <[email protected]>
sch_hhf: fix null pointer dereference on init failure
Nikolay Aleksandrov <[email protected]>
sch_multiq: fix double free on init failure
Nikolay Aleksandrov <[email protected]>
sch_htb: fix crash on init failure
Chas Williams <[email protected]>
Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
Govindarajulu Varadarajan <[email protected]>
enic: do not call enic_change_mtu in enic_probe
Fabio Estevam <[email protected]>
Revert "ARM: imx_v6_v7_defconfig: Select ULPI support"
Tyler Hicks <[email protected]>
irda: Only insert new objects into the global database via setsockopt
Tyler Hicks <[email protected]>
irda: Fix memory leak caused by repeated binds of irda socket
Randy Dunlap <[email protected]>
kbuild: make missing $DEPMOD a Warning instead of an Error
Juergen Gross <[email protected]>
x86/pae: use 64 bit atomic xchg function in native_ptep_get_and_clear
Joel Fernandes (Google) <[email protected]>
debugobjects: Make stack check warning more informative
Eric Dumazet <[email protected]>
tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
Kai-Heng Feng <[email protected]>
drm/edid: Add 6 bpc quirk for SDC panel in Lenovo B50-80
Marc Zyngier <[email protected]>
ARM: rockchip: Force CONFIG_PM on Rockchip systems
Marc Zyngier <[email protected]>
arm64: rockchip: Force CONFIG_PM on Rockchip systems
Qu Wenruo <[email protected]>
btrfs: Don't remove block group that still has pinned down bytes
Qu Wenruo <[email protected]>
btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized
Misono Tomohiro <[email protected]>
btrfs: replace: Reset on-disk dev stats value after replace
Levin Du <[email protected]>
clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
Mahesh Salgaonkar <[email protected]>
powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX.
Steve French <[email protected]>
SMB3: Number of requests sent should be displayed for SMB3 not just CIFS
Steve French <[email protected]>
smb3: fix reset of bytes read and written stats
YueHaibing <[email protected]>
RDS: IB: fix 'passing zero to ERR_PTR()' warning
Breno Leitao <[email protected]>
selftests/powerpc: Kill child processes on SIGINT
Ian Abbott <[email protected]>
staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice
John Pittman <[email protected]>
dm kcopyd: avoid softlockup in run_complete_job
Thomas Petazzoni <[email protected]>
PCI: mvebu: Fix I/O space end address calculation
Dan Carpenter <[email protected]>
scsi: aic94xx: fix an error code in aic94xx_init()
Hans de Goede <[email protected]>
ACPI / scan: Initialize status to ACPI_STA_DEFAULT
Stefan Haberland <[email protected]>
s390/dasd: fix panic for failed online processing
Stefan Haberland <[email protected]>
s390/dasd: fix hanging offline processing due to canceled worker
Greg Edwards <[email protected]>
block: bvec_nr_vecs() returns value for wrong slab
Sandipan Das <[email protected]>
perf probe powerpc: Fix trace event post-processing
Dan Carpenter <[email protected]>
powerpc: Fix size calculation using resource_size()
Jean-Philippe Brucker <[email protected]>
net/9p: fix error path of p9_virtio_probe
Tomas Bortoli <[email protected]>
net/9p/trans_fd.c: fix race by holding the lock
Jonas Gorski <[email protected]>
irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
Gal Pressman <[email protected]>
RDMA/hns: Fix usage of bitmap allocation functions return values
Aleh Filipovich <[email protected]>
platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360
Guenter Roeck <[email protected]>
mfd: sm501: Set coherent_dma_mask when creating subdevices
Tan Hu <[email protected]>
ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest()
Philipp Rudo <[email protected]>
s390/kdump: Fix memleak in nt_vmcoreinfo
Randy Dunlap <[email protected]>
platform/x86: intel_punit_ipc: fix build errors
Tetsuo Handa <[email protected]>
fs/dcache.c: fix kmemcheck splat at take_dentry_name_snapshot()
Andrey Ryabinin <[email protected]>
mm/fadvise.c: fix signed overflow UBSAN complaint
Suzuki K Poulose <[email protected]>
virtio: pci-legacy: Validate queue pfn
Randy Dunlap <[email protected]>
scripts: modpost: check memory allocation results
OGAWA Hirofumi <[email protected]>
fat: validate ->i_start before using
Ernesto A. Fernández <[email protected]>
hfsplus: fix NULL dereference in hfsplus_lookup()
Arnd Bergmann <[email protected]>
reiserfs: change j_timestamp type to time64_t
Jann Horn <[email protected]>
fork: don't copy inconsistent signal handler state to child
Laura Abbott <[email protected]>
sunrpc: Don't use stack buffer with scatterlist
Ernesto A. Fernández <[email protected]>
hfs: prevent crash on exit from failed search
Tetsuo Handa <[email protected]>
hfsplus: don't return 0 when fill_super() failed
Ronnie Sahlberg <[email protected]>
cifs: check if SMB2 PDU size has been padded and suppress the warning
Vlad Buslov <[email protected]>
net: sched: action_ife: take reference to meta module
Cong Wang <[email protected]>
act_ife: fix a potential deadlock
Cong Wang <[email protected]>
act_ife: move tcfa_lock down to where necessary
Stephen Hemminger <[email protected]>
hv_netvsc: ignore devices that are not PCI
Jason Wang <[email protected]>
vhost: correctly check the iova range when waking virtqueue
Xin Long <[email protected]>
sctp: hold transport before accessing its asoc in sctp_transport_get_next
Alexey Kodanev <[email protected]>
vti6: remove !skb->ignore_df check from vti6_xmit()
Florian Westphal <[email protected]>
tcp: do not restart timewait timer on rst reception
Anthony Wong <[email protected]>
r8169: add support for NCube 8168 network card
Manish Chopra <[email protected]>
qlge: Fix netdev features configuration.
Kees Cook <[email protected]>
net: sched: Fix memory exposure from short TCA_U32_SEL
Doug Berger <[email protected]>
net: bcmgenet: use MAC link status for fixed phy
Eric Dumazet <[email protected]>
ipv4: tcp: send zero IPID for RST and ACK sent in SYN-RECV and TIME-WAIT state
Cong Wang <[email protected]>
act_ife: fix a potential use-after-free
Michal Hocko <[email protected]>
x86/speculation/l1tf: Fix up pte->pfn conversion for PAE
-------------
Diffstat:
Makefile | 4 +- arch/arm/configs/imx_v6_v7_defconfig | 2 - arch/arm/mach-rockchip/Kconfig | 1 + arch/arm64/Kconfig.platforms | 1 + arch/arm64/include/asm/cachetype.h | 5 ++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/kernel/cpu_errata.c | 24 ++++++-- arch/arm64/kernel/cpufeature.c | 4 +- arch/powerpc/platforms/pseries/ras.c | 2 +- arch/powerpc/sysdev/mpic_msgr.c | 2 +- arch/s390/kernel/crash_dump.c | 17 ++++-- arch/s390/lib/mem.S | 9 ++- arch/x86/include/asm/pgtable-3level.h | 7 +-- arch/x86/include/asm/pgtable.h | 2 +- block/bio.c | 2 +- drivers/acpi/scan.c | 5 +- drivers/clk/rockchip/clk-rk3399.c | 1 + drivers/gpu/drm/drm_edid.c | 3 + drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 5 +- drivers/irqchip/irq-bcm7038-l1.c | 4 ++ drivers/md/dm-kcopyd.c | 2 + drivers/mfd/sm501.c | 1 + drivers/misc/mei/pci-me.c | 5 +- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 3 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 10 +++- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 23 +++----- drivers/net/ethernet/realtek/r8169.c | 1 + drivers/net/hyperv/netvsc_drv.c | 5 ++ drivers/pci/host/pci-mvebu.c | 2 +- drivers/platform/x86/asus-nb-wmi.c | 1 + drivers/platform/x86/intel_punit_ipc.c | 1 + drivers/s390/block/dasd_eckd.c | 10 +++- drivers/scsi/aic94xx/aic94xx_init.c | 4 +- drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- drivers/vhost/vhost.c | 2 +- drivers/virtio/virtio_pci_legacy.c | 14 ++++- fs/btrfs/dev-replace.c | 6 ++ fs/btrfs/disk-io.c | 10 ++-- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/relocation.c | 23 ++++---- fs/cifs/cifs_debug.c | 8 +++ fs/cifs/smb2misc.c | 7 +++ fs/cifs/smb2pdu.c | 2 +- fs/dcache.c | 3 +- fs/fat/cache.c | 19 ++++--- fs/fat/fat.h | 5 ++ fs/fat/fatent.c | 6 +- fs/hfs/brec.c | 7 ++- fs/hfsplus/dir.c | 4 +- fs/hfsplus/super.c | 4 +- fs/reiserfs/reiserfs.h | 2 +- include/linux/pci_ids.h | 2 + kernel/fork.c | 2 + lib/debugobjects.c | 7 ++- mm/fadvise.c | 8 ++- mm/huge_memory.c | 2 +- net/9p/trans_fd.c | 10 ++-- net/9p/trans_virtio.c | 3 +- net/ipv4/tcp_ipv4.c | 6 ++ net/ipv4/tcp_minisocks.c | 3 +- net/ipv4/tcp_probe.c | 4 +- net/ipv6/ip6_vti.c | 2 +- net/irda/af_irda.c | 13 ++++- net/netfilter/ipvs/ip_vs_core.c | 15 +++-- net/rds/ib_frmr.c | 1 + net/sched/act_ife.c | 79 +++++++++++++++----------- net/sched/cls_u32.c | 8 ++- net/sched/sch_hhf.c | 3 + net/sched/sch_htb.c | 5 +- net/sched/sch_multiq.c | 9 +-- net/sched/sch_netem.c | 4 +- net/sched/sch_tbf.c | 5 +- net/sctp/proc.c | 4 -- net/sctp/socket.c | 22 ++++--- net/sunrpc/auth_gss/gss_krb5_crypto.c | 12 +++- scripts/depmod.sh | 4 +- scripts/mod/modpost.c | 8 +-- sound/soc/codecs/wm8994.c | 1 + tools/perf/arch/powerpc/util/sym-handling.c | 4 +- tools/testing/selftests/powerpc/harness.c | 18 ++++-- 82 files changed, 376 insertions(+), 190 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/78 x86/speculation/l1tf: Fix up pte->pfn conversion for PAE
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit e14d7dfb41f5807a0c1c26a13f2b8ef16af24935 upstream.
Jan has noticed that pte_pfn and co. resp. pfn_pte are incorrect for CONFIG_PAE because phys_addr_t is wider than unsigned long and so the pte_val reps. shift left would get truncated. Fix this up by using proper types.
[Just one chunk, again, needed here. Thanks to Ben and Guenter for finding and fixing this. - gregkh]
--- arch/x86/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/pgtable.h +1 -1
@@ -420,7 +420,7 @@ static inline pmd_t pfn_pmd(unsigned lonstatic inline pud_t pfn_pud (unsigned long page_nr,pgprot_t pgprot) { -phys_addr_t pfn = page_nr <<PAGE_SHIFT ; +phys_addr_t pfn = (phys_addr_t )page_nr <<PAGE_SHIFT ; pfn ^=protnone_mask (pgprot_val (pgprot)); pfn &=PHYSICAL_PUD_PAGE_MASK ;return __pud (pfn |massage_pgprot (pgprot));
Greg Kroah-Hartman
maintainerPATCH 2/78 act_ife: fix a potential use-after-free
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 6d784f1625ea68783cc1fb17de8f6cd3e1660c3f ]
Immediately after module_put(), user could delete this module, so e->ops could be already freed before we call e->ops->release().
Fix this by moving module_put() after ops->release().
--- net/sched/act_ife.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_ife.c +1 -1
@@ -395,7 +395,6 @@ static void _tcf_ife_cleanup(struct tc_astruct tcf_meta_info *e, *n;list_for_each_entry_safe (e, n, &ife->metalist, metalist) { -module_put (e->ops->owner);list_del (&e->metalist);if (e->metaval) {if (e->ops->release)
@@ -403,6 +402,7 @@ static void _tcf_ife_cleanup(struct tc_aelse kfree (e->metaval); } +module_put (e->ops->owner);kfree (e); } }
Greg Kroah-Hartman
maintainerPATCH 3/78 ipv4: tcp: send zero IPID for RST and ACK sent in SYN-RECV and TIME-WAIT state
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 431280eebed9f5079553daf003011097763e71fd ]
tcp uses per-cpu (and per namespace) sockets (net->ipv4.tcp_sk) internally to send some control packets.
1) RST packets, through tcp_v4_send_reset()
2) ACK packets in SYN-RECV and TIME-WAIT state, through tcp_v4_send_ack()
These packets assert IP_DF, and also use the hashed IP ident generator to provide an IPv4 ID number.
Geoff Alexander reported this could be used to build off-path attacks.
These packets should not be fragmented, since their size is smaller than IPV4_MIN_MTU. Only some tunneled paths could eventually have to fragment, regardless of inner IPID.
We really can use zero IPID, to address the flaw, and as a bonus, avoid a couple of atomic operations in ip_idents_reserve()
--- net/ipv4/tcp_ipv4.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/ipv4/tcp_ipv4.c +6 -0
@@ -2440,6 +2440,12 @@ static int __net_init tcp_sk_init(structif (res) goto fail;sock_set_flag (sk,SOCK_USE_WRITE_QUEUE ); + +/* Please enforce IP_DF and IPID==0 for RST and +* ACK sent in SYN-RECV and TIME-WAIT state. +*/ +inet_sk (sk)->pmtudisc =IP_PMTUDISC_DO ; + *per_cpu_ptr (net->ipv4.tcp_sk, cpu) = sk; }
Greg Kroah-Hartman
maintainerPATCH 4/78 net: bcmgenet: use MAC link status for fixed phy
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Berger <[email protected]>
[ Upstream commit c3c397c1f16c51601a3fac4fe0c63ad8aa85a904 ]
When using the fixed PHY with GENET (e.g. MOCA) the PHY link status can be determined from the internal link status captured by the MAC. This allows the PHY state machine to use the correct link state with the fixed PHY even if MAC link event interrupts are missed when the net device is opened.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 3 +++ drivers/net/ethernet/broadcom/genet/bcmmii.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.h +3 -0
@@ -185,6 +185,9 @@ struct bcmgenet_mib_counters {#define UMAC_MAC1 0x010#define UMAC_MAX_FRAME_LEN 0x014 +#define UMAC_MODE 0x44 +#define MODE_LINK_STATUS (1 << 5) +#define UMAC_EEE_CTRL 0x064#define EN_LPI_RX_PAUSE (1 << 0)#define EN_LPI_TX_PFC (1 << 1)
drivers/net/ethernet/broadcom/genet/bcmmii.c +8 -2
@@ -167,8 +167,14 @@ void bcmgenet_mii_setup(struct net_devicstatic int bcmgenet_fixed_phy_link_update (struct net_device *dev,struct fixed_phy_status *status) { -if (dev && dev->phydev && status) - status->link = dev->phydev->link; +struct bcmgenet_priv *priv; +u32 reg; + +if (dev && dev->phydev && status) { + priv =netdev_priv (dev); + reg =bcmgenet_umac_readl (priv,UMAC_MODE ); + status->link = !!(reg &MODE_LINK_STATUS ); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 5/78 net: sched: Fix memory exposure from short TCA_U32_SEL
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 98c8f125fd8a6240ea343c1aa50a1be9047791b8 ]
Via u32_change(), TCA_U32_SEL has an unspecified type in the netlink policy, so max length isn't enforced, only minimum. This means nkeys (from userspace) was being trusted without checking the actual size of nla_len(), which could lead to a memory over-read, and ultimately an exposure via a call to u32_dump(). Reachability is CAP_NET_ADMIN within a namespace.
--- net/sched/cls_u32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/sched/cls_u32.c +6 -2
@@ -851,6 +851,7 @@ static int u32_change(struct net *net, sstruct nlattr *opt = tca[TCA_OPTIONS ];struct nlattr *tb[TCA_U32_MAX +1 ];u32 htid, flags =0 ; +size_t sel_size;int err;#ifdef CONFIG_CLS_U32_PERF size_t size;
@@ -967,8 +968,11 @@ static int u32_change(struct net *net, sreturn -EINVAL ; s =nla_data (tb[TCA_U32_SEL ]); + sel_size =sizeof (*s) +sizeof (*s->keys) * s->nkeys; +if (nla_len (tb[TCA_U32_SEL ]) < sel_size) +return -EINVAL ; - n =kzalloc (sizeof (*n) + s->nkeys*sizeof (struct tc_u32_key ),GFP_KERNEL ); + n = kzalloc(offsetof(typeof(*n), sel) + sel_size, GFP_KERNEL);if (n ==NULL )return -ENOBUFS ;
@@ -981,7 +985,7 @@ static int u32_change(struct net *net, s }#endif -memcpy (&n->sel, s,sizeof (*s) + s->nkeys*sizeof (struct tc_u32_key )); +memcpy (&n->sel, s, sel_size);RCU_INIT_POINTER (n->ht_up, ht); n->handle = handle; n->fshift = s->hmask ?ffs (ntohl (s->hmask)) -1 :0 ;
Greg Kroah-Hartman
maintainerPATCH 6/78 qlge: Fix netdev features configuration.
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Chopra <[email protected]>
[ Upstream commit 6750c87074c5b534d82fdaabb1deb45b8f1f57de ]
qlge_fix_features() is not supposed to modify hardware or driver state, rather it is supposed to only fix requested fetures bits. Currently qlge_fix_features() also goes for interface down and up unnecessarily if there is not even any change in features set.
This patch changes/fixes following -
1) Move reload of interface or device re-config from qlge_fix_features() to qlge_set_features().
2) Reload of interface in qlge_set_features() only if relevant feature bit (NETIF_F_HW_VLAN_CTAG_RX) is changed.
3) Get rid of qlge_fix_features() since driver is not really required to fix any features bit.
--- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/net/ethernet/qlogic/qlge/qlge_main.c +8 -15
@@ -2387,26 +2387,20 @@ static int qlge_update_hw_vlan_features(return status; } -static netdev_features_t qlge_fix_features (struct net_device *ndev, -netdev_features_t features) -{ -int err; - -/* Update the behavior of vlan accel in the adapter */ - err =qlge_update_hw_vlan_features (ndev, features); -if (err) -return err; - -return features; -} -static int qlge_set_features (struct net_device *ndev,netdev_features_t features) {netdev_features_t changed = ndev->features ^ features; +int err; + +if (changed &NETIF_F_HW_VLAN_CTAG_RX ) { +/* Update the behavior of vlan accel in the adapter */ + err =qlge_update_hw_vlan_features (ndev, features); +if (err) +return err; -if (changed &NETIF_F_HW_VLAN_CTAG_RX )qlge_vlan_mode (ndev, features); + }return 0 ; }
@@ -4719,7 +4713,6 @@ static const struct net_device_ops qlge_ .ndo_set_mac_address = qlge_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_tx_timeout = qlge_tx_timeout, - .ndo_fix_features = qlge_fix_features, .ndo_set_features = qlge_set_features, .ndo_vlan_rx_add_vid = qlge_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = qlge_vlan_rx_kill_vid,
Greg Kroah-Hartman
maintainerPATCH 7/78 r8169: add support for NCube 8168 network card
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anthony Wong <[email protected]>
[ Upstream commit 9fd0e09a4e86499639653243edfcb417a05c5c46 ]
This card identifies itself as:
Ethernet controller [0200]: NCube Device [10ff:8168] (rev 06)
Subsystem: TP-LINK Technologies Co., Ltd. Device [7470:3468]
Adding a new entry to rtl8169_pci_tbl makes the card work.
--- drivers/net/ethernet/realtek/r8169.c | 1 + include/linux/pci_ids.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/net/ethernet/realtek/r8169.c +1 -0
@@ -329,6 +329,7 @@ static const struct pci_device_id rtl816 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8161), 0, 0, RTL_CFG_1 }, { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_NCUBE, 0x8168), 0, 0, RTL_CFG_1 }, { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, { PCI_VENDOR_ID_DLINK, 0x4300, PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
include/linux/pci_ids.h +2 -0
@@ -3054,4 +3054,6 @@#define PCI_VENDOR_ID_OCZ 0x1b85 +#define PCI_VENDOR_ID_NCUBE 0x10ff +#endif /* _LINUX_PCI_IDS_H */
Greg Kroah-Hartman
maintainerPATCH 8/78 tcp: do not restart timewait timer on rst reception
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 63cc357f7bba6729869565a12df08441a5995d9a ]
RFC 1337 says:
''Ignore RST segments in TIME-WAIT state.
If the 2 minute MSL is enforced, this fix avoids all three hazards.''
So with net.ipv4.tcp_rfc1337=1, expected behaviour is to have TIME-WAIT sk expire rather than removing it instantly when a reset is received.
However, Linux will also re-start the TIME-WAIT timer.
This causes connect to fail when tying to re-use ports or very long delays (until syn retry interval exceeds MSL).
packetdrill test case:
// Demonstrate bogus rearming of TIME-WAIT timer in rfc1337 mode. sysctl net.ipv4.tcp_rfc1337=1
0.000 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3 0.000 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 0.000 bind(3, ..., ...) = 0
0.000 listen(3, 1) = 0
0.100 < S 0:0(0) win 29200 <mss 1460,nop,nop,sackOK,nop,wscale 7> 0.100 > S. 0:0(0) ack 1 <mss 1460,nop,nop,sackOK,nop,wscale 7> 0.200 < . 1:1(0) ack 1 win 257
0.200 accept(3, ..., ...) = 4
// Receive first segment
0.310 < P. 1:1001(1000) ack 1 win 46
// Send one ACK
0.310 > . 1:1(0) ack 1001
// read 1000 byte
0.310 read(4, ..., 1000) = 1000
// Application writes 100 bytes
0.350 write(4, ..., 100) = 100
0.350 > P. 1:101(100) ack 1001
// ACK
0.500 < . 1001:1001(0) ack 101 win 257
// close the connection
0.600 close(4) = 0
0.600 > F. 101:101(0) ack 1001 win 244
// Our side is in FIN_WAIT_1 & waits for ack to fin 0.7 < . 1001:1001(0) ack 102 win 244
// Our side is in FIN_WAIT_2 with no outstanding data. 0.8 < F. 1001:1001(0) ack 102 win 244
0.8 > . 102:102(0) ack 1002 win 244
// Our side is now in TIME_WAIT state, send ack for fin. 0.9 < F. 1002:1002(0) ack 102 win 244
0.9 > . 102:102(0) ack 1002 win 244
// Peer reopens with in-window SYN:
1.000 < S 1000:1000(0) win 9200 <mss 1460,nop,nop,sackOK,nop,wscale 7>
// Therefore, reply with ACK.
1.000 > . 102:102(0) ack 1002 win 244
// Peer sends RST for this ACK. Normally this RST results // in tw socket removal, but rfc1337=1 setting prevents this. 1.100 < R 1002:1002(0) win 244
// second syn. Due to rfc1337=1 expect another pure ACK. 31.0 < S 1000:1000(0) win 9200 <mss 1460,nop,nop,sackOK,nop,wscale 7> 31.0 > . 102:102(0) ack 1002 win 244
// .. and another RST from peer.
31.1 < R 1002:1002(0) win 244
31.2 echo no timer restart;ss -m -e -a -i -n -t -o state TIME-WAIT
// third syn after one minute. Time-Wait socket should have expired by now. 63.0 < S 1000:1000(0) win 9200 <mss 1460,nop,nop,sackOK,nop,wscale 7>
// so we expect a syn-ack & 3whs to proceed from here on. 63.0 > S. 0:0(0) ack 1 <mss 1460,nop,nop,sackOK,nop,wscale 7>
Without this patch, 'ss' shows restarts of tw timer and last packet is thus just another pure ack, more than one minute later.
This restores the original code from commit 283fd6cf0be690a83 ("Merge in ANK networking jumbo patch") in netdev-vger-cvs.git .
For some reason the else branch was removed/lost in 1f28b683339f7 ("Merge in TCP/UDP optimizations and [..]") and timer restart became unconditional.
--- net/ipv4/tcp_minisocks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_minisocks.c +2 -1
@@ -194,8 +194,9 @@ kill:inet_twsk_deschedule_put (tw);return TCP_TW_SUCCESS ; } + }else { +inet_twsk_reschedule (tw,TCP_TIMEWAIT_LEN ); } -inet_twsk_reschedule (tw,TCP_TIMEWAIT_LEN );if (tmp_opt.saw_tstamp) { tcptw->tw_ts_recent = tmp_opt.rcv_tsval;
Greg Kroah-Hartman
maintainerPATCH 9/78 vti6: remove !skb->ignore_df check from vti6_xmit()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Kodanev <[email protected]>
[ Upstream commit 9f2895461439fda2801a7906fb4c5fb3dbb37a0a ]
Before the commit d6990976af7c ("vti6: fix PMTU caching and reporting on xmit") '!skb->ignore_df' check was always true because the function skb_scrub_packet() was called before it, resetting ignore_df to zero.
In the commit, skb_scrub_packet() was moved below, and now this check can be false for the packet, e.g. when sending it in the two fragments, this prevents successful PMTU updates in such case. The next attempts to send the packet lead to the same tx error. Moreover, vti6 initial MTU value relies on PMTU adjustments.
This issue can be reproduced with the following LTP test script:
udp_ipsec_vti.sh -6 -p ah -m tunnel -s 2000
--- net/ipv6/ip6_vti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_vti.c +1 -1
@@ -481,7 +481,7 @@ vti6_xmit(struct sk_buff *skb, struct ne } mtu =dst_mtu (dst); -if (!skb->ignore_df && skb->len > mtu) { +if (skb->len > mtu) {skb_dst (skb)->ops->update_pmtu (dst,NULL , skb, mtu);if (skb->protocol ==htons (ETH_P_IPV6 )) {
Greg Kroah-Hartman
maintainerPATCH 10/78 sctp: hold transport before accessing its asoc in sctp_transport_get_next
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit bab1be79a5169ac748d8292b20c86d874022d7ba ]
As Marcelo noticed, in sctp_transport_get_next, it is iterating over transports but then also accessing the association directly, without checking any refcnts before that, which can cause an use-after-free Read.
So fix it by holding transport before accessing the association. With that, sctp_transport_hold calls can be removed in the later places.
--- net/sctp/proc.c | 4 ---- net/sctp/socket.c | 22 +++++++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-)
net/sctp/proc.c +0 -4
@@ -337,8 +337,6 @@ static int sctp_assocs_seq_show(struct s } transport = (struct sctp_transport *)v; -if (!sctp_transport_hold (transport)) -return 0 ; assoc = transport->asoc; epb = &assoc->base; sk = epb->sk;
@@ -428,8 +426,6 @@ static int sctp_remaddr_seq_show(struct } transport = (struct sctp_transport *)v; -if (!sctp_transport_hold (transport)) -return 0 ; assoc = transport->asoc; list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
net/sctp/socket.c +15 -7
@@ -4476,9 +4476,14 @@ struct sctp_transport *sctp_transport_gebreak ; } +if (!sctp_transport_hold (t)) +continue ; +if (net_eq (sock_net (t->asoc->base.sk), net) && t->asoc->peer.primary_path == t)break ; + +sctp_transport_put (t); }return t;
@@ -4488,13 +4493,18 @@ struct sctp_transport *sctp_transport_ge struct rhashtable_iter *iter, int pos) { - void *obj = SEQ_START_TOKEN; +struct sctp_transport *t; + +if (!pos) +return SEQ_START_TOKEN ; -while (pos && (obj =sctp_transport_get_next (net, iter)) && - !IS_ERR (obj)) - pos--; +while ((t =sctp_transport_get_next (net, iter)) && !IS_ERR (t)) { +if (!--pos) +break ; +sctp_transport_put (t); + } -return obj; +return t; } int sctp_for_each_endpoint(int (*cb)(struct sctp_endpoint *, void *),
@@ -4556,8 +4566,6 @@ int sctp_for_each_transport(int (*cb)(stfor (; !IS_ERR_OR_NULL (obj); obj =sctp_transport_get_next (net, &hti)) {struct sctp_transport *transport = obj; -if (!sctp_transport_hold (transport)) -continue ; err =cb (transport, p);sctp_transport_put (transport);if (err)
Greg Kroah-Hartman
maintainerPATCH 11/78 vhost: correctly check the iova range when waking virtqueue
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit 2d66f997f0545c8f7fc5cf0b49af1decb35170e7 ]
We don't wakeup the virtqueue if the first byte of pending iova range is the last byte of the range we just got updated. This will lead a virtqueue to wait for IOTLB updating forever. Fixing by correct the check and wake up the virtqueue in this case.
--- drivers/vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/vhost.c +1 -1
@@ -905,7 +905,7 @@ static void vhost_iotlb_notify_vq(structlist_for_each_entry_safe (node, n, &d->pending_list, node) {struct vhost_iotlb_msg *vq_msg = &node->msg.iotlb;if (msg->iova <= vq_msg->iova && - msg->iova + msg->size -1 > vq_msg->iova && + msg->iova + msg->size -1 >= vq_msg->iova && vq_msg->type ==VHOST_IOTLB_MISS ) {vhost_poll_queue (&node->vq->poll);list_del (&node->node);
Greg Kroah-Hartman
maintainerPATCH 12/78 hv_netvsc: ignore devices that are not PCI
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Hemminger <[email protected]>
[ Upstream commit b93c1b5ac8643cc08bb74fa8ae21d6c63dfcb23d ]
Registering another device with same MAC address (such as TAP, VPN or DPDK KNI) will confuse the VF autobinding logic. Restrict the search to only run if the device is known to be a PCI attached VF.
--- drivers/net/hyperv/netvsc_drv.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/hyperv/netvsc_drv.c +5 -0
@@ -29,6 +29,7 @@#include <linux/netdevice.h> #include <linux/inetdevice.h> #include <linux/etherdevice.h> +#include <linux/pci.h> #include <linux/skbuff.h> #include <linux/if_vlan.h> #include <linux/in.h>
@@ -1228,11 +1229,15 @@ static int netvsc_register_vf(struct net {struct net_device *ndev;struct net_device_context *net_device_ctx; +struct device *pdev = vf_netdev->dev.parent;struct netvsc_device *netvsc_dev;if (vf_netdev->addr_len !=ETH_ALEN )return NOTIFY_DONE ; +if (!pdev || !dev_is_pci (pdev) ||dev_is_pf (pdev)) +return NOTIFY_DONE ; +/* * We will use the MAC address to locate the synthetic interface to * associate with the VF interface. If we don't find a matching
Greg Kroah-Hartman
maintainerPATCH 13/78 act_ife: move tcfa_lock down to where necessary
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 4e407ff5cd67ec76eeeea1deec227b7982dc7f66 ]
The only time we need to take tcfa_lock is when adding a new metainfo to an existing ife->metalist. We don't need to take tcfa_lock so early and so broadly in tcf_ife_init().
This means we can always take ife_mod_lock first, avoid the reverse locking ordering warning as reported by Vlad.
--- net/sched/act_ife.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-)
net/sched/act_ife.c +13 -24
@@ -267,10 +267,8 @@ static int ife_validate_metatype(struct }/* called when adding new meta information -* under ife->tcf_lock for existing action */ -static int load_metaops_and_vet (struct tcf_ife_info *ife,u32 metaid, -void *val,int len,bool exists) +static int load_metaops_and_vet (u32 metaid,void *val,int len) {struct tcf_meta_ops *ops =find_ife_oplist (metaid);int ret =0 ;
@@ -278,13 +276,9 @@ static int load_metaops_and_vet(struct tif (!ops) { ret = -ENOENT ;#ifdef CONFIG_MODULES -if (exists) -spin_unlock_bh (&ife->tcf_lock);rtnl_unlock ();request_module ("ifemeta%u" , metaid);rtnl_lock (); -if (exists) -spin_lock_bh (&ife->tcf_lock); ops =find_ife_oplist (metaid);#endif }
@@ -301,10 +295,9 @@ static int load_metaops_and_vet(struct t }/* called when adding new meta information -* under ife->tcf_lock for existing action */ static int add_metainfo (struct tcf_ife_info *ife,u32 metaid,void *metaval, -int len,bool atomic) +int len,bool atomic,bool exists) {struct tcf_meta_info *mi =NULL ;struct tcf_meta_ops *ops =find_ife_oplist (metaid);
@@ -331,12 +324,16 @@ static int add_metainfo(struct tcf_ife_i } } +if (exists) +spin_lock_bh (&ife->tcf_lock);list_add_tail (&mi->metalist, &ife->metalist); +if (exists) +spin_unlock_bh (&ife->tcf_lock);return ret; } -static int use_all_metadata (struct tcf_ife_info *ife) +static int use_all_metadata (struct tcf_ife_info *ife,bool exists) {struct tcf_meta_ops *o;int rc =0 ;
@@ -344,7 +341,7 @@ static int use_all_metadata(struct tcf_iread_lock (&ife_mod_lock);list_for_each_entry (o, &ifeoplist, list) { - rc =add_metainfo (ife, o->metaid,NULL ,0 , true); + rc =add_metainfo (ife, o->metaid,NULL ,0 , true, exists);if (rc ==0 ) installed +=1 ; }
@@ -416,7 +413,6 @@ static void tcf_ife_cleanup(struct tc_acspin_unlock_bh (&ife->tcf_lock); } -/* under ife->tcf_lock for existing action */ static int populate_metalist (struct tcf_ife_info *ife,struct nlattr **tb,bool exists) {
@@ -430,11 +426,11 @@ static int populate_metalist(struct tcf_ val =nla_data (tb[i]); len =nla_len (tb[i]); - rc =load_metaops_and_vet (ife, i, val, len, exists); + rc =load_metaops_and_vet (i, val, len);if (rc !=0 )return rc; - rc =add_metainfo (ife, i, val, len, exists); + rc =add_metainfo (ife, i, val, len, false, exists);if (rc)return rc; }
@@ -510,6 +506,8 @@ static int tcf_ife_init(struct net *net,if (exists)spin_lock_bh (&ife->tcf_lock); ife->tcf_action = parm->action; +if (exists) +spin_unlock_bh (&ife->tcf_lock);if (parm->flags &IFE_ENCODE ) {if (daddr)
@@ -537,9 +535,6 @@ metadata_parse_err:tcf_hash_release (*a, bind);if (ret ==ACT_P_CREATED )_tcf_ife_cleanup (*a, bind); - -if (exists) -spin_unlock_bh (&ife->tcf_lock);return err; }
@@ -553,20 +548,14 @@ metadata_parse_err:* as we can. You better have at least one else we are * going to bail out */ - err =use_all_metadata (ife); + err =use_all_metadata (ife, exists);if (err) {if (ret ==ACT_P_CREATED )_tcf_ife_cleanup (*a, bind); - -if (exists) -spin_unlock_bh (&ife->tcf_lock);return err; } } -if (exists) -spin_unlock_bh (&ife->tcf_lock); -if (ret ==ACT_P_CREATED )tcf_hash_insert (tn, *a);
Greg Kroah-Hartman
maintainerPATCH 14/78 act_ife: fix a potential deadlock
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 5ffe57da29b3802baeddaa40909682bbb4cb4d48 ]
use_all_metadata() acquires read_lock(&ife_mod_lock), then calls add_metainfo() which calls find_ife_oplist() which acquires the same lock again. Deadlock!
Introduce __add_metainfo() which accepts struct tcf_meta_ops *ops as an additional parameter and let its callers to decide how to find it. For use_all_metadata(), it already has ops, no need to find it again, just call __add_metainfo() directly.
And, as ife_mod_lock is only needed for find_ife_oplist(), this means we can make non-atomic allocation for populate_metalist() now.
--- net/sched/act_ife.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
net/sched/act_ife.c +21 -13
@@ -296,22 +296,16 @@ static int load_metaops_and_vet(u32 meta/* called when adding new meta information */ -static int add_metainfo (struct tcf_ife_info *ife,u32 metaid,void *metaval, -int len,bool atomic,bool exists) +static int __add_metainfo (const struct tcf_meta_ops *ops, +struct tcf_ife_info *ife,u32 metaid,void *metaval, +int len,bool atomic,bool exists) {struct tcf_meta_info *mi =NULL ; -struct tcf_meta_ops *ops =find_ife_oplist (metaid);int ret =0 ; -if (!ops) -return -ENOENT ; - mi =kzalloc (sizeof (*mi), atomic ?GFP_ATOMIC :GFP_KERNEL ); -if (!mi) { -/*put back what find_ife_oplist took */ -module_put (ops->owner); +if (!mi)return -ENOMEM ; - } mi->metaid = metaid; mi->ops = ops;
@@ -319,7 +313,6 @@ static int add_metainfo(struct tcf_ife_i ret = ops->alloc (mi, metaval, atomic ?GFP_ATOMIC :GFP_KERNEL );if (ret !=0 ) {kfree (mi); -module_put (ops->owner);return ret; } }
@@ -333,6 +326,21 @@ static int add_metainfo(struct tcf_ife_ireturn ret; } +static int add_metainfo (struct tcf_ife_info *ife,u32 metaid,void *metaval, +int len,bool exists) +{ +const struct tcf_meta_ops *ops =find_ife_oplist (metaid); +int ret; + +if (!ops) +return -ENOENT ; + ret =__add_metainfo (ops, ife, metaid, metaval, len, false, exists); +if (ret) +/*put back what find_ife_oplist took */ +module_put (ops->owner); +return ret; +} +static int use_all_metadata (struct tcf_ife_info *ife,bool exists) {struct tcf_meta_ops *o;
@@ -341,7 +349,7 @@ static int use_all_metadata(struct tcf_iread_lock (&ife_mod_lock);list_for_each_entry (o, &ifeoplist, list) { - rc =add_metainfo (ife, o->metaid,NULL ,0 , true, exists); + rc =__add_metainfo (o, ife, o->metaid,NULL ,0 , true, exists);if (rc ==0 ) installed +=1 ; }
@@ -430,7 +438,7 @@ static int populate_metalist(struct tcf_if (rc !=0 )return rc; - rc =add_metainfo (ife, i, val, len, false, exists); + rc =add_metainfo (ife, i, val, len, exists);if (rc)return rc; }
Greg Kroah-Hartman
maintainerPATCH 15/78 net: sched: action_ife: take reference to meta module
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Buslov <[email protected]>
[ Upstream commit 84cb8eb26cb9ce3c79928094962a475a9d850a53 ]
Recent refactoring of add_metainfo() caused use_all_metadata() to add metainfo to ife action metalist without taking reference to module. This causes warning in module_put called from ife action cleanup function.
Implement add_metainfo_and_get_ops() function that returns with reference to module taken if metainfo was added successfully, and call it from use_all_metadata(), instead of calling __add_metainfo() directly.
Example warning:
[ 646.344393] WARNING: CPU: 1 PID: 2278 at kernel/module.c:1139 module_put+0x1cb/0x230 [ 646.352437] Modules linked in: act_meta_skbtcindex act_meta_mark act_meta_skbprio act_ife ife veth nfsv3 nfs fscache xt_CHECKSUM iptable_mangle ipt_MASQUERADE iptable_nat nf_nat_ipv4 nf_nat xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 libcrc32c tun ebtable_filter ebtables ip6table_filter ip6_tables bridge stp llc mlx5_ib ib_uverbs ib_core intel_rapl sb_edac x86_pkg_temp_thermal mlx5_core coretemp kvm_intel kvm nfsd igb irqbypass crct10dif_pclmul devlink crc32_pclmul mei_me joydev ses crc32c_intel enclosure auth_rpcgss i2c_algo_bit ioatdma ptp mei pps_core ghash_clmulni_intel iTCO_wdt iTCO_vendor_support pcspkr dca ipmi_ssif lpc_ich target_core_mod i2c_i801 ipmi_si ipmi_devintf pcc_cpufreq wmi ipmi_msghandler nfs_acl lockd acpi_pad acpi_power_meter grace sunrpc mpt3sas raid_class scsi_transport_sas [ 646.425631] CPU: 1 PID: 2278 Comm: tc Not tainted 4.19.0-rc1+ #799 [ 646.432187] Hardware name: Supermicro SYS-2028TP-DECR/X10DRT-P, BIOS 2.0b 03/30/2017 [ 646.440595] RIP: 0010:module_put+0x1cb/0x230 [ 646.445238] Code: f3 66 94 02 e8 26 ff fa ff 85 c0 74 11 0f b6 1d 51 30 94 02 80 fb 01 77 60 83 e3 01 74 13 65 ff 0d 3a 83 db 73 e9 2b ff ff ff <0f> 0b e9 00 ff ff ff e8 59 01 fb ff 85 c0 75 e4 48 c7 c2 20 62 6b [ 646.464997] RSP: 0018:ffff880354d37068 EFLAGS: 00010286 [ 646.470599] RAX: 0000000000000000 RBX: ffffffffc0a52518 RCX: ffffffff8c2668db [ 646.478118] RDX: 0000000000000003 RSI: dffffc0000000000 RDI: ffffffffc0a52518 [ 646.485641] RBP: ffffffffc0a52180 R08: fffffbfff814a4a4 R09: fffffbfff814a4a3 [ 646.493164] R10: ffffffffc0a5251b R11: fffffbfff814a4a4 R12: 1ffff1006a9a6e0d [ 646.500687] R13: 00000000ffffffff R14: ffff880362bab890 R15: dead000000000100 [ 646.508213] FS: 00007f4164c99800(0000) GS:ffff88036fe40000(0000) knlGS:0000000000000000 [ 646.516961] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 646.523080] CR2: 00007f41638b8420 CR3: 0000000351df0004 CR4: 00000000001606e0 [ 646.530595] Call Trace: [ 646.533408] ? find_symbol_in_section+0x260/0x260 [ 646.538509] tcf_ife_cleanup+0x11b/0x200 [act_ife] [ 646.543695] tcf_action_cleanup+0x29/0xa0 [ 646.548078] __tcf_action_put+0x5a/0xb0 [ 646.552289] ? nla_put+0x65/0xe0 [ 646.555889] __tcf_idr_release+0x48/0x60 [ 646.560187] tcf_generic_walker+0x448/0x6b0 [ 646.564764] ? tcf_action_dump_1+0x450/0x450 [ 646.569411] ? __lock_is_held+0x84/0x110 [ 646.573720] ? tcf_ife_walker+0x10c/0x20f [act_ife] [ 646.578982] tca_action_gd+0x972/0xc40 [ 646.583129] ? tca_get_fill.constprop.17+0x250/0x250 [ 646.588471] ? mark_lock+0xcf/0x980 [ 646.592324] ? check_chain_key+0x140/0x1f0 [ 646.596832] ? debug_show_all_locks+0x240/0x240 [ 646.601839] ? memset+0x1f/0x40 [ 646.605350] ? nla_parse+0xca/0x1a0 [ 646.609217] tc_ctl_action+0x215/0x230 [ 646.613339] ? tcf_action_add+0x220/0x220 [ 646.617748] rtnetlink_rcv_msg+0x56a/0x6d0 [ 646.622227] ? rtnl_fdb_del+0x3f0/0x3f0 [ 646.626466] netlink_rcv_skb+0x18d/0x200 [ 646.630752] ? rtnl_fdb_del+0x3f0/0x3f0 [ 646.634959] ? netlink_ack+0x500/0x500 [ 646.639106] netlink_unicast+0x2d0/0x370 [ 646.643409] ? netlink_attachskb+0x340/0x340 [ 646.648050] ? _copy_from_iter_full+0xe9/0x3e0 [ 646.652870] ? import_iovec+0x11e/0x1c0 [ 646.657083] netlink_sendmsg+0x3b9/0x6a0 [ 646.661388] ? netlink_unicast+0x370/0x370 [ 646.665877] ? netlink_unicast+0x370/0x370 [ 646.670351] sock_sendmsg+0x6b/0x80 [ 646.674212] ___sys_sendmsg+0x4a1/0x520 [ 646.678443] ? copy_msghdr_from_user+0x210/0x210 [ 646.683463] ? lock_downgrade+0x320/0x320 [ 646.687849] ? debug_show_all_locks+0x240/0x240 [ 646.692760] ? do_raw_spin_unlock+0xa2/0x130 [ 646.697418] ? _raw_spin_unlock+0x24/0x30 [ 646.701798] ? __handle_mm_fault+0x1819/0x1c10 [ 646.706619] ? __pmd_alloc+0x320/0x320 [ 646.710738] ? debug_show_all_locks+0x240/0x240 [ 646.715649] ? restore_nameidata+0x7b/0xa0 [ 646.720117] ? check_chain_key+0x140/0x1f0 [ 646.724590] ? check_chain_key+0x140/0x1f0 [ 646.729070] ? __fget_light+0xbc/0xd0 [ 646.733121] ? __sys_sendmsg+0xd7/0x150 [ 646.737329] __sys_sendmsg+0xd7/0x150 [ 646.741359] ? __ia32_sys_shutdown+0x30/0x30 [ 646.746003] ? up_read+0x53/0x90 [ 646.749601] ? __do_page_fault+0x484/0x780 [ 646.754105] ? do_syscall_64+0x1e/0x2c0 [ 646.758320] do_syscall_64+0x72/0x2c0 [ 646.762353] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 646.767776] RIP: 0033:0x7f4163872150 [ 646.771713] Code: 8b 15 3c 7d 2b 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb cd 66 0f 1f 44 00 00 83 3d b9 d5 2b 00 00 75 10 b8 2e 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 be cd 00 00 48 89 04 24 [ 646.791474] RSP: 002b:00007ffdef7d6b58 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 646.799721] RAX: ffffffffffffffda RBX: 0000000000000024 RCX: 00007f4163872150 [ 646.807240] RDX: 0000000000000000 RSI: 00007ffdef7d6bd0 RDI: 0000000000000003 [ 646.814760] RBP: 000000005b8b9482 R08: 0000000000000001 R09: 0000000000000000 [ 646.822286] R10: 00000000000005e7 R11: 0000000000000246 R12: 00007ffdef7dad20 [ 646.829807] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000679bc0 [ 646.837360] irq event stamp: 6083 [ 646.841043] hardirqs last enabled at (6081): [<ffffffff8c220a7d>] __call_rcu+0x17d/0x500 [ 646.849882] hardirqs last disabled at (6083): [<ffffffff8c004f06>] trace_hardirqs_off_thunk+0x1a/0x1c [ 646.859775] softirqs last enabled at (5968): [<ffffffff8d4004a1>] __do_softirq+0x4a1/0x6ee [ 646.868784] softirqs last disabled at (6082): [<ffffffffc0a78759>] tcf_ife_cleanup+0x39/0x200 [act_ife] [ 646.878845] ---[ end trace b1b8c12ffe51e657 ]---
--- net/sched/act_ife.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
net/sched/act_ife.c +15 -1
@@ -326,6 +326,20 @@ static int __add_metainfo(const struct treturn ret; } +static int add_metainfo_and_get_ops (const struct tcf_meta_ops *ops, +struct tcf_ife_info *ife,u32 metaid, +bool exists) +{ +int ret; + +if (!try_module_get (ops->owner)) +return -ENOENT ; + ret =__add_metainfo (ops, ife, metaid,NULL ,0 , true, exists); +if (ret) +module_put (ops->owner); +return ret; +} +static int add_metainfo (struct tcf_ife_info *ife,u32 metaid,void *metaval,int len,bool exists) {
@@ -349,7 +363,7 @@ static int use_all_metadata(struct tcf_iread_lock (&ife_mod_lock);list_for_each_entry (o, &ifeoplist, list) { - rc =__add_metainfo (o, ife, o->metaid,NULL ,0 , true, exists); + rc =add_metainfo_and_get_ops (o, ife, o->metaid, exists);if (rc ==0 ) installed +=1 ; }
Greg Kroah-Hartman
maintainerPATCH 16/78 cifs: check if SMB2 PDU size has been padded and suppress the warning
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronnie Sahlberg <[email protected]>
[ Upstream commit e6c47dd0da1e3a484e778046fc10da0b20606a86 ]
Some SMB2/3 servers, Win2016 but possibly others too, adds padding not only between PDUs in a compound but also to the final PDU. This padding extends the PDU to a multiple of 8 bytes.
Check if the unexpected length looks like this might be the case and avoid triggering the log messages for :
"SMB2 server sent bad RFC1001 len %d not %d\n"
--- fs/cifs/smb2misc.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/cifs/smb2misc.c +7 -0
@@ -209,6 +209,13 @@ smb2_check_message(char *buf, unsigned ireturn 0 ;/* +* Some windows servers (win2016) will pad also the final +* PDU in a compound to 8 bytes. +*/ +if (((clc_len +7 ) & ~7 ) == len) +return 0 ; + +/* * MacOS server pads after SMB2.1 write response with 3 bytes * of junk. Other servers match RFC1001 len to actual * SMB2/SMB3 frame length (header + smb2 response specific data)
Greg Kroah-Hartman
maintainerPATCH 17/78 hfsplus: dont return 0 when fill_super() failed
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tetsuo Handa <[email protected]>
[ Upstream commit 7464726cb5998846306ed0a7d6714afb2e37b25d ]
syzbot is reporting NULL pointer dereference at mount_fs() [1]. This is because hfsplus_fill_super() is by error returning 0 when hfsplus_fill_super() detected invalid filesystem image, and mount_bdev() is returning NULL because dget(s->s_root) == NULL if s->s_root == NULL, and mount_fs() is accessing root->d_sb because IS_ERR(root) == false if root == NULL. Fix this by returning -EINVAL when hfsplus_fill_super() detected invalid filesystem image.
[1] https://syzkaller.appspot.com/bug?id=21acb6850cecbc960c927229e597158cf35f33d0
--- fs/hfsplus/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/hfsplus/super.c +3 -1
@@ -524,8 +524,10 @@ static int hfsplus_fill_super(struct sup goto out_put_root;if (!hfs_brec_read (&fd, &entry,sizeof (entry))) {hfs_find_exit (&fd); -if (entry.type !=cpu_to_be16 (HFSPLUS_FOLDER )) +if (entry.type !=cpu_to_be16 (HFSPLUS_FOLDER )) { + err = -EINVAL ; goto out_put_root; + } inode =hfsplus_iget (sb,be32_to_cpu (entry.folder.id));if (IS_ERR (inode)) { err =PTR_ERR (inode);
Greg Kroah-Hartman
maintainerPATCH 18/78 hfs: prevent crash on exit from failed search
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Ernesto A. Fern�ndez" <[email protected]>
[ Upstream commit dc2572791d3a41bab94400af2b6bca9d71ccd303 ]
hfs_find_exit() expects fd->bnode to be NULL after a search has failed. hfs_brec_insert() may instead set it to an error-valued pointer. Fix this to prevent a crash.
--- fs/hfs/brec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/hfs/brec.c +4 -3
@@ -74,9 +74,10 @@ int hfs_brec_insert(struct hfs_find_dataif (!fd->bnode) {if (!tree->root)hfs_btree_inc_height (tree); - fd->bnode =hfs_bnode_find (tree, tree->leaf_head); -if (IS_ERR (fd->bnode)) -return PTR_ERR (fd->bnode); + node =hfs_bnode_find (tree, tree->leaf_head); +if (IS_ERR (node)) +return PTR_ERR (node); + fd->bnode = node; fd->record =-1 ; } new_node =NULL ;
Greg Kroah-Hartman
maintainerPATCH 19/78 sunrpc: Dont use stack buffer with scatterlist
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laura Abbott <[email protected]>
[ Upstream commit 44090cc876926277329e1608bafc01b9f6da627f ]
Fedora got a bug report from NFS:
kernel BUG at include/linux/scatterlist.h:143!
...
RIP: 0010:sg_init_one+0x7d/0x90 .. make_checksum+0x4e7/0x760 [rpcsec_gss_krb5] gss_get_mic_kerberos+0x26e/0x310 [rpcsec_gss_krb5] gss_marshal+0x126/0x1a0 [auth_rpcgss] ? __local_bh_enable_ip+0x80/0xe0 ? call_transmit_status+0x1d0/0x1d0 [sunrpc] call_transmit+0x137/0x230 [sunrpc] __rpc_execute+0x9b/0x490 [sunrpc] rpc_run_task+0x119/0x150 [sunrpc] nfs4_run_exchange_id+0x1bd/0x250 [nfsv4] _nfs4_proc_exchange_id+0x2d/0x490 [nfsv4] nfs41_discover_server_trunking+0x1c/0xa0 [nfsv4] nfs4_discover_server_trunking+0x80/0x270 [nfsv4] nfs4_init_client+0x16e/0x240 [nfsv4] ? nfs_get_client+0x4c9/0x5d0 [nfs] ? _raw_spin_unlock+0x24/0x30 ? nfs_get_client+0x4c9/0x5d0 [nfs] nfs4_set_client+0xb2/0x100 [nfsv4] nfs4_create_server+0xff/0x290 [nfsv4] nfs4_remote_mount+0x28/0x50 [nfsv4] mount_fs+0x3b/0x16a vfs_kern_mount.part.35+0x54/0x160 nfs_do_root_mount+0x7f/0xc0 [nfsv4] nfs4_try_mount+0x43/0x70 [nfsv4] ? get_nfs_version+0x21/0x80 [nfs] nfs_fs_mount+0x789/0xbf0 [nfs] ? pcpu_alloc+0x6ca/0x7e0 ? nfs_clone_super+0x70/0x70 [nfs] ? nfs_parse_mount_options+0xb40/0xb40 [nfs] mount_fs+0x3b/0x16a vfs_kern_mount.part.35+0x54/0x160 do_mount+0x1fd/0xd50 ksys_mount+0xba/0xd0 __x64_sys_mount+0x21/0x30 do_syscall_64+0x60/0x1f0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
This is BUG_ON(!virt_addr_valid(buf)) triggered by using a stack allocated buffer with a scatterlist. Convert the buffer for rc4salt to be dynamically allocated instead.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1615258
--- net/sunrpc/auth_gss/gss_krb5_crypto.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/sunrpc/auth_gss/gss_krb5_crypto.c +9 -3
@@ -169,7 +169,7 @@ make_checksum_hmac_md5(struct krb5_ctx *struct scatterlist sg[1 ];int err =-1 ;u8 *checksumdata; -u8 rc4salt[4 ]; +u8 *rc4salt;struct crypto_ahash *md5;struct crypto_ahash *hmac_md5;struct ahash_request *req;
@@ -183,14 +183,18 @@ make_checksum_hmac_md5(struct krb5_ctx *return GSS_S_FAILURE ; } + rc4salt =kmalloc_array (4 ,sizeof (*rc4salt),GFP_NOFS ); +if (!rc4salt) +return GSS_S_FAILURE ; +if (arcfour_hmac_md5_usage_to_salt (usage, rc4salt)) {dprintk ("%s: invalid usage value %u\n" , __func__, usage); -return GSS_S_FAILURE ; + goto out_free_rc4salt; } checksumdata =kmalloc (GSS_KRB5_MAX_CKSUM_LEN ,GFP_NOFS );if (!checksumdata) -return GSS_S_FAILURE ; + goto out_free_rc4salt; md5 =crypto_alloc_ahash ("md5" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (md5))
@@ -258,6 +262,8 @@ out_free_md5:crypto_free_ahash (md5); out_free_cksum:kfree (checksumdata); +out_free_rc4salt: +kfree (rc4salt);return err ?GSS_S_FAILURE :0 ; }
Greg Kroah-Hartman
maintainerPATCH 20/78 fork: dont copy inconsistent signal handler state to child
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
[ Upstream commit 06e62a46bbba20aa5286102016a04214bb446141 ]
Before this change, if a multithreaded process forks while one of its threads is changing a signal handler using sigaction(), the memcpy() in copy_sighand() can race with the struct assignment in do_sigaction(). It isn't clear whether this can cause corruption of the userspace signal handler pointer, but it definitely can cause inconsistency between different fields of struct sigaction.
Take the appropriate spinlock to avoid this.
I have tested that this patch prevents inconsistency between sa_sigaction and sa_flags, which is possible before this patch.
--- kernel/fork.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/fork.c +2 -0
@@ -1304,7 +1304,9 @@ static int copy_sighand(unsigned long clreturn -ENOMEM ;atomic_set (&sig->count,1 ); +spin_lock_irq (¤t->sighand->siglock);memcpy (sig->action, current->sighand->action,sizeof (sig->action)); +spin_unlock_irq (¤t->sighand->siglock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 21/78 reiserfs: change j_timestamp type to time64_t
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 8b73ce6a4bae4fe12bcb2c361c0da4183c2e1b6f ]
This uses the deprecated time_t type but is write-only, and could be removed, but as Jeff explains, having a timestamp can be usefule for post-mortem analysis in crash dumps.
In order to remove one of the last instances of time_t, this changes the type to time64_t, same as j_trans_start_time.
--- fs/reiserfs/reiserfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/reiserfs/reiserfs.h +1 -1
@@ -270,7 +270,7 @@ struct reiserfs_journal_list {struct mutex j_commit_mutex;unsigned int j_trans_id; -time_t j_timestamp; +time64_t j_timestamp;/* write-only but useful for crash dump analysis */ struct reiserfs_list_bitmap *j_list_bitmap;struct buffer_head *j_commit_bh;/* commit buffer head */ struct reiserfs_journal_cnode *j_realblock;
Greg Kroah-Hartman
maintainerPATCH 22/78 hfsplus: fix NULL dereference in hfsplus_lookup()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Ernesto A. Fern�ndez" <[email protected]>
[ Upstream commit a7ec7a4193a2eb3b5341243fc0b621c1ac9e4ec4 ]
An HFS+ filesystem can be mounted read-only without having a metadata directory, which is needed to support hardlinks. But if the catalog data is corrupted, a directory lookup may still find dentries claiming to be hardlinks.
hfsplus_lookup() does check that ->hidden_dir is not NULL in such a situation, but mistakenly does so after dereferencing it for the first time. Reorder this check to prevent a crash.
This happens when looking up corrupted catalog data (dentry) on a filesystem with no metadata directory (this could only ever happen on a read-only mount). Wen Xu sent the replication steps in detail to the fsdevel list: https://bugzilla.kernel.org/show_bug.cgi?id=200297
--- fs/hfsplus/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/hfsplus/dir.c +2 -2
@@ -77,13 +77,13 @@ again:cpu_to_be32 (HFSP_HARDLINK_TYPE ) && entry.file.user_info.fdCreator ==cpu_to_be32 (HFSP_HFSPLUS_CREATOR ) && +HFSPLUS_SB (sb)->hidden_dir && (entry.file.create_date ==HFSPLUS_I (HFSPLUS_SB (sb)->hidden_dir)-> create_date || entry.file.create_date ==HFSPLUS_I (d_inode (sb->s_root))-> - create_date) && - HFSPLUS_SB(sb)->hidden_dir) { + create_date)) { struct qstr str;char name[32 ];
Greg Kroah-Hartman
maintainerPATCH 23/78 fat: validate ->i_start before using
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: OGAWA Hirofumi <[email protected]>
[ Upstream commit 0afa9626667c3659ef8bd82d42a11e39fedf235c ]
On corrupted FATfs may have invalid ->i_start. To handle it, this checks ->i_start before using, and return proper error code.
--- fs/fat/cache.c | 19 ++++++++++++------- fs/fat/fat.h | 5 +++++ fs/fat/fatent.c | 6 +++--- 3 files changed, 20 insertions(+), 10 deletions(-)
fs/fat/cache.c +12 -7
@@ -224,7 +224,8 @@ static inline void cache_init(struct fatint fat_get_cluster (struct inode *inode,int cluster,int *fclus,int *dclus) {struct super_block *sb = inode->i_sb; -const int limit = sb->s_maxbytes >>MSDOS_SB (sb)->cluster_bits; +struct msdos_sb_info *sbi =MSDOS_SB (sb); +const int limit = sb->s_maxbytes >> sbi->cluster_bits;struct fat_entry fatent;struct fat_cache_id cid;int nr;
@@ -233,6 +234,12 @@ int fat_get_cluster(struct inode *inode, *fclus =0 ; *dclus =MSDOS_I (inode)->i_start; +if (!fat_valid_entry (sbi, *dclus)) { +fat_fs_error_ratelimit (sb, +"%s: invalid start cluster (i_pos %lld, start %08x)" , + __func__,MSDOS_I (inode)->i_pos, *dclus); +return -EIO ; + }if (cluster ==0 )return 0 ;
@@ -249,9 +256,8 @@ int fat_get_cluster(struct inode *inode,/* prevent the infinite loop of cluster chain */ if (*fclus > limit) {fat_fs_error_ratelimit (sb, -"%s: detected the cluster chain loop" -" (i_pos %lld)" , __func__, -MSDOS_I (inode)->i_pos); +"%s: detected the cluster chain loop (i_pos %lld)" , + __func__,MSDOS_I (inode)->i_pos); nr = -EIO ; goto out; }
@@ -261,9 +267,8 @@ int fat_get_cluster(struct inode *inode, goto out; else if (nr == FAT_ENT_FREE) {fat_fs_error_ratelimit (sb, -"%s: invalid cluster chain (i_pos %lld)" , - __func__, -MSDOS_I (inode)->i_pos); +"%s: invalid cluster chain (i_pos %lld)" , + __func__,MSDOS_I (inode)->i_pos); nr = -EIO ; goto out; } else if (nr == FAT_ENT_EOF) {
fs/fat/fat.h +5 -0
@@ -347,6 +347,11 @@ static inline void fatent_brelse(struct fatent->fat_inode =NULL ; } +static inline bool fat_valid_entry (struct msdos_sb_info *sbi,int entry) +{ +return FAT_START_ENT <= entry && entry < sbi->max_cluster; +} +extern void fat_ent_access_init (struct super_block *sb);extern int fat_ent_read (struct inode *inode,struct fat_entry *fatent,int entry);
fs/fat/fatent.c +3 -3
@@ -23,7 +23,7 @@ static void fat12_ent_blocknr(struct sup {struct msdos_sb_info *sbi =MSDOS_SB (sb);int bytes = entry + (entry >>1 ); -WARN_ON (entry <FAT_START_ENT || sbi->max_cluster <= entry); +WARN_ON (!fat_valid_entry (sbi, entry)); *offset = bytes & (sb->s_blocksize -1 ); *blocknr = sbi->fat_start + (bytes >> sb->s_blocksize_bits); }
@@ -33,7 +33,7 @@ static void fat_ent_blocknr(struct super {struct msdos_sb_info *sbi =MSDOS_SB (sb);int bytes = (entry << sbi->fatent_shift); -WARN_ON (entry <FAT_START_ENT || sbi->max_cluster <= entry); +WARN_ON (!fat_valid_entry (sbi, entry)); *offset = bytes & (sb->s_blocksize -1 ); *blocknr = sbi->fat_start + (bytes >> sb->s_blocksize_bits); }
@@ -353,7 +353,7 @@ int fat_ent_read(struct inode *inode, stint err, offset;sector_t blocknr; -if (entry <FAT_START_ENT || sbi->max_cluster <= entry) { +if (!fat_valid_entry (sbi, entry)) {fatent_brelse (fatent);fat_fs_error (sb,"invalid access to FAT (entry 0x%08x)" , entry);return -EIO ;
Greg Kroah-Hartman
maintainerPATCH 24/78 scripts: modpost: check memory allocation results
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 1f3aa9002dc6a0d59a4b599b4fc8f01cf43ef014 ]
Fix missing error check for memory allocation functions in scripts/mod/modpost.c.
Fixes kernel bugzilla #200319:
https://bugzilla.kernel.org/show_bug.cgi?id=200319
--- scripts/mod/modpost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/mod/modpost.c +4 -4
@@ -649,7 +649,7 @@ static void handle_modversions(struct moif (ELF_ST_TYPE (sym->st_info) ==STT_SPARC_REGISTER )break ;if (symname[0 ] =='.' ) { -char *munged =strdup (symname); +char *munged =NOFAIL (strdup (symname)); munged[0 ] ='_' ; munged[1 ] =toupper (munged[1 ]); symname = munged;
@@ -1312,7 +1312,7 @@ static Elf_Sym *find_elf_symbol2(structstatic char *sec2annotation (const char *s) {if (match (s, init_exit_sections)) { -char *p =malloc (20 ); +char *p =NOFAIL (malloc (20 ));char *r = p; *p++ ='_' ;
@@ -1332,7 +1332,7 @@ static char *sec2annotation(const char *strcat (p," " );return r; }else { -return strdup ("" ); +return NOFAIL (strdup ("" )); } }
@@ -2033,7 +2033,7 @@ void buf_write(struct buffer *buf, const {if (buf->size - buf->pos < len) { buf->size += len +SZ ; - buf->p =realloc (buf->p, buf->size); + buf->p =NOFAIL (realloc (buf->p, buf->size)); }strncpy (buf->p + buf->pos, s, len); buf->pos += len;
Greg Kroah-Hartman
maintainerPATCH 25/78 virtio: pci-legacy: Validate queue pfn
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit 69599206ea9a3f8f2e94d46580579cbf9d08ad6c ]
Legacy PCI over virtio uses a 32bit PFN for the queue. If the queue pfn is too large to fit in 32bits, which we could hit on arm64 systems with 52bit physical addresses (even with 64K page size), we simply miss out a proper link to the other side of the queue.
Add a check to validate the PFN, rather than silently breaking the devices.
--- drivers/virtio/virtio_pci_legacy.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_legacy.c +12 -2
@@ -121,6 +121,7 @@ static struct virtqueue *setup_vq(structstruct virtqueue *vq;u16 num;int err; +u64 q_pfn;/* Select the queue we're interested in */ iowrite16 (index, vp_dev->ioaddr +VIRTIO_PCI_QUEUE_SEL );
@@ -139,9 +140,17 @@ static struct virtqueue *setup_vq(structif (!vq)return ERR_PTR (-ENOMEM ); + q_pfn =virtqueue_get_desc_addr (vq) >>VIRTIO_PCI_QUEUE_ADDR_SHIFT ; +if (q_pfn >>32 ) { +dev_err (&vp_dev->pci_dev->dev, +"platform bug: legacy virtio-mmio must not be used with RAM above 0x%llxGB\n" , +0x1ULL << (32 +PAGE_SHIFT -30 )); + err = -E2BIG ; + goto out_del_vq; + } +/* activate the queue */ -iowrite32 (virtqueue_get_desc_addr (vq) >>VIRTIO_PCI_QUEUE_ADDR_SHIFT , - vp_dev->ioaddr +VIRTIO_PCI_QUEUE_PFN ); +iowrite32 (q_pfn, vp_dev->ioaddr +VIRTIO_PCI_QUEUE_PFN ); vq->priv = (void __force *)vp_dev->ioaddr +VIRTIO_PCI_QUEUE_NOTIFY ;
@@ -158,6 +167,7 @@ static struct virtqueue *setup_vq(struct out_deactivate:iowrite32 (0 , vp_dev->ioaddr +VIRTIO_PCI_QUEUE_PFN ); +out_del_vq:vring_del_virtqueue (vq);return ERR_PTR (err); }
Greg Kroah-Hartman
maintainerPATCH 26/78 mm/fadvise.c: fix signed overflow UBSAN complaint
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
[ Upstream commit a718e28f538441a3b6612da9ff226973376cdf0f ]
Signed integer overflow is undefined according to the C standard. The overflow in ksys_fadvise64_64() is deliberate, but since it is signed overflow, UBSAN complains:
UBSAN: Undefined behaviour in mm/fadvise.c:76:10 signed integer overflow: 4 + 9223372036854775805 cannot be represented in type 'long long int'
Use unsigned types to do math. Unsigned overflow is defined so UBSAN will not complain about it. This patch doesn't change generated code.
--- mm/fadvise.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
mm/fadvise.c +6 -2
@@ -68,8 +68,12 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, l goto out; } -/* Careful about overflows. Len == 0 means "as much as possible" */ - endbyte = offset + len; +/* +* Careful about overflows. Len == 0 means "as much as possible". Use +* unsigned math because signed overflows are undefined and UBSan +* complains. +*/ + endbyte = (u64 )offset + (u64 )len;if (!len || endbyte < len) endbyte =-1 ;else
Greg Kroah-Hartman
maintainerPATCH 27/78 fs/dcache.c: fix kmemcheck splat at take_dentry_name_snapshot()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tetsuo Handa <[email protected]>
[ Upstream commit 6cd00a01f0c1ae6a852b09c59b8dd55cc6c35d1d ]
Since only dentry->d_name.len + 1 bytes out of DNAME_INLINE_LEN bytes are initialized at __d_alloc(), we can't copy the whole size unconditionally.
WARNING: kmemcheck: Caught 32-bit read from uninitialized memory (ffff8fa27465ac50) 636f6e66696766732e746d70000000000010000000000000020000000188ffff
i i i i i i i i i i i i i u u u u u u u u u u i i i i i u u u u
^ RIP: 0010:take_dentry_name_snapshot+0x28/0x50 RSP: 0018:ffffa83000f5bdf8 EFLAGS: 00010246 RAX: 0000000000000020 RBX: ffff8fa274b20550 RCX: 0000000000000002 RDX: ffffa83000f5be40 RSI: ffff8fa27465ac50 RDI: ffffa83000f5be60 RBP: ffffa83000f5bdf8 R08: ffffa83000f5be48 R09: 0000000000000001 R10: ffff8fa27465ac00 R11: ffff8fa27465acc0 R12: ffff8fa27465ac00 R13: ffff8fa27465acc0 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f79737ac8c0(0000) GS:ffffffff8fc30000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff8fa274c0b000 CR3: 0000000134aa7002 CR4: 00000000000606f0 take_dentry_name_snapshot+0x28/0x50 vfs_rename+0x128/0x870 SyS_rename+0x3b2/0x3d0 entry_SYSCALL_64_fastpath+0x1a/0xa4 0xffffffffffffffff
--- fs/dcache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/dcache.c +2 -1
@@ -286,7 +286,8 @@ void take_dentry_name_snapshot(struct naspin_unlock (&dentry->d_lock); name->name = p->name; }else { -memcpy (name->inline_name, dentry->d_iname,DNAME_INLINE_LEN ); +memcpy (name->inline_name, dentry->d_iname, + dentry->d_name.len +1 );spin_unlock (&dentry->d_lock); name->name = name->inline_name; }
Greg Kroah-Hartman
maintainerPATCH 28/78 platform/x86: intel_punit_ipc: fix build errors
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 340fd4cff43f18bace9358d4decdc9b6ed0715be ]
Fix build errors by #including <linux/io.h>.
../drivers/platform/x86/intel_punit_ipc.c: In function 'ipc_read_status':../drivers/platform/x86/intel_punit_ipc.c:55:2: error: implicit declaration of function 'readl' [-Werror=implicit-function-declaration]
return readl(ipcdev->base[type][BASE_IFACE]);../drivers/platform/x86/intel_punit_ipc.c: In function 'ipc_write_cmd':../drivers/platform/x86/intel_punit_ipc.c:60:2: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
writel(cmd, ipcdev->base[type][BASE_IFACE]);
--- drivers/platform/x86/intel_punit_ipc.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/intel_punit_ipc.c +1 -0
@@ -17,6 +17,7 @@#include <linux/bitops.h> #include <linux/device.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/platform_device.h> #include <asm/intel_punit_ipc.h>
Greg Kroah-Hartman
maintainerPATCH 29/78 s390/kdump: Fix memleak in nt_vmcoreinfo
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Rudo <[email protected]>
[ Upstream commit 2d2e7075b87181ed0c675e4936e20bdadba02e1f ]
The vmcoreinfo of a crashed system is potentially fragmented. Thus the crash kernel has an intermediate step where the vmcoreinfo is copied into a temporary, continuous buffer in the crash kernel memory. This temporary buffer is never freed. Free it now to prevent the memleak.
While at it replace all occurrences of "VMCOREINFO" by its corresponding macro to prevent potential renaming issues.
--- arch/s390/kernel/crash_dump.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
arch/s390/kernel/crash_dump.c +12 -5
@@ -401,11 +401,13 @@ static void *get_vmcoreinfo_old(unsignedif (copy_oldmem_kernel (nt_name, addr +sizeof (note),sizeof (nt_name) -1 ))return NULL ; -if (strcmp (nt_name,"VMCOREINFO" ) !=0 ) +if (strcmp (nt_name,VMCOREINFO_NOTE_NAME ) !=0 )return NULL ; vmcoreinfo =kzalloc_panic (note.n_descsz); -if (copy_oldmem_kernel (vmcoreinfo, addr +24 , note.n_descsz)) +if (copy_oldmem_kernel (vmcoreinfo, addr +24 , note.n_descsz)) { +kfree (vmcoreinfo);return NULL ; + } *size = note.n_descsz;return vmcoreinfo; }
@@ -415,15 +417,20 @@ static void *get_vmcoreinfo_old(unsigned*/ static void *nt_vmcoreinfo (void *ptr) { +const char *name =VMCOREINFO_NOTE_NAME ;unsigned long size;void *vmcoreinfo; vmcoreinfo =os_info_old_entry (OS_INFO_VMCOREINFO , &size); -if (!vmcoreinfo) - vmcoreinfo =get_vmcoreinfo_old (&size); +if (vmcoreinfo) +return nt_init_name (ptr,0 , vmcoreinfo, size, name); + + vmcoreinfo =get_vmcoreinfo_old (&size);if (!vmcoreinfo)return ptr; -return nt_init_name (ptr,0 , vmcoreinfo, size,"VMCOREINFO" ); + ptr =nt_init_name (ptr,0 , vmcoreinfo, size, name); +kfree (vmcoreinfo); +return ptr; }/*
Greg Kroah-Hartman
maintainerPATCH 30/78 ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tan Hu <[email protected]>
[ Upstream commit a53b42c11815d2357e31a9403ae3950517525894 ]
We came across infinite loop in ipvs when using ipvs in docker env.
When ipvs receives new packets and cannot find an ipvs connection, it will create a new connection, then if the dest is unavailable (i.e. IP_VS_DEST_F_AVAILABLE), the packet will be dropped sliently.
But if the dropped packet is the first packet of this connection, the connection control timer never has a chance to start and the ipvs connection cannot be released. This will lead to memory leak, or infinite loop in cleanup_net() when net namespace is released like this:
ip_vs_conn_net_cleanup at ffffffffa0a9f31a [ip_vs] __ip_vs_cleanup at ffffffffa0a9f60a [ip_vs] ops_exit_list at ffffffff81567a49 cleanup_net at ffffffff81568b40 process_one_work at ffffffff810a851b worker_thread at ffffffff810a9356
kthread at ffffffff810b0b6f
ret_from_fork at ffffffff81697a18
race condition:
CPU1 CPU2
ip_vs_in()
ip_vs_conn_new()
ip_vs_del_dest()
__ip_vs_unlink_dest()
~IP_VS_DEST_F_AVAILABLE
cp->dest && !IP_VS_DEST_F_AVAILABLE
__ip_vs_conn_put
...
cleanup_net ---> infinite loopingFix this by checking whether the timer already started.
--- net/netfilter/ipvs/ip_vs_core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +11 -4
@@ -1968,13 +1968,20 @@ ip_vs_in(struct netns_ipvs *ipvs, unsignif (cp->dest && !(cp->dest->flags &IP_VS_DEST_F_AVAILABLE )) {/* the destination server is not available */ -if (sysctl_expire_nodest_conn (ipvs)) { +__u32 flags = cp->flags; + +/* when timer already started, silently drop the packet.*/ +if (timer_pending (&cp->timer)) +__ip_vs_conn_put (cp); +else +ip_vs_conn_put (cp); + +if (sysctl_expire_nodest_conn (ipvs) && + !(flags &IP_VS_CONN_F_ONE_PACKET )) {/* try to expire the connection immediately */ ip_vs_conn_expire_now (cp); } -/* don't restart its timer, and silently -drop the packet. */ -__ip_vs_conn_put (cp); +return NF_DROP ; }
Greg Kroah-Hartman
maintainerPATCH 31/78 mfd: sm501: Set coherent_dma_mask when creating subdevices
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 2f606da78230f09cf1a71fde6ee91d0c710fa2b2 ]
Instantiating the sm501 OHCI subdevice results in a kernel warning.
sm501-usb sm501-usb: SM501 OHCI
sm501-usb sm501-usb: new USB bus registered, assigned bus number 1
WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 ohci_init+0x194/0x2d8 Modules linked in: CPU: 0 PID: 1 Comm: swapper Tainted: G W
4.18.0-rc7-00178-g0b5b1f9a78b5 #1
PC is at ohci_init+0x194/0x2d8
PR is at ohci_init+0x168/0x2d8
PC : 8c27844c SP : 8f81dd94 SR : 40008001
TEA : 29613060
R0 : 00000000 R1 : 00000000 R2 : 00000000 R3 : 00000202 R4 : 8fa98b88 R5 : 8c277e68 R6 : 00000000 R7 : 00000000 R8 : 8f965814 R9 : 8c388100 R10 : 8fa98800 R11 : 8fa98928 R12 : 8c48302c R13 : 8fa98920 R14 : 8c48302c
MACH: 00000096 MACL: 0000017c GBR : 00000000 PR : 8c278420
Call trace: [<(ptrval)>] usb_add_hcd+0x1e8/0x6ec [<(ptrval)>] _dev_info+0x0/0x54 [<(ptrval)>] arch_local_save_flags+0x0/0x8 [<(ptrval)>] arch_local_irq_restore+0x0/0x24 [<(ptrval)>] ohci_hcd_sm501_drv_probe+0x114/0x2d8
...
Initialize coherent_dma_mask when creating SM501 subdevices to fix the problem.
--- drivers/mfd/sm501.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/sm501.c +1 -0
@@ -714,6 +714,7 @@ sm501_create_subdev(struct sm501_devdata smdev->pdev.name = name; smdev->pdev.id = sm->pdev_id; smdev->pdev.dev.parent = sm->dev; + smdev->pdev.dev.coherent_dma_mask =0xffffffff ;if (res_count) { smdev->pdev.resource = (struct resource *)(smdev+1 );
Greg Kroah-Hartman
maintainerPATCH 32/78 platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleh Filipovich <[email protected]>
[ Upstream commit 880b29ac107d15644bf4da228376ba3cd6af6d71 ]
Add entry to WMI keymap for lid flip event on Asus UX360.
On Asus Zenbook ux360 flipping lid from/to tablet mode triggers keyscan code 0xfa which cannot be handled and results in kernel log message "Unknown key fa pressed".
--- drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/asus-nb-wmi.c +1 -0
@@ -531,6 +531,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0xC4, { KEY_KBDILLUMUP } }, { KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } }, { KE_IGNORE, 0xC6, }, /* Ambient Light Sensor notification */ + { KE_KEY, 0xFA, { KEY_PROG2 } }, /* Lid flip action */ { KE_END, 0}, };
Greg Kroah-Hartman
maintainerPATCH 33/78 RDMA/hns: Fix usage of bitmap allocation functions return values
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit a1ceeca679dccc492235f0f629d9e9f7b3d51ca8 ]
hns bitmap allocation functions return 0 on success and -1 on failure. Callers of these functions wrongly used their return value as an errno, fix that by making a proper conversion.
--- drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_pd.c +1 -1
@@ -35,7 +35,7 @@static int hns_roce_pd_alloc (struct hns_roce_dev *hr_dev,unsigned long *pdn) { -return hns_roce_bitmap_alloc (&hr_dev->pd_bitmap, pdn); +return hns_roce_bitmap_alloc (&hr_dev->pd_bitmap, pdn) ? -ENOMEM :0 ; }static void hns_roce_pd_free (struct hns_roce_dev *hr_dev,unsigned long pdn)
drivers/infiniband/hw/hns/hns_roce_qp.c +4 -1
@@ -114,7 +114,10 @@ static int hns_roce_reserve_range_qp(str {struct hns_roce_qp_table *qp_table = &hr_dev->qp_table; -return hns_roce_bitmap_alloc_range (&qp_table->bitmap, cnt, align, base); +return hns_roce_bitmap_alloc_range (&qp_table->bitmap, cnt, align, + base) ? + -ENOMEM : +0 ; }enum hns_roce_qp_state to_hns_roce_state (enum ib_qp_state state)
Greg Kroah-Hartman
maintainerPATCH 34/78 irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 0702bc4d2fe793018ad9aa0eb14bff7f526c4095 ]
When compiling bmips with SMP disabled, the build fails with:
drivers/irqchip/irq-bcm7038-l1.o: In function `bcm7038_l1_cpu_offline':drivers/irqchip/irq-bcm7038-l1.c:242: undefined reference to `irq_set_affinity_locked' make[5]: *** [vmlinux] Error 1
Fix this by adding and setting bcm7038_l1_cpu_offline only when actually compiling for SMP. It wouldn't have been used anyway, as it requires CPU_HOTPLUG, which in turn requires SMP.
--- drivers/irqchip/irq-bcm7038-l1.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/irqchip/irq-bcm7038-l1.c +4 -0
@@ -215,6 +215,7 @@ static int bcm7038_l1_set_affinity(strucreturn 0 ; } +#ifdef CONFIG_SMP static void bcm7038_l1_cpu_offline (struct irq_data *d) {struct cpumask *mask =irq_data_get_affinity_mask (d);
@@ -239,6 +240,7 @@ static void bcm7038_l1_cpu_offline(struc }irq_set_affinity_locked (d, &new_affinity, false); } +#endif static int __init bcm7038_l1_init_one(struct device_node *dn, unsigned int idx,
@@ -291,7 +293,9 @@ static struct irq_chip bcm7038_l1_irq_ch .irq_mask = bcm7038_l1_mask, .irq_unmask = bcm7038_l1_unmask, .irq_set_affinity = bcm7038_l1_set_affinity, +#ifdef CONFIG_SMP .irq_cpu_offline = bcm7038_l1_cpu_offline, +#endif }; static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,
Greg Kroah-Hartman
maintainerPATCH 35/78 net/9p/trans_fd.c: fix race by holding the lock
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Bortoli <[email protected]>
[ Upstream commit 9f476d7c540cb57556d3cc7e78704e6cd5100f5f ]
It may be possible to run p9_fd_cancel() with a deleted req->req_list and incur in a double del. To fix hold the client->lock while changing the status, so the other threads will be synchronized.
To: Eric Van Hensbergen <[email protected]>
To: Ron Minnich <[email protected]>
To: Latchesar Ionkov <[email protected]>
--- net/9p/trans_fd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/9p/trans_fd.c +5 -5
@@ -195,15 +195,14 @@ static void p9_mux_poll_stop(struct p9_cstatic void p9_conn_cancel (struct p9_conn *m,int err) {struct p9_req_t *req, *rtmp; -unsigned long flags;LIST_HEAD (cancel_list);p9_debug (P9_DEBUG_ERROR ,"mux %p err %d\n" , m, err); -spin_lock_irqsave (&m->client->lock, flags); +spin_lock (&m->client->lock);if (m->err) { -spin_unlock_irqrestore (&m->client->lock, flags); +spin_unlock (&m->client->lock);return ; }
@@ -215,7 +214,6 @@ static void p9_conn_cancel(struct p9_conlist_for_each_entry_safe (req, rtmp, &m->unsent_req_list, req_list) {list_move (&req->req_list, &cancel_list); } -spin_unlock_irqrestore (&m->client->lock, flags);list_for_each_entry_safe (req, rtmp, &cancel_list, req_list) {p9_debug (P9_DEBUG_ERROR ,"call back req %p\n" , req);
@@ -224,6 +222,7 @@ static void p9_conn_cancel(struct p9_con req->t_err = err;p9_client_cb (m->client, req,REQ_STATUS_ERROR ); } +spin_unlock (&m->client->lock); } static int
@@ -379,8 +378,9 @@ static void p9_read_work(struct work_strif (m->req->status !=REQ_STATUS_ERROR ) status =REQ_STATUS_RCVD ;list_del (&m->req->req_list); -spin_unlock (&m->client->lock); +/* update req->status while holding client->lock */ p9_client_cb (m->client, m->req, status); +spin_unlock (&m->client->lock); m->rc.sdata =NULL ; m->rc.offset =0 ; m->rc.capacity =0 ;
Greg Kroah-Hartman
maintainerPATCH 36/78 net/9p: fix error path of p9_virtio_probe
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 92aef4675d5b1b55404e1532379e343bed0e5cf2 ]
Currently when virtio_find_single_vq fails, we go through del_vqs which throws a warning (Trying to free already-free IRQ). Skip del_vqs if vq allocation failed.
--- net/9p/trans_virtio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/9p/trans_virtio.c +2 -1
@@ -571,7 +571,7 @@ static int p9_virtio_probe(struct virtio chan->vq =virtio_find_single_vq (vdev, req_done,"requests" );if (IS_ERR (chan->vq)) { err =PTR_ERR (chan->vq); - goto out_free_vq; + goto out_free_chan; } chan->vq->vdev->priv = chan;spin_lock_init (&chan->lock);
@@ -624,6 +624,7 @@ out_free_tag:kfree (tag); out_free_vq: vdev->config->del_vqs (vdev); +out_free_chan:kfree (chan); fail:return err;
Greg Kroah-Hartman
maintainerPATCH 37/78 powerpc: Fix size calculation using resource_size()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit c42d3be0c06f0c1c416054022aa535c08a1f9b39 ]
The problem is the the calculation should be "end - start + 1" but the plus one is missing in this calculation.
--- arch/powerpc/sysdev/mpic_msgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/sysdev/mpic_msgr.c +1 -1
@@ -196,7 +196,7 @@ static int mpic_msgr_probe(struct platfo/* IO map the message register block. */ of_address_to_resource (np,0 , &rsrc); - msgr_block_addr =ioremap (rsrc.start, rsrc.end - rsrc.start); + msgr_block_addr =ioremap (rsrc.start,resource_size (&rsrc));if (!msgr_block_addr) {dev_err (&dev->dev,"Failed to iomap MPIC message registers" );return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 38/78 perf probe powerpc: Fix trace event post-processing
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit 354b064b8ebc1e1ede58550ca9e08bfa81e6af43 ]
In some cases, a symbol may have multiple aliases. Attempting to add an entry probe for such symbols results in a probe being added at an incorrect location while it fails altogether for return probes. This is only applicable for binaries with debug information.
During the arch-dependent post-processing, the offset from the start of the symbol at which the probe is to be attached is determined and added to the start address of the symbol to get the probe's location. In case there are multiple aliases, this offset gets added multiple times for each alias of the symbol and we end up with an incorrect probe location.
This can be verified on a powerpc64le system as shown below.
$ nm /lib/modules/$(uname -r)/build/vmlinux | grep "sys_open$" ... c000000000414290 T __se_sys_open c000000000414290 T sys_open
$ objdump -d /lib/modules/$(uname -r)/build/vmlinux | grep -A 10 "<__se_sys_open>:"
c000000000414290 <__se_sys_open>:
c000000000414290: 19 01 4c 3c addis r2,r12,281 c000000000414294: 70 c4 42 38 addi r2,r2,-15248 c000000000414298: a6 02 08 7c mflr r0 c00000000041429c: e8 ff a1 fb std r29,-24(r1) c0000000004142a0: f0 ff c1 fb std r30,-16(r1) c0000000004142a4: f8 ff e1 fb std r31,-8(r1) c0000000004142a8: 10 00 01 f8 std r0,16(r1) c0000000004142ac: c1 ff 21 f8 stdu r1,-64(r1) c0000000004142b0: 78 23 9f 7c mr r31,r4 c0000000004142b4: 78 1b 7e 7c mr r30,r3
For both the entry probe and the return probe, the probe location should be _text+4276888 (0xc000000000414298). Since another alias exists for 'sys_open', the post-processing code will end up adding the offset (8 for powerpc64le) twice and perf will attempt to add the probe at _text+4276896 (0xc0000000004142a0) instead.
Before:
# perf probe -v -a sys_open
probe-definition(0): sys_open
symbol:sys_open file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments
Looking at the vmlinux_path (8 entries long)
Using /lib/modules/4.18.0-rc8+/build/vmlinux for symbols Open Debuginfo file: /lib/modules/4.18.0-rc8+/build/vmlinux Try to find probe point from debuginfo.
Symbol sys_open address found : c000000000414290 Matched function: __se_sys_open [2ad03a0]
Probe point found: __se_sys_open+0
Found 1 probe_trace_events.
Opening /sys/kernel/debug/tracing/kprobe_events write=1 Writing event: p:probe/sys_open _text+4276896
Added new event:
probe:sys_open (on sys_open)
...
# perf probe -v -a sys_open%return $retval
probe-definition(0): sys_open%return
symbol:sys_open file:(null) line:0 offset:0 return:1 lazy:(null) 0 arguments
Looking at the vmlinux_path (8 entries long)
Using /lib/modules/4.18.0-rc8+/build/vmlinux for symbols Open Debuginfo file: /lib/modules/4.18.0-rc8+/build/vmlinux Try to find probe point from debuginfo.
Symbol sys_open address found : c000000000414290
Matched function: __se_sys_open [2ad03a0]
Probe point found: __se_sys_open+0
Found 1 probe_trace_events.
Opening /sys/kernel/debug/tracing/README write=0
Opening /sys/kernel/debug/tracing/kprobe_events write=1 Parsing probe_events: p:probe/sys_open _text+4276896 Group:probe Event:sys_open probe:p
Writing event: r:probe/sys_open__return _text+4276896 Failed to write event: Invalid argument
Error: Failed to add events. Reason: Invalid argument (Code: -22)
After:
# perf probe -v -a sys_open
probe-definition(0): sys_open
symbol:sys_open file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments
Looking at the vmlinux_path (8 entries long)
Using /lib/modules/4.18.0-rc8+/build/vmlinux for symbols Open Debuginfo file: /lib/modules/4.18.0-rc8+/build/vmlinux Try to find probe point from debuginfo.
Symbol sys_open address found : c000000000414290 Matched function: __se_sys_open [2ad03a0]
Probe point found: __se_sys_open+0
Found 1 probe_trace_events.
Opening /sys/kernel/debug/tracing/kprobe_events write=1 Writing event: p:probe/sys_open _text+4276888
Added new event:
probe:sys_open (on sys_open)
...
# perf probe -v -a sys_open%return $retval
probe-definition(0): sys_open%return
symbol:sys_open file:(null) line:0 offset:0 return:1 lazy:(null) 0 arguments
Looking at the vmlinux_path (8 entries long)
Using /lib/modules/4.18.0-rc8+/build/vmlinux for symbols Open Debuginfo file: /lib/modules/4.18.0-rc8+/build/vmlinux Try to find probe point from debuginfo.
Symbol sys_open address found : c000000000414290 Matched function: __se_sys_open [2ad03a0]
Probe point found: __se_sys_open+0
Found 1 probe_trace_events.
Opening /sys/kernel/debug/tracing/README write=0 Opening /sys/kernel/debug/tracing/kprobe_events write=1 Parsing probe_events: p:probe/sys_open _text+4276888 Group:probe Event:sys_open probe:p
Writing event: r:probe/sys_open__return _text+4276888 Added new event:
probe:sys_open__return (on sys_open%return)
...
--- tools/perf/arch/powerpc/util/sym-handling.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/arch/powerpc/util/sym-handling.c +3 -1
@@ -115,8 +115,10 @@ void arch__post_process_probe_trace_evenfor (i =0 ; i < ntevs; i++) { tev = &pev->tevs[i];map__for_each_symbol (map, sym, tmp) { -if (map->unmap_ip (map, sym->start) == tev->point.address) +if (map->unmap_ip (map, sym->start) == tev->point.address) {arch__fix_tev_from_maps (pev, tev, map, sym); +break ; + } } } }
Greg Kroah-Hartman
maintainerPATCH 39/78 block: bvec_nr_vecs() returns value for wrong slab
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Edwards <[email protected]>
[ Upstream commit d6c02a9beb67f13d5f14f23e72fa9981e8b84477 ]
In commit ed996a52c868 ("block: simplify and cleanup bvec pool handling"), the value of the slab index is incremented by one in bvec_alloc() after the allocation is done to indicate an index value of 0 does not need to be later freed.
bvec_nr_vecs() was not updated accordingly, and thus returns the wrong value. Decrement idx before performing the lookup.
--- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
@@ -155,7 +155,7 @@ out:unsigned int bvec_nr_vecs (unsigned short idx) { -return bvec_slabs[idx].nr_vecs; +return bvec_slabs[--idx].nr_vecs; }void bvec_free (mempool_t *pool,struct bio_vec *bv,unsigned int idx)
Greg Kroah-Hartman
maintainerPATCH 40/78 s390/dasd: fix hanging offline processing due to canceled worker
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
[ Upstream commit 669f3765b755fd8739ab46ce3a9c6292ce8b3d2a ]
During offline processing two worker threads are canceled without freeing the device reference which leads to a hanging offline process.
--- drivers/s390/block/dasd_eckd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/s390/block/dasd_eckd.c +5 -2
@@ -2085,8 +2085,11 @@ static int dasd_eckd_basic_to_ready(strustatic int dasd_eckd_online_to_ready (struct dasd_device *device) { -cancel_work_sync (&device->reload_device); -cancel_work_sync (&device->kick_validate); +if (cancel_work_sync (&device->reload_device)) +dasd_put_device (device); +if (cancel_work_sync (&device->kick_validate)) +dasd_put_device (device); +return 0 ; };
Greg Kroah-Hartman
maintainerPATCH 41/78 s390/dasd: fix panic for failed online processing
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
[ Upstream commit 7c6553d4db03350dad0110c3224194c19df76a8f ]
Fix a panic that occurs for a device that got an error in dasd_eckd_check_characteristics() during online processing. For example the read configuration data command may have failed.
If this error occurs the device is not being set online and the earlier invoked steps during online processing are rolled back. Therefore dasd_eckd_uncheck_device() is called which needs a valid private structure. But this pointer is not valid if dasd_eckd_check_characteristics() has failed.
Check for a valid device->private pointer to prevent a panic.
--- drivers/s390/block/dasd_eckd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/s390/block/dasd_eckd.c +3 -0
@@ -1834,6 +1834,9 @@ static void dasd_eckd_uncheck_device(strstruct dasd_eckd_private *private = device->private;int i; +if (!private) +return ; +dasd_alias_disconnect_device_from_lcu (device); private->ned =NULL ; private->sneq =NULL ;
Greg Kroah-Hartman
maintainerPATCH 42/78 ACPI / scan: Initialize status to ACPI_STA_DEFAULT
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 5971b0c1594d6c34e257101ed5fdffec65205c50 ]
Since commit 63347db0affa "ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs" the status field of normal acpi_devices gets set to 0 by acpi_bus_type_and_status() and filled with its actual value later when acpi_add_single_object() calls acpi_bus_get_status().
This means that any acpi_match_device_ids() calls in between will always fail with -ENOENT.
We already have a workaround for this, which temporary forces status to ACPI_STA_DEFAULT in drivers/acpi/x86/utils.c: acpi_device_always_present() and the next commit in this series adds another acpi_match_device_ids() call between status being initialized as 0 and the acpi_bus_get_status() call.
Rather then adding another workaround, this commit makes acpi_bus_type_and_status() initialize status to ACPI_STA_DEFAULT, this is safe to do as the only code looking at status between the initialization and the acpi_bus_get_status() call is those acpi_match_device_ids() calls.
Note this does mean that we need to (re)set status to 0 in case the acpi_bus_get_status() call fails.
--- drivers/acpi/scan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/acpi/scan.c +3 -2
@@ -1453,7 +1453,8 @@ static int acpi_add_single_object(struct* Note this must be done before the get power-/wakeup_dev-flags calls. */ if (type ==ACPI_BUS_TYPE_DEVICE ) -acpi_bus_get_status (device); +if (acpi_bus_get_status (device) <0 ) +acpi_set_device_status (device,0 );acpi_bus_get_power_flags (device);acpi_bus_get_wakeup_device_flags (device);
@@ -1531,7 +1532,7 @@ static int acpi_bus_type_and_status(acpi* acpi_add_single_object updates this once we've an acpi_device * so that acpi_bus_get_status' quirk handling can be used. */ - *sta =0 ; + *sta =ACPI_STA_DEFAULT ;break ;case ACPI_TYPE_PROCESSOR : *type =ACPI_BUS_TYPE_PROCESSOR ;
Greg Kroah-Hartman
maintainerPATCH 43/78 scsi: aic94xx: fix an error code in aic94xx_init()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 0756c57bce3d26da2592d834d8910b6887021701 ]
We accidentally return success instead of -ENOMEM on this error path.
--- drivers/scsi/aic94xx/aic94xx_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/aic94xx/aic94xx_init.c +3 -1
@@ -1031,8 +1031,10 @@ static int __init aic94xx_init(void) aic94xx_transport_template =sas_domain_attach_transport (&aic94xx_transport_functions); -if (!aic94xx_transport_template) +if (!aic94xx_transport_template) { + err = -ENOMEM ; goto out_destroy_caches; + } err =pci_register_driver (&aic94xx_pci_driver);if (err)
Greg Kroah-Hartman
maintainerPATCH 44/78 PCI: mvebu: Fix I/O space end address calculation
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Petazzoni <[email protected]>
[ Upstream commit dfd0309fd7b30a5baffaf47b2fccb88b46d64d69 ]
pcie->realio.end should be the address of last byte of the area, therefore using resource_size() of another resource is not correct, we must substract 1 to get the address of the last byte.
--- drivers/pci/host/pci-mvebu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-mvebu.c +1 -1
@@ -1236,7 +1236,7 @@ static int mvebu_pcie_probe(struct platf pcie->realio.start =PCIBIOS_MIN_IO ; pcie->realio.end =min_t (resource_size_t,IO_SPACE_LIMIT , -resource_size (&pcie->io)); +resource_size (&pcie->io) -1 ); }else pcie->realio = pcie->io;
Greg Kroah-Hartman
maintainerPATCH 45/78 dm kcopyd: avoid softlockup in run_complete_job
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Pittman <[email protected]>
[ Upstream commit 784c9a29e99eb40b842c29ecf1cc3a79e00fb629 ]
It was reported that softlockups occur when using dm-snapshot ontop of slow (rbd) storage. E.g.:
[ 4047.990647] watchdog: BUG: soft lockup - CPU#10 stuck for 22s! [kworker/10:23:26177] ... [ 4048.034151] Workqueue: kcopyd do_work [dm_mod] [ 4048.034156] RIP: 0010:copy_callback+0x41/0x160 [dm_snapshot] ... [ 4048.034190] Call Trace: [ 4048.034196] ? __chunk_is_tracked+0x70/0x70 [dm_snapshot] [ 4048.034200] run_complete_job+0x5f/0xb0 [dm_mod] [ 4048.034205] process_jobs+0x91/0x220 [dm_mod] [ 4048.034210] ? kcopyd_put_pages+0x40/0x40 [dm_mod] [ 4048.034214] do_work+0x46/0xa0 [dm_mod] [ 4048.034219] process_one_work+0x171/0x370 [ 4048.034221] worker_thread+0x1fc/0x3f0 [ 4048.034224] kthread+0xf8/0x130 [ 4048.034226] ? max_active_store+0x80/0x80 [ 4048.034227] ? kthread_bind+0x10/0x10 [ 4048.034231] ret_from_fork+0x35/0x40 [ 4048.034233] Kernel panic - not syncing: softlockup: hung tasks
Fix this by calling cond_resched() after run_complete_job()'s callout to the dm_kcopyd_notify_fn (which is dm-snap.c:copy_callback in the above trace).
--- drivers/md/dm-kcopyd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/dm-kcopyd.c +2 -0
@@ -454,6 +454,8 @@ static int run_complete_job(struct kcopyif (atomic_dec_and_test (&kc->nr_jobs))wake_up (&kc->destroyq); +cond_resched (); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 46/78 staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
[ Upstream commit e083926b3e269d4064825dcf2ad50c636fddf8cf ]
The PFI subdevice flags indicate that the subdevice is readable and writeable, but that is only true for the supported "M-series" boards, not the older "E-series" boards. Only set the SDF_READABLE and SDF_WRITABLE subdevice flags for the M-series boards. These two flags are mainly for informational purposes.
--- drivers/staging/comedi/drivers/ni_mio_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_mio_common.c +2 -1
@@ -5407,11 +5407,11 @@ static int ni_E_init(struct comedi_devic/* Digital I/O (PFI) subdevice */ s = &dev->subdevices[NI_PFI_DIO_SUBDEV ]; s->type =COMEDI_SUBD_DIO ; - s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ; s->maxdata =1 ;if (devpriv->is_m_series) { s->n_chan =16 ; s->insn_bits = ni_pfi_insn_bits; + s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;ni_writew (dev, s->state,NI_M_PFI_DO_REG );for (i =0 ; i <NUM_PFI_OUTPUT_SELECT_REGS ; ++i) {
@@ -5420,6 +5420,7 @@ static int ni_E_init(struct comedi_devic } }else { s->n_chan =10 ; + s->subdev_flags =SDF_INTERNAL ; } s->insn_config = ni_pfi_insn_config;
Greg Kroah-Hartman
maintainerPATCH 47/78 selftests/powerpc: Kill child processes on SIGINT
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 7c27a26e1ed5a7dd709aa19685d2c98f64e1cf0c ]
There are some powerpc selftests, as tm/tm-unavailable, that run for a long period (>120 seconds), and if it is interrupted, as pressing CRTL-C (SIGINT), the foreground process (harness) dies but the child process and threads continue to execute (with PPID = 1 now) in background.
In this case, you'd think the whole test exited, but there are remaining threads and processes being executed in background. Sometimes these zombies processes are doing annoying things, as consuming the whole CPU or dumping things to STDOUT.
This patch fixes this problem by attaching an empty signal handler to SIGINT in the harness process. This handler will interrupt (EINTR) the parent process waitpid() call, letting the code to follow through the normal flow, which will kill all the processes in the child process group.
This patch also fixes a typo.
--- tools/testing/selftests/powerpc/harness.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
tools/testing/selftests/powerpc/harness.c +12 -6
@@ -85,13 +85,13 @@ wait:return status; } -static void alarm_handler (int signum) +static void sig_handler (int signum) { -/* Jut wake us up from waitpid */ +/* Just wake us up from waitpid */ } -static struct sigaction alarm_action = { - .sa_handler = alarm_handler, +static struct sigaction sig_action = { + .sa_handler = sig_handler, };void test_harness_set_timeout (uint64_t time)
@@ -106,8 +106,14 @@ int test_harness(int (test_function)(voitest_start (name);test_set_git_version (GIT_VERSION ); -if (sigaction (SIGALRM , &alarm_action,NULL )) { -perror ("sigaction" ); +if (sigaction (SIGINT , &sig_action,NULL )) { +perror ("sigaction (sigint)" ); +test_error (name); +return 1 ; + } + +if (sigaction (SIGALRM , &sig_action,NULL )) { +perror ("sigaction (sigalrm)" );test_error (name);return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 48/78 RDS: IB: fix passing zero to ERR_PTR() warning
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: YueHaibing <[email protected]>
[ Upstream commit 5941923da29e84bc9e2a1abb2c14fffaf8d71e2f ]
Fix a static code checker warning:
net/rds/ib_frmr.c:82 rds_ib_alloc_frmr() warn: passing zero to 'ERR_PTR'
The error path for ib_alloc_mr failure should set err to PTR_ERR.
--- net/rds/ib_frmr.c | 1 + 1 file changed, 1 insertion(+)
net/rds/ib_frmr.c +1 -0
@@ -61,6 +61,7 @@ static struct rds_ib_mr *rds_ib_alloc_fr pool->fmr_attr.max_pages);if (IS_ERR (frmr->mr)) {pr_warn ("RDS/IB: %s failed to allocate MR" , __func__); + err =PTR_ERR (frmr->mr); goto out_no_cigar; }
Greg Kroah-Hartman
maintainerPATCH 49/78 smb3: fix reset of bytes read and written stats
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit c281bc0c7412308c7ec0888904f7c99353da4796 ]
echo 0 > /proc/fs/cifs/Stats is supposed to reset the stats but there were four (see example below) that were not reset (bytes read and witten, total vfs ops and max ops at one time).
...
0 session 0 share reconnects
Total vfs operations: 100 maximum at one time: 2
1) \\localhost\test
SMBs: 0
Bytes read: 502092 Bytes written: 31457286
TreeConnects: 0 total 0 failed
TreeDisconnects: 0 total 0 failed
...
This patch fixes cifs_stats_proc_write to properly reset those four.
--- fs/cifs/cifs_debug.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/cifs/cifs_debug.c +8 -0
@@ -284,6 +284,10 @@ static ssize_t cifs_stats_proc_write(stratomic_set (&totBufAllocCount,0 );atomic_set (&totSmBufAllocCount,0 );#endif /* CONFIG_CIFS_STATS2 */ +spin_lock (&GlobalMid_Lock); + GlobalMaxActiveXid =0 ; + GlobalCurrentXid =0 ; +spin_unlock (&GlobalMid_Lock);spin_lock (&cifs_tcp_ses_lock);list_for_each (tmp1, &cifs_tcp_ses_list) { server = list_entry(tmp1, struct TCP_Server_Info,
@@ -296,6 +300,10 @@ static ssize_t cifs_stats_proc_write(str struct cifs_tcon, tcon_list);atomic_set (&tcon->num_smbs_sent,0 ); +spin_lock (&tcon->stat_lock); + tcon->bytes_read =0 ; + tcon->bytes_written =0 ; +spin_unlock (&tcon->stat_lock);if (server->ops->clear_stats) server->ops->clear_stats (tcon); }
Greg Kroah-Hartman
maintainerPATCH 50/78 SMB3: Number of requests sent should be displayed for SMB3 not just CIFS
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit 289131e1f1e6ad8c661ec05e176b8f0915672059 ]
For SMB2/SMB3 the number of requests sent was not displayed in /proc/fs/cifs/Stats unless CONFIG_CIFS_STATS2 was enabled (only number of failed requests displayed). As with earlier dialects, we should be displaying these counters if CONFIG_CIFS_STATS is enabled. They
are important for debugging.
e.g. when you cat /proc/fs/cifs/Stats (before the patch) Resources in use
CIFS Session: 1
Share (unique mount targets): 2
SMB Request/Response Buffer: 1 Pool size: 5
SMB Small Req/Resp Buffer: 1 Pool size: 30 Operations (MIDs): 0
0 session 0 share reconnects
Total vfs operations: 690 maximum at one time: 2
1) \\localhost\test
SMBs: 975
Negotiates: 0 sent 0 failed
SessionSetups: 0 sent 0 failed
Logoffs: 0 sent 0 failed
TreeConnects: 0 sent 0 failed
TreeDisconnects: 0 sent 0 failed
Creates: 0 sent 2 failed
Closes: 0 sent 0 failed
Flushes: 0 sent 0 failed
Reads: 0 sent 0 failed
Writes: 0 sent 0 failed
Locks: 0 sent 0 failed
IOCTLs: 0 sent 1 failed
Cancels: 0 sent 0 failed
Echos: 0 sent 0 failed
QueryDirectories: 0 sent 63 failed
--- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2pdu.c +1 -1
@@ -320,7 +320,7 @@ small_smb2_init(__le16 smb2_command, strsmb2_hdr_assemble ((struct smb2_hdr *) *request_buf, smb2_command, tcon);if (tcon !=NULL ) { -#ifdef CONFIG_CIFS_STATS2 +#ifdef CONFIG_CIFS_STATS uint16_t com_code =le16_to_cpu (smb2_command);cifs_stats_inc (&tcon->stats.smb2_stats.smb2_com_sent[com_code]);#endif
Greg Kroah-Hartman
maintainerPATCH 51/78 powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX.
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mahesh Salgaonkar <[email protected]>
[ Upstream commit 74e96bf44f430cf7a01de19ba6cf49b361cdfd6e ]
The global mce data buffer that used to copy rtas error log is of 2048 (RTAS_ERROR_LOG_MAX) bytes in size. Before the copy we read extended_log_length from rtas error log header, then use max of extended_log_length and RTAS_ERROR_LOG_MAX as a size of data to be copied. Ideally the platform (phyp) will never send extended error log with size > 2048. But if that happens, then we have a risk of buffer overrun and corruption. Fix this by using min_t instead.
--- arch/powerpc/platforms/pseries/ras.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/ras.c +1 -1
@@ -357,7 +357,7 @@ static struct rtas_error_log *fwnmi_get_int len, error_log_length; error_log_length =8 +rtas_error_extended_log_length (h); - len =max_t (int, error_log_length,RTAS_ERROR_LOG_MAX ); + len =min_t (int, error_log_length,RTAS_ERROR_LOG_MAX );memset (global_mce_data_buf,0 ,RTAS_ERROR_LOG_MAX );memcpy (global_mce_data_buf, h, len); errhdr = (struct rtas_error_log *)global_mce_data_buf;
Greg Kroah-Hartman
maintainerPATCH 52/78 clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Levin Du <[email protected]>
[ Upstream commit 640332d1a089909df08bc9f3e42888a2019c66e2 ]
PWM2 is commonly used to control voltage of PWM regulator of VDD_LOG in RK3399. On the Firefly-RK3399 board, PWM2 outputs 40 KHz square wave from power on and the VDD_LOG is about 0.9V. When the kernel boots normally into the system, the PWM2 keeps outputing PWM signal.
But the kernel hangs randomly after "Starting kernel ..." line on that board. When it happens, PWM2 outputs high level which causes VDD_LOG drops to 0.4V below the normal operating voltage.
By adding "pclk_rkpwm_pmu" to the rk3399_pmucru_critical_clocks array, PWM clock is ensured to be prepared at startup and the PWM2 output is normal. After repeated tests, the early boot hang is gone.
This patch works on both Firefly-RK3399 and ROC-RK3399-PC boards.
--- drivers/clk/rockchip/clk-rk3399.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk-rk3399.c +1 -0
@@ -1521,6 +1521,7 @@ static const char *const rk3399_pmucru_c"pclk_pmu_src" ,"fclk_cm0s_src_pmu" ,"clk_timer_src_pmu" , + "pclk_rkpwm_pmu", };static void __init rk3399_clk_init (struct device_node *np)
Greg Kroah-Hartman
maintainerPATCH 53/78 btrfs: replace: Reset on-disk dev stats value after replace
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Misono Tomohiro <[email protected]>
[ Upstream commit 1e7e1f9e3aba00c9b9c323bfeeddafe69ff21ff6 ]
on-disk devs stats value is updated in btrfs_run_dev_stats(), which is called during commit transaction, if device->dev_stats_ccnt is not zero.
Since current replace operation does not touch dev_stats_ccnt, on-disk dev stats value is not updated. Therefore "btrfs device stats" may return old device's value after umount/mount
(Example: See "btrfs ins dump-t -t DEV $DEV" after btrfs/100 finish).
Fix this by just incrementing dev_stats_ccnt in btrfs_dev_replace_finishing() when replace is succeeded and this will update the values.
--- fs/btrfs/dev-replace.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/btrfs/dev-replace.c +6 -0
@@ -586,6 +586,12 @@ static int btrfs_dev_replace_finishing(sbtrfs_rm_dev_replace_unblocked (fs_info);/* +* Increment dev_stats_ccnt so that btrfs_run_dev_stats() will +* update on-disk dev stats value during commit transaction +*/ +atomic_inc (&tgt_device->dev_stats_ccnt); + +/* * this is again a consistent state where no dev_replace procedure * is running, the target device is part of the filesystem, the * source device is not part of the filesystem anymore and its 1st
Greg Kroah-Hartman
maintainerPATCH 54/78 btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 389305b2aa68723c754f88d9dbd268a400e10664 ]
Invalid reloc tree can cause kernel NULL pointer dereference when btrfs does some cleanup of the reloc roots.
It turns out that fs_info::reloc_ctl can be NULL in btrfs_recover_relocation() as we allocate relocation control after all reloc roots have been verified.
So when we hit: note, we haven't called set_reloc_control() thus fs_info::reloc_ctl is still NULL.
--- fs/btrfs/relocation.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
fs/btrfs/relocation.c +12 -11
@@ -1325,18 +1325,19 @@ static void __del_reloc_root(struct btrfstruct mapping_node *node =NULL ;struct reloc_control *rc = root->fs_info->reloc_ctl; -spin_lock (&rc->reloc_root_tree.lock); - rb_node =tree_search (&rc->reloc_root_tree.rb_root, - root->node->start); -if (rb_node) { - node = rb_entry(rb_node, struct mapping_node, rb_node); -rb_erase (&node->rb_node, &rc->reloc_root_tree.rb_root); +if (rc) { +spin_lock (&rc->reloc_root_tree.lock); + rb_node =tree_search (&rc->reloc_root_tree.rb_root, + root->node->start); +if (rb_node) { + node = rb_entry(rb_node, struct mapping_node, rb_node); +rb_erase (&node->rb_node, &rc->reloc_root_tree.rb_root); + } +spin_unlock (&rc->reloc_root_tree.lock); +if (!node) +return ; +BUG_ON ((struct btrfs_root *)node->data != root); } -spin_unlock (&rc->reloc_root_tree.lock); - -if (!node) -return ; -BUG_ON ((struct btrfs_root *)node->data != root);spin_lock (&root->fs_info->trans_lock);list_del_init (&root->root_list);
Greg Kroah-Hartman
maintainerPATCH 55/78 btrfs: Dont remove block group that still has pinned down bytes
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 43794446548730ac8461be30bbe47d5d027d1d16 ]
[BUG]
Under certain KVM load and LTP tests, it is possible to hit the following calltrace if quota is enabled:
BTRFS critical (device vda2): unable to find logical 8820195328 length 4096 BTRFS critical (device vda2): unable to find logical 8820195328 length 4096
WARNING: CPU: 0 PID: 49 at ../block/blk-core.c:172 blk_status_to_errno+0x1a/0x30 CPU: 0 PID: 49 Comm: kworker/u2:1 Not tainted 4.12.14-15-default #1 SLE15 (unreleased) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.0.0-prebuilt.qemu-project.org 04/01/2014 Workqueue: btrfs-endio-write btrfs_endio_write_helper [btrfs] task: ffff9f827b340bc0 task.stack: ffffb4f8c0304000 RIP: 0010:blk_status_to_errno+0x1a/0x30 Call Trace: submit_extent_page+0x191/0x270 [btrfs] ? btrfs_create_repair_bio+0x130/0x130 [btrfs] __do_readpage+0x2d2/0x810 [btrfs] ? btrfs_create_repair_bio+0x130/0x130 [btrfs] ? run_one_async_done+0xc0/0xc0 [btrfs] __extent_read_full_page+0xe7/0x100 [btrfs] ? run_one_async_done+0xc0/0xc0 [btrfs] read_extent_buffer_pages+0x1ab/0x2d0 [btrfs] ? run_one_async_done+0xc0/0xc0 [btrfs] btree_read_extent_buffer_pages+0x94/0xf0 [btrfs] read_tree_block+0x31/0x60 [btrfs] read_block_for_search.isra.35+0xf0/0x2e0 [btrfs] btrfs_search_slot+0x46b/0xa00 [btrfs] ? kmem_cache_alloc+0x1a8/0x510 ? btrfs_get_token_32+0x5b/0x120 [btrfs] find_parent_nodes+0x11d/0xeb0 [btrfs] ? leaf_space_used+0xb8/0xd0 [btrfs] ? btrfs_leaf_free_space+0x49/0x90 [btrfs] ? btrfs_find_all_roots_safe+0x93/0x100 [btrfs] btrfs_find_all_roots_safe+0x93/0x100 [btrfs] btrfs_find_all_roots+0x45/0x60 [btrfs] btrfs_qgroup_trace_extent_post+0x20/0x40 [btrfs] btrfs_add_delayed_data_ref+0x1a3/0x1d0 [btrfs] btrfs_alloc_reserved_file_extent+0x38/0x40 [btrfs] insert_reserved_file_extent.constprop.71+0x289/0x2e0 [btrfs] btrfs_finish_ordered_io+0x2f4/0x7f0 [btrfs] ? pick_next_task_fair+0x2cd/0x530 ? __switch_to+0x92/0x4b0 btrfs_worker_helper+0x81/0x300 [btrfs] process_one_work+0x1da/0x3f0 worker_thread+0x2b/0x3f0 ? process_one_work+0x3f0/0x3f0 kthread+0x11a/0x130 ? kthread_create_on_node+0x40/0x40 ret_from_fork+0x35/0x40
BTRFS critical (device vda2): unable to find logical 8820195328 length 16384
BTRFS: error (device vda2) in btrfs_finish_ordered_io:3023: errno=-5 IO failure BTRFS info (device vda2): forced readonly
BTRFS error (device vda2): pending csums is 2887680
[CAUSE]
It's caused by race with block group auto removal:
- There is a meta block group X, which has only one tree block The tree block belongs to fs tree 257.
- In current transaction, some operation modified fs tree 257 The tree block gets COWed, so the block group X is empty, and marked as unused, queued to be deleted.
- Some workload (like fsync) wakes up cleaner_kthread() Which will call btrfs_delete_unused_bgs() to remove unused block groups.
So block group X along its chunk map get removed.
- Some delalloc work finished for fs tree 257
Quota needs to get the original reference of the extent, which will read tree blocks of commit root of 257.
Then since the chunk map gets removed, the above warning gets triggered.
[FIX]
Just let btrfs_delete_unused_bgs() skip block group which still has pinned bytes.
However there is a minor side effect: currently we only queue empty blocks at update_block_group(), and such empty block group with pinned bytes won't go through update_block_group() again, such block group won't be removed, until it gets new extent allocated and removed.
--- fs/btrfs/extent-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent-tree.c +1 -1
@@ -10853,7 +10853,7 @@ void btrfs_delete_unused_bgs(struct btrf/* Don't want to race with allocators so take the groups_sem */ down_write (&space_info->groups_sem);spin_lock (&block_group->lock); -if (block_group->reserved || +if (block_group->reserved || block_group->pinned ||btrfs_block_group_used (&block_group->item) || block_group->ro ||list_is_singular (&block_group->list)) {
Greg Kroah-Hartman
maintainerPATCH 56/78 arm64: rockchip: Force CONFIG_PM on Rockchip systems
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 7db7a8f5638a2ffe0c0c0d55b5186b6191fd6af7 ]
A number of the Rockchip-specific drivers (IOMMU, display controllers) are now assuming that CONFIG_PM is set, and may completely misbehave if that's not the case.
Since there is hardly any reason for this configuration option not to be selected anyway, let's require it (in the same way Tegra already does).
--- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+)
arch/arm64/Kconfig.platforms +1 -0
@@ -125,6 +125,7 @@ config ARCH_ROCKCHIP select GPIOLIB select PINCTRL select PINCTRL_ROCKCHIP + select PM select ROCKCHIP_TIMER help This enables support for the ARMv8 based Rockchip chipsets,
Greg Kroah-Hartman
maintainerPATCH 57/78 ARM: rockchip: Force CONFIG_PM on Rockchip systems
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit d1558dfd9f22c99a5b8e1354ad881ee40749da89 ]
A number of the Rockchip-specific drivers (IOMMU, display controllers) are now assuming that CONFIG_PM is set, and may completely misbehave if that's not the case.
Since there is hardly any reason for this configuration option not to be selected anyway, let's require it (in the same way Tegra already does).
--- arch/arm/mach-rockchip/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -16,6 +16,7 @@ config ARCH_ROCKCHIP select ROCKCHIP_TIMER select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK + select PM help Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs containing the RK2928, RK30xx and RK31xx series.
Greg Kroah-Hartman
maintainerPATCH 58/78 drm/edid: Add 6 bpc quirk for SDC panel in Lenovo B50-80
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai-Heng Feng <[email protected]>
commit 25da75043f8690fd083878447c91f289dfb63b87 upstream.
Another panel that reports "DFP 1.x compliant TMDS" but it supports 6bpc instead of 8 bpc.
Apply 6 bpc quirk for the panel to fix it.
--- drivers/gpu/drm/drm_edid.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_edid.c +3 -0
@@ -110,6 +110,9 @@ static const struct edid_quirk {/* CPT panel of Asus UX303LA reports 8 bpc, but is a 6 bpc panel */ { "CPT", 0x17df, EDID_QUIRK_FORCE_6BPC }, +/* SDC panel of Lenovo B50-80 reports 8 bpc, but is a 6 bpc panel */ + { "SDC", 0x3652, EDID_QUIRK_FORCE_6BPC }, +/* Belinea 10 15 55 */ { "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 }, { "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
Greg Kroah-Hartman
maintainerPATCH 59/78 tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 29869d66870a715177bfb505f66a7e0e8bcc89c3 upstream.
This reverts commit e70ac171658679ecf6bea4bbd9e9325cd6079d2b.
jtcp_rcv_established() is in fact called with hard irq being disabled.
Initial bug report from Ricardo Nabinger Sanchez [1] still needs to be investigated, but does not look like a TCP bug.
[1] https://www.spinics.net/lists/netdev/msg420960.html
--- net/ipv4/tcp_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/tcp_probe.c +2 -2
@@ -117,7 +117,7 @@ static void jtcp_rcv_established(struct (fwmark > 0 && skb->mark == fwmark)) && (full || tp->snd_cwnd != tcp_probe.lastcwnd)) { -spin_lock_bh (&tcp_probe.lock); +spin_lock (&tcp_probe.lock);/* If log fills, just silently drop */ if (tcp_probe_avail () >1 ) {struct tcp_log *p = tcp_probe.log + tcp_probe.head;
@@ -157,7 +157,7 @@ static void jtcp_rcv_established(struct tcp_probe.head = (tcp_probe.head +1 ) & (bufsize -1 ); } tcp_probe.lastcwnd = tp->snd_cwnd; -spin_unlock_bh (&tcp_probe.lock); +spin_unlock (&tcp_probe.lock);wake_up (&tcp_probe.wait); }
Greg Kroah-Hartman
maintainerPATCH 60/78 debugobjects: Make stack check warning more informative
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Fernandes (Google) <[email protected]>
commit fc91a3c4c27acdca0bc13af6fbb68c35cfd519f2 upstream.
While debugging an issue debugobject tracking warned about an annotation issue of an object on stack. It turned out that the issue was due to the object in concern being on a different stack which was due to another issue.
Thomas suggested to print the pointers and the location of the stack for the currently running task. This helped to figure out that the object was on the wrong stack.
As this is general useful information for debugging similar issues, make the error message more informative by printing the pointers.
[ tglx: Massaged changelog ]
--- lib/debugobjects.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
lib/debugobjects.c +5 -2
@@ -294,9 +294,12 @@ static void debug_object_is_on_stack(voi limit++;if (is_on_stack) -pr_warn ("object is on stack, but not annotated\n" ); +pr_warn ("object %p is on stack %p, but NOT annotated.\n" , addr, +task_stack_page (current));else -pr_warn ("object is not on stack, but annotated\n" ); +pr_warn ("object %p is NOT on stack %p, but annotated.\n" , addr, +task_stack_page (current)); +WARN_ON (1 ); }
Greg Kroah-Hartman
maintainerPATCH 61/78 x86/pae: use 64 bit atomic xchg function in native_ptep_get_and_clear
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
commit b2d7a075a1ccef2fb321d595802190c8e9b39004 upstream.
Using only 32-bit writes for the pte will result in an intermediate L1TF vulnerable PTE. When running as a Xen PV guest this will at once switch the guest to shadow mode resulting in a loss of performance.
Use arch_atomic64_xchg() instead which will perform the requested operation atomically with all 64 bits.
Some performance considerations according to:
The main number should be the latency, as there is no tight loop around native_ptep_get_and_clear().
"lock cmpxchg8b" has a latency of 20 cycles, while "lock xchg" (with a memory operand) isn't mentioned in that document. "lock xadd" (with xadd having 3 cycles less latency than xchg) has a latency of 11, so we can assume a latency of 14 for "lock xchg".
--- arch/x86/include/asm/pgtable-3level.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/pgtable-3level.h +3 -4
@@ -1,6 +1,8 @@#ifndef _ASM_X86_PGTABLE_3LEVEL_H#define _ASM_X86_PGTABLE_3LEVEL_H +#include <asm/atomic64_32.h> +/* * Intel Physical Address Extension (PAE) Mode - three-level page * tables on PPro+ CPUs.
@@ -142,10 +144,7 @@ static inline pte_t native_ptep_get_and_ {pte_t res; -/* xchg acts as a barrier before the setting of the high bits */ - res.pte_low =xchg (&ptep->pte_low,0 ); - res.pte_high = ptep->pte_high; - ptep->pte_high =0 ; + res.pte = (pteval_t )arch_atomic64_xchg ((atomic64_t *)ptep,0 );return res; }
Greg Kroah-Hartman
maintainerPATCH 62/78 kbuild: make missing $DEPMOD a Warning instead of an Error
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
commit 914b087ff9e0e9a399a4927fa30793064afc0178 upstream.
When $DEPMOD is not found, only print a warning instead of exiting with an error message and error status:
Warning: 'make modules_install' requires /sbin/depmod. Please install it. This is probably in the kmod package.
Change the Error to a Warning because "not all build hosts for cross compiling Linux are Linux systems and are able to provide a working port of depmod, especially at the file patch /sbin/depmod."
I.e., "make modules_install" may be used to copy/install the loadable modules files to a target directory on a build system and then transferred to an embedded device where /sbin/depmod is run instead of it being run on the build system.
--- scripts/depmod.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/depmod.sh +2 -2
@@ -15,9 +15,9 @@ if ! test -r System.map ; then fi if [ -z $(command -v $DEPMOD) ]; then - echo "'make modules_install' requires $DEPMOD. Please install it." >&2 + echo "Warning: 'make modules_install' requires $DEPMOD. Please install it." >&2 echo "This is probably in the kmod package." >&2 - exit 1 + exit 0 fi # older versions of depmod don't support -P <symbol-prefix>
Greg Kroah-Hartman
maintainerPATCH 63/78 irda: Fix memory leak caused by repeated binds of irda socket
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Hicks <[email protected]>
The irda_bind() function allocates memory for self->ias_obj without checking to see if the socket is already bound. A userspace process could repeatedly bind the socket, have each new object added into the LM-IAS database, and lose the reference to the old object assigned to the socket to exhaust memory resources. This patch errors out of the bind operation when self->ias_obj is already assigned.
CVE-2018-6554
--- net/irda/af_irda.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/irda/af_irda.c +7 -0
@@ -774,6 +774,13 @@ static int irda_bind(struct socket *sockreturn -EINVAL ;lock_sock (sk); + +/* Ensure that the socket is not already bound */ +if (self->ias_obj) { + err = -EINVAL ; + goto out; + } +#ifdef CONFIG_IRDA_ULTRA /* Special care for Ultra sockets */ if ((sk->sk_type == SOCK_DGRAM) &&
Greg Kroah-Hartman
maintainerPATCH 64/78 irda: Only insert new objects into the global database via setsockopt
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Hicks <[email protected]>
The irda_setsockopt() function conditionally allocates memory for a new self->ias_object or, in some cases, reuses the existing self->ias_object. Existing objects were incorrectly reinserted into the LM_IAS database which corrupted the doubly linked list used for the hashbin implementation of the LM_IAS database. When combined with a memory leak in irda_bind(), this issue could be leveraged to create a use-after-free vulnerability in the hashbin list. This patch fixes the issue by only inserting newly allocated objects into the database.
CVE-2018-6555
--- net/irda/af_irda.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/irda/af_irda.c +5 -1
@@ -2023,7 +2023,11 @@ static int irda_setsockopt(struct socket err = -EINVAL ; goto out; } -irias_insert_object (ias_obj); + +/* Only insert newly allocated objects */ +if (free_ias) +irias_insert_object (ias_obj); +kfree (ias_opt);break ;case IRLMP_IAS_DEL :
Greg Kroah-Hartman
maintainerPATCH 65/78 Revert "ARM: imx_v6_v7_defconfig: Select ULPI support"
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
This reverts commit 721476147fd2571309b6aa6daa695b39170602ef.
This commit causes reboot to fail on imx6 wandboard, so let's revert it.
--- arch/arm/configs/imx_v6_v7_defconfig | 2 -- 1 file changed, 2 deletions(-)
arch/arm/configs/imx_v6_v7_defconfig +0 -2
@@ -271,7 +271,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -308,7 +307,6 @@ CONFIG_USB_GADGETFS=m CONFIG_USB_FUNCTIONFS=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m -CONFIG_USB_ULPI_BUS=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y
Greg Kroah-Hartman
maintainerPATCH 66/78 enic: do not call enic_change_mtu in enic_probe
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Govindarajulu Varadarajan <[email protected]>
commit cb5c6568867325f9905e80c96531d963bec8e5ea upstream.
In commit ab123fe071c9 ("enic: handle mtu change for vf properly") ASSERT_RTNL() is added to _enic_change_mtu() to prevent it from being called without rtnl held. enic_probe() calls enic_change_mtu() without rtnl held. At this point netdev is not registered yet. Remove call to enic_change_mtu and assign the mtu to netdev->mtu.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -2681,7 +2681,6 @@ static int enic_probe(struct pci_dev *pd*/ enic->port_mtu = enic->config.mtu; - (void )enic_change_mtu (netdev, enic->port_mtu); err =enic_set_mac_addr (netdev, enic->mac_addr);if (err) {
@@ -2731,6 +2730,7 @@ static int enic_probe(struct pci_dev *pd netdev->features |=NETIF_F_HIGHDMA ; netdev->priv_flags |=IFF_UNICAST_FLT ; + netdev->mtu = enic->port_mtu; err =register_netdev (netdev);if (err) {
Greg Kroah-Hartman
maintainerPATCH 67/78 Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chas Williams <[email protected]>
Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages") was an incomplete backport of the upstream commit. It is necessary to always reset page_nid before attempting any early exit.
The original commit conflicted due to lack of commit 82b0f8c39a38 ("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean application, and the change must have just gotten lost in the noise.
--- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/huge_memory.c +1 -1
@@ -1259,12 +1259,12 @@ int do_huge_pmd_numa_page(struct fault_e/* Migration could have started since the pmd_trans_migrating check */ if (!page_locked) { + page_nid =-1 ;if (!get_page_unless_zero (page)) goto out_unlock;spin_unlock (fe->ptl);wait_on_page_locked (page);put_page (page); - page_nid =-1 ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 68/78 sch_htb: fix crash on init failure
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
commit 88c2ace69dbef696edba77712882af03879abc9c upstream.
The commit below added a call to the ->destroy() callback for all qdiscs which failed in their ->init(), but some were not prepared for such change and can't handle partially initialized qdisc. HTB is one of them and if any error occurs before the qdisc watchdog timer and qdisc work are initialized then we can hit either a null ptr deref (timer->base) when canceling in ->destroy or lockdep error info about trying to register a non-static key and a stack dump. So to fix these two move the watchdog timer and workqueue init before anything that can err out.
To reproduce userspace needs to send broken htb qdisc create request, tested with a modified tc (q_htb.c).
Trace log:
[ 2710.897602] BUG: unable to handle kernel NULL pointer dereference at (null) [ 2710.897977] IP: hrtimer_active+0x17/0x8a [ 2710.898174] PGD 58fab067 [ 2710.898175] P4D 58fab067 [ 2710.898353] PUD 586c0067 [ 2710.898531] PMD 0 [ 2710.898710] [ 2710.899045] Oops: 0000 [#1] SMP [ 2710.899232] Modules linked in: [ 2710.899419] CPU: 1 PID: 950 Comm: tc Not tainted 4.13.0-rc6+ #54 [ 2710.899646] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 2710.900035] task: ffff880059ed2700 task.stack: ffff88005ad4c000 [ 2710.900262] RIP: 0010:hrtimer_active+0x17/0x8a [ 2710.900467] RSP: 0018:ffff88005ad4f960 EFLAGS: 00010246 [ 2710.900684] RAX: 0000000000000000 RBX: ffff88003701e298 RCX: 0000000000000000 [ 2710.900933] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88003701e298 [ 2710.901177] RBP: ffff88005ad4f980 R08: 0000000000000001 R09: 0000000000000001 [ 2710.901419] R10: ffff88005ad4f800 R11: 0000000000000400 R12: 0000000000000000 [ 2710.901663] R13: ffff88003701e298 R14: ffffffff822a4540 R15: ffff88005ad4fac0 [ 2710.901907] FS: 00007f2f5e90f740(0000) GS:ffff88005d880000(0000) knlGS:0000000000000000 [ 2710.902277] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 2710.902500] CR2: 0000000000000000 CR3: 0000000058ca3000 CR4: 00000000000406e0 [ 2710.902744] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 2710.902977] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 2710.903180] Call Trace: [ 2710.903332] hrtimer_try_to_cancel+0x1a/0x93 [ 2710.903504] hrtimer_cancel+0x15/0x20 [ 2710.903667] qdisc_watchdog_cancel+0x12/0x14 [ 2710.903866] htb_destroy+0x2e/0xf7 [ 2710.904097] qdisc_create+0x377/0x3fd [ 2710.904330] tc_modify_qdisc+0x4d2/0x4fd [ 2710.904511] rtnetlink_rcv_msg+0x188/0x197 [ 2710.904682] ? rcu_read_unlock+0x3e/0x5f [ 2710.904849] ? rtnl_newlink+0x729/0x729 [ 2710.905017] netlink_rcv_skb+0x6c/0xce [ 2710.905183] rtnetlink_rcv+0x23/0x2a [ 2710.905345] netlink_unicast+0x103/0x181 [ 2710.905511] netlink_sendmsg+0x326/0x337 [ 2710.905679] sock_sendmsg_nosec+0x14/0x3f [ 2710.905847] sock_sendmsg+0x29/0x2e [ 2710.906010] ___sys_sendmsg+0x209/0x28b [ 2710.906176] ? do_raw_spin_unlock+0xcd/0xf8 [ 2710.906346] ? _raw_spin_unlock+0x27/0x31 [ 2710.906514] ? __handle_mm_fault+0x651/0xdb1 [ 2710.906685] ? check_chain_key+0xb0/0xfd [ 2710.906855] __sys_sendmsg+0x45/0x63 [ 2710.907018] ? __sys_sendmsg+0x45/0x63 [ 2710.907185] SyS_sendmsg+0x19/0x1b [ 2710.907344] entry_SYSCALL_64_fastpath+0x23/0xc2
Note that probably this bug goes further back because the default qdisc handling always calls ->destroy on init failure too.
--- net/sched/sch_htb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/sch_htb.c +3 -2
@@ -1013,6 +1013,9 @@ static int htb_init(struct Qdisc *sch, sint err;int i; +qdisc_watchdog_init (&q->watchdog, sch); +INIT_WORK (&q->work, htb_work_func); +if (!opt)return -EINVAL ;
@@ -1033,8 +1036,6 @@ static int htb_init(struct Qdisc *sch, sfor (i =0 ; i <TC_HTB_NUMPRIO ; i++)INIT_LIST_HEAD (q->drops + i); -qdisc_watchdog_init (&q->watchdog, sch); -INIT_WORK (&q->work, htb_work_func);qdisc_skb_head_init (&q->direct_queue);if (tb[TCA_HTB_DIRECT_QLEN ])
Greg Kroah-Hartman
maintainerPATCH 69/78 sch_multiq: fix double free on init failure
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
commit e89d469e3be3ed3d7124a803211a463ff83d0964 upstream.
The below commit added a call to ->destroy() on init failure, but multiq still frees ->queues on error in init, but ->queues is also freed by ->destroy() thus we get double free and corrupted memory.
Very easy to reproduce (eth0 not multiqueue):
$ tc qdisc add dev eth0 root multiq RTNETLINK answers: Operation not supported $ ip l add dumdum type dummy (crash)
Trace log:
[ 3929.467747] general protection fault: 0000 [#1] SMP [ 3929.468083] Modules linked in: [ 3929.468302] CPU: 3 PID: 967 Comm: ip Not tainted 4.13.0-rc6+ #56 [ 3929.468625] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 3929.469124] task: ffff88003716a700 task.stack: ffff88005872c000 [ 3929.469449] RIP: 0010:__kmalloc_track_caller+0x117/0x1be [ 3929.469746] RSP: 0018:ffff88005872f6a0 EFLAGS: 00010246 [ 3929.470042] RAX: 00000000000002de RBX: 0000000058a59000 RCX: 00000000000002df [ 3929.470406] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffff821f7020 [ 3929.470770] RBP: ffff88005872f6e8 R08: 000000000001f010 R09: 0000000000000000 [ 3929.471133] R10: ffff88005872f730 R11: 0000000000008cdd R12: ff006d75646d7564 [ 3929.471496] R13: 00000000014000c0 R14: ffff88005b403c00 R15: ffff88005b403c00 [ 3929.471869] FS: 00007f0b70480740(0000) GS:ffff88005d980000(0000) knlGS:0000000000000000 [ 3929.472286] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3929.472677] CR2: 00007ffcee4f3000 CR3: 0000000059d45000 CR4: 00000000000406e0 [ 3929.473209] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3929.474109] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3929.474873] Call Trace: [ 3929.475337] ? kstrdup_const+0x23/0x25 [ 3929.475863] kstrdup+0x2e/0x4b [ 3929.476338] kstrdup_const+0x23/0x25 [ 3929.478084] __kernfs_new_node+0x28/0xbc [ 3929.478478] kernfs_new_node+0x35/0x55 [ 3929.478929] kernfs_create_link+0x23/0x76 [ 3929.479478] sysfs_do_create_link_sd.isra.2+0x85/0xd7 [ 3929.480096] sysfs_create_link+0x33/0x35 [ 3929.480649] device_add+0x200/0x589 [ 3929.481184] netdev_register_kobject+0x7c/0x12f [ 3929.481711] register_netdevice+0x373/0x471 [ 3929.482174] rtnl_newlink+0x614/0x729 [ 3929.482610] ? rtnl_newlink+0x17f/0x729 [ 3929.483080] rtnetlink_rcv_msg+0x188/0x197 [ 3929.483533] ? rcu_read_unlock+0x3e/0x5f [ 3929.483984] ? rtnl_newlink+0x729/0x729 [ 3929.484420] netlink_rcv_skb+0x6c/0xce [ 3929.484858] rtnetlink_rcv+0x23/0x2a [ 3929.485291] netlink_unicast+0x103/0x181 [ 3929.485735] netlink_sendmsg+0x326/0x337 [ 3929.486181] sock_sendmsg_nosec+0x14/0x3f [ 3929.486614] sock_sendmsg+0x29/0x2e [ 3929.486973] ___sys_sendmsg+0x209/0x28b [ 3929.487340] ? do_raw_spin_unlock+0xcd/0xf8 [ 3929.487719] ? _raw_spin_unlock+0x27/0x31 [ 3929.488092] ? __handle_mm_fault+0x651/0xdb1 [ 3929.488471] ? check_chain_key+0xb0/0xfd [ 3929.488847] __sys_sendmsg+0x45/0x63 [ 3929.489206] ? __sys_sendmsg+0x45/0x63 [ 3929.489576] SyS_sendmsg+0x19/0x1b [ 3929.489901] entry_SYSCALL_64_fastpath+0x23/0xc2 [ 3929.490172] RIP: 0033:0x7f0b6fb93690 [ 3929.490423] RSP: 002b:00007ffcee4ed588 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 3929.490881] RAX: ffffffffffffffda RBX: ffffffff810d278c RCX: 00007f0b6fb93690 [ 3929.491198] RDX: 0000000000000000 RSI: 00007ffcee4ed5d0 RDI: 0000000000000003 [ 3929.491521] RBP: ffff88005872ff98 R08: 0000000000000001 R09: 0000000000000000 [ 3929.491801] R10: 00007ffcee4ed350 R11: 0000000000000246 R12: 0000000000000002 [ 3929.492075] R13: 000000000066f1a0 R14: 00007ffcee4f5680 R15: 0000000000000000 [ 3929.492352] ? trace_hardirqs_off_caller+0xa7/0xcf [ 3929.492590] Code: 8b 45 c0 48 8b 45 b8 74 17 48 8b 4d c8 83 ca ff 44 89 ee 4c 89 f7 e8 83 ca ff ff 49 89 c4 eb 49 49 63 56 20 48 8d 48 01 4d 8b 06 <49> 8b 1c 14 48 89 c2 4c 89 e0 65 49 0f c7 08 0f 94 c0 83 f0 01 [ 3929.493335] RIP: __kmalloc_track_caller+0x117/0x1be RSP: ffff88005872f6a0
--- net/sched/sch_multiq.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/sched/sch_multiq.c +2 -7
@@ -234,7 +234,7 @@ static int multiq_tune(struct Qdisc *schstatic int multiq_init (struct Qdisc *sch,struct nlattr *opt) {struct multiq_sched_data *q =qdisc_priv (sch); -int i, err; +int i; q->queues =NULL ;
@@ -249,12 +249,7 @@ static int multiq_init(struct Qdisc *schfor (i =0 ; i < q->max_bands; i++) q->queues[i] = &noop_qdisc; - err =multiq_tune (sch, opt); - -if (err) -kfree (q->queues); - -return err; +return multiq_tune (sch, opt); }static int multiq_dump (struct Qdisc *sch,struct sk_buff *skb)
Greg Kroah-Hartman
maintainerPATCH 70/78 sch_hhf: fix null pointer dereference on init failure
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
commit 32db864d33c21fd70a217ba53cb7224889354ffb upstream.
If sch_hhf fails in its ->init() function (either due to wrong user-space arguments as below or memory alloc failure of hh_flows) it will do a null pointer deref of q->hh_flows in its ->destroy() function.
To reproduce the crash:
$ tc qdisc add dev eth0 root hhf quantum 2000000 non_hh_weight 10000000
Crash log:
[ 690.654882] BUG: unable to handle kernel NULL pointer dereference at (null) [ 690.655565] IP: hhf_destroy+0x48/0xbc [ 690.655944] PGD 37345067 [ 690.655948] P4D 37345067 [ 690.656252] PUD 58402067 [ 690.656554] PMD 0 [ 690.656857] [ 690.657362] Oops: 0000 [#1] SMP [ 690.657696] Modules linked in: [ 690.658032] CPU: 3 PID: 920 Comm: tc Not tainted 4.13.0-rc6+ #57 [ 690.658525] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 690.659255] task: ffff880058578000 task.stack: ffff88005acbc000 [ 690.659747] RIP: 0010:hhf_destroy+0x48/0xbc [ 690.660146] RSP: 0018:ffff88005acbf9e0 EFLAGS: 00010246 [ 690.660601] RAX: 0000000000000000 RBX: 0000000000000020 RCX: 0000000000000000 [ 690.661155] RDX: 0000000000000000 RSI: 0000000000000001 RDI: ffffffff821f63f0 [ 690.661710] RBP: ffff88005acbfa08 R08: ffffffff81b10a90 R09: 0000000000000000 [ 690.662267] R10: 00000000f42b7019 R11: ffff880058578000 R12: 00000000ffffffea [ 690.662820] R13: ffff8800372f6400 R14: 0000000000000000 R15: 0000000000000000 [ 690.663769] FS: 00007f8ae5e8b740(0000) GS:ffff88005d980000(0000) knlGS:0000000000000000 [ 690.667069] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 690.667965] CR2: 0000000000000000 CR3: 0000000058523000 CR4: 00000000000406e0 [ 690.668918] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 690.669945] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 690.671003] Call Trace: [ 690.671743] qdisc_create+0x377/0x3fd [ 690.672534] tc_modify_qdisc+0x4d2/0x4fd [ 690.673324] rtnetlink_rcv_msg+0x188/0x197 [ 690.674204] ? rcu_read_unlock+0x3e/0x5f [ 690.675091] ? rtnl_newlink+0x729/0x729 [ 690.675877] netlink_rcv_skb+0x6c/0xce [ 690.676648] rtnetlink_rcv+0x23/0x2a [ 690.677405] netlink_unicast+0x103/0x181 [ 690.678179] netlink_sendmsg+0x326/0x337 [ 690.678958] sock_sendmsg_nosec+0x14/0x3f [ 690.679743] sock_sendmsg+0x29/0x2e [ 690.680506] ___sys_sendmsg+0x209/0x28b [ 690.681283] ? __handle_mm_fault+0xc7d/0xdb1 [ 690.681915] ? check_chain_key+0xb0/0xfd [ 690.682449] __sys_sendmsg+0x45/0x63 [ 690.682954] ? __sys_sendmsg+0x45/0x63 [ 690.683471] SyS_sendmsg+0x19/0x1b [ 690.683974] entry_SYSCALL_64_fastpath+0x23/0xc2 [ 690.684516] RIP: 0033:0x7f8ae529d690 [ 690.685016] RSP: 002b:00007fff26d2d6b8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 690.685931] RAX: ffffffffffffffda RBX: ffffffff810d278c RCX: 00007f8ae529d690 [ 690.686573] RDX: 0000000000000000 RSI: 00007fff26d2d700 RDI: 0000000000000003 [ 690.687047] RBP: ffff88005acbff98 R08: 0000000000000001 R09: 0000000000000000 [ 690.687519] R10: 00007fff26d2d480 R11: 0000000000000246 R12: 0000000000000002 [ 690.687996] R13: 0000000001258070 R14: 0000000000000001 R15: 0000000000000000 [ 690.688475] ? trace_hardirqs_off_caller+0xa7/0xcf [ 690.688887] Code: 00 00 e8 2a 02 ae ff 49 8b bc 1d 60 02 00 00 48 83 c3 08 e8 19 02 ae ff 48 83 fb 20 75 dc 45 31 f6 4d 89 f7 4d 03 bd 20 02 00 00 <49> 8b 07 49 39 c7 75 24 49 83 c6 10 49 81 fe 00 40 00 00 75 e1 [ 690.690200] RIP: hhf_destroy+0x48/0xbc RSP: ffff88005acbf9e0 [ 690.690636] CR2: 0000000000000000
--- net/sched/sch_hhf.c | 3 +++ 1 file changed, 3 insertions(+)
net/sched/sch_hhf.c +3 -0
@@ -492,6 +492,9 @@ static void hhf_destroy(struct Qdisc *schhf_free (q->hhf_valid_bits[i]); } +if (!q->hh_flows) +return ; +for (i =0 ; i <HH_FLOWS_CNT ; i++) {struct hh_flow_state *flow, *next;struct list_head *head = &q->hh_flows[i];
Greg Kroah-Hartman
maintainerPATCH 71/78 sch_netem: avoid null pointer deref on init failure
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
commit 634576a1844dba15bc5e6fc61d72f37e13a21615 upstream.
netem can fail in ->init due to missing options (either not supplied by user-space or used as a default qdisc) causing a timer->base null pointer deref in its ->destroy() and ->reset() callbacks.
Reproduce:
$ sysctl net.core.default_qdisc=netem $ ip l set ethX up
Crash log:
[ 1814.846943] BUG: unable to handle kernel NULL pointer dereference at (null) [ 1814.847181] IP: hrtimer_active+0x17/0x8a [ 1814.847270] PGD 59c34067 [ 1814.847271] P4D 59c34067 [ 1814.847337] PUD 37374067 [ 1814.847403] PMD 0 [ 1814.847468] [ 1814.847582] Oops: 0000 [#1] SMP [ 1814.847655] Modules linked in: sch_netem(O) sch_fq_codel(O) [ 1814.847761] CPU: 3 PID: 1573 Comm: ip Tainted: G O 4.13.0-rc6+ #62 [ 1814.847884] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 1814.848043] task: ffff88003723a700 task.stack: ffff88005adc8000 [ 1814.848235] RIP: 0010:hrtimer_active+0x17/0x8a [ 1814.848407] RSP: 0018:ffff88005adcb590 EFLAGS: 00010246 [ 1814.848590] RAX: 0000000000000000 RBX: ffff880058e359d8 RCX: 0000000000000000 [ 1814.848793] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff880058e359d8 [ 1814.848998] RBP: ffff88005adcb5b0 R08: 00000000014080c0 R09: 00000000ffffffff [ 1814.849204] R10: ffff88005adcb660 R11: 0000000000000020 R12: 0000000000000000 [ 1814.849410] R13: ffff880058e359d8 R14: 00000000ffffffff R15: 0000000000000001 [ 1814.849616] FS: 00007f733bbca740(0000) GS:ffff88005d980000(0000) knlGS:0000000000000000 [ 1814.849919] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1814.850107] CR2: 0000000000000000 CR3: 0000000059f0d000 CR4: 00000000000406e0 [ 1814.850313] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1814.850518] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1814.850723] Call Trace: [ 1814.850875] hrtimer_try_to_cancel+0x1a/0x93 [ 1814.851047] hrtimer_cancel+0x15/0x20 [ 1814.851211] qdisc_watchdog_cancel+0x12/0x14 [ 1814.851383] netem_reset+0xe6/0xed [sch_netem] [ 1814.851561] qdisc_destroy+0x8b/0xe5 [ 1814.851723] qdisc_create_dflt+0x86/0x94 [ 1814.851890] ? dev_activate+0x129/0x129 [ 1814.852057] attach_one_default_qdisc+0x36/0x63 [ 1814.852232] netdev_for_each_tx_queue+0x3d/0x48 [ 1814.852406] dev_activate+0x4b/0x129 [ 1814.852569] __dev_open+0xe7/0x104 [ 1814.852730] __dev_change_flags+0xc6/0x15c [ 1814.852899] dev_change_flags+0x25/0x59 [ 1814.853064] do_setlink+0x30c/0xb3f [ 1814.853228] ? check_chain_key+0xb0/0xfd [ 1814.853396] ? check_chain_key+0xb0/0xfd [ 1814.853565] rtnl_newlink+0x3a4/0x729 [ 1814.853728] ? rtnl_newlink+0x117/0x729 [ 1814.853905] ? ns_capable_common+0xd/0xb1 [ 1814.854072] ? ns_capable+0x13/0x15 [ 1814.854234] rtnetlink_rcv_msg+0x188/0x197 [ 1814.854404] ? rcu_read_unlock+0x3e/0x5f [ 1814.854572] ? rtnl_newlink+0x729/0x729 [ 1814.854737] netlink_rcv_skb+0x6c/0xce [ 1814.854902] rtnetlink_rcv+0x23/0x2a [ 1814.855064] netlink_unicast+0x103/0x181 [ 1814.855230] netlink_sendmsg+0x326/0x337 [ 1814.855398] sock_sendmsg_nosec+0x14/0x3f [ 1814.855584] sock_sendmsg+0x29/0x2e [ 1814.855747] ___sys_sendmsg+0x209/0x28b [ 1814.855912] ? do_raw_spin_unlock+0xcd/0xf8 [ 1814.856082] ? _raw_spin_unlock+0x27/0x31 [ 1814.856251] ? __handle_mm_fault+0x651/0xdb1 [ 1814.856421] ? check_chain_key+0xb0/0xfd [ 1814.856592] __sys_sendmsg+0x45/0x63 [ 1814.856755] ? __sys_sendmsg+0x45/0x63 [ 1814.856923] SyS_sendmsg+0x19/0x1b [ 1814.857083] entry_SYSCALL_64_fastpath+0x23/0xc2 [ 1814.857256] RIP: 0033:0x7f733b2dd690 [ 1814.857419] RSP: 002b:00007ffe1d3387d8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 1814.858238] RAX: ffffffffffffffda RBX: ffffffff810d278c RCX: 00007f733b2dd690 [ 1814.858445] RDX: 0000000000000000 RSI: 00007ffe1d338820 RDI: 0000000000000003 [ 1814.858651] RBP: ffff88005adcbf98 R08: 0000000000000001 R09: 0000000000000003 [ 1814.858856] R10: 00007ffe1d3385a0 R11: 0000000000000246 R12: 0000000000000002 [ 1814.859060] R13: 000000000066f1a0 R14: 00007ffe1d3408d0 R15: 0000000000000000 [ 1814.859267] ? trace_hardirqs_off_caller+0xa7/0xcf [ 1814.859446] Code: 10 55 48 89 c7 48 89 e5 e8 45 a1 fb ff 31 c0 5d c3 31 c0 c3 66 66 66 66 90 55 48 89 e5 41 56 41 55 41 54 53 49 89 fd 49 8b 45 30 <4c> 8b 20 41 8b 5c 24 38 31 c9 31 d2 48 c7 c7 50 8e 1d 82 41 89 [ 1814.860022] RIP: hrtimer_active+0x17/0x8a RSP: ffff88005adcb590 [ 1814.860214] CR2: 0000000000000000
--- net/sched/sch_netem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_netem.c +2 -2
@@ -937,11 +937,11 @@ static int netem_init(struct Qdisc *sch,struct netem_sched_data *q =qdisc_priv (sch);int ret; +qdisc_watchdog_init (&q->watchdog, sch); +if (!opt)return -EINVAL ; -qdisc_watchdog_init (&q->watchdog, sch); - q->loss_model =CLG_RANDOM ; ret =netem_change (sch, opt);if (ret)
Greg Kroah-Hartman
maintainerPATCH 72/78 sch_tbf: fix two null pointer dereferences on init failure
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
commit c2d6511e6a4f1f3673d711569c00c3849549e9b0 upstream.
sch_tbf calls qdisc_watchdog_cancel() in both its ->reset and ->destroy callbacks but it may fail before the timer is initialized due to missing options (either not supplied by user-space or set as a default qdisc), also q->qdisc is used by ->reset and ->destroy so we need it initialized.
Reproduce:
$ sysctl net.core.default_qdisc=tbf $ ip l set ethX up
Crash log:
[ 959.160172] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 [ 959.160323] IP: qdisc_reset+0xa/0x5c [ 959.160400] PGD 59cdb067 [ 959.160401] P4D 59cdb067 [ 959.160466] PUD 59ccb067 [ 959.160532] PMD 0 [ 959.160597] [ 959.160706] Oops: 0000 [#1] SMP [ 959.160778] Modules linked in: sch_tbf sch_sfb sch_prio sch_netem [ 959.160891] CPU: 2 PID: 1562 Comm: ip Not tainted 4.13.0-rc6+ #62 [ 959.160998] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 959.161157] task: ffff880059c9a700 task.stack: ffff8800376d0000 [ 959.161263] RIP: 0010:qdisc_reset+0xa/0x5c [ 959.161347] RSP: 0018:ffff8800376d3610 EFLAGS: 00010286 [ 959.161531] RAX: ffffffffa001b1dd RBX: ffff8800373a2800 RCX: 0000000000000000 [ 959.161733] RDX: ffffffff8215f160 RSI: ffffffff8215f160 RDI: 0000000000000000 [ 959.161939] RBP: ffff8800376d3618 R08: 00000000014080c0 R09: 00000000ffffffff [ 959.162141] R10: ffff8800376d3578 R11: 0000000000000020 R12: ffffffffa001d2c0 [ 959.162343] R13: ffff880037538000 R14: 00000000ffffffff R15: 0000000000000001 [ 959.162546] FS: 00007fcc5126b740(0000) GS:ffff88005d900000(0000) knlGS:0000000000000000 [ 959.162844] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 959.163030] CR2: 0000000000000018 CR3: 000000005abc4000 CR4: 00000000000406e0 [ 959.163233] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 959.163436] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 959.163638] Call Trace: [ 959.163788] tbf_reset+0x19/0x64 [sch_tbf] [ 959.163957] qdisc_destroy+0x8b/0xe5 [ 959.164119] qdisc_create_dflt+0x86/0x94 [ 959.164284] ? dev_activate+0x129/0x129 [ 959.164449] attach_one_default_qdisc+0x36/0x63 [ 959.164623] netdev_for_each_tx_queue+0x3d/0x48 [ 959.164795] dev_activate+0x4b/0x129 [ 959.164957] __dev_open+0xe7/0x104 [ 959.165118] __dev_change_flags+0xc6/0x15c [ 959.165287] dev_change_flags+0x25/0x59 [ 959.165451] do_setlink+0x30c/0xb3f [ 959.165613] ? check_chain_key+0xb0/0xfd [ 959.165782] rtnl_newlink+0x3a4/0x729 [ 959.165947] ? rtnl_newlink+0x117/0x729 [ 959.166121] ? ns_capable_common+0xd/0xb1 [ 959.166288] ? ns_capable+0x13/0x15 [ 959.166450] rtnetlink_rcv_msg+0x188/0x197 [ 959.166617] ? rcu_read_unlock+0x3e/0x5f [ 959.166783] ? rtnl_newlink+0x729/0x729 [ 959.166948] netlink_rcv_skb+0x6c/0xce [ 959.167113] rtnetlink_rcv+0x23/0x2a [ 959.167273] netlink_unicast+0x103/0x181 [ 959.167439] netlink_sendmsg+0x326/0x337 [ 959.167607] sock_sendmsg_nosec+0x14/0x3f [ 959.167772] sock_sendmsg+0x29/0x2e [ 959.167932] ___sys_sendmsg+0x209/0x28b [ 959.168098] ? do_raw_spin_unlock+0xcd/0xf8 [ 959.168267] ? _raw_spin_unlock+0x27/0x31 [ 959.168432] ? __handle_mm_fault+0x651/0xdb1 [ 959.168602] ? check_chain_key+0xb0/0xfd [ 959.168773] __sys_sendmsg+0x45/0x63 [ 959.168934] ? __sys_sendmsg+0x45/0x63 [ 959.169100] SyS_sendmsg+0x19/0x1b [ 959.169260] entry_SYSCALL_64_fastpath+0x23/0xc2 [ 959.169432] RIP: 0033:0x7fcc5097e690 [ 959.169592] RSP: 002b:00007ffd0d5c7b48 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 959.169887] RAX: ffffffffffffffda RBX: ffffffff810d278c RCX: 00007fcc5097e690 [ 959.170089] RDX: 0000000000000000 RSI: 00007ffd0d5c7b90 RDI: 0000000000000003 [ 959.170292] RBP: ffff8800376d3f98 R08: 0000000000000001 R09: 0000000000000003 [ 959.170494] R10: 00007ffd0d5c7910 R11: 0000000000000246 R12: 0000000000000006 [ 959.170697] R13: 000000000066f1a0 R14: 00007ffd0d5cfc40 R15: 0000000000000000 [ 959.170900] ? trace_hardirqs_off_caller+0xa7/0xcf [ 959.171076] Code: 00 41 c7 84 24 14 01 00 00 00 00 00 00 41 c7 84 24 98 00 00 00 00 00 00 00 41 5c 41 5d 41 5e 5d c3 66 66 66 66 90 55 48 89 e5 53 <48> 8b 47 18 48 89 fb 48 8b 40 48 48 85 c0 74 02 ff d0 48 8b bb [ 959.171637] RIP: qdisc_reset+0xa/0x5c RSP: ffff8800376d3610 [ 959.171821] CR2: 0000000000000018
--- net/sched/sch_tbf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/sch_tbf.c +3 -2
@@ -423,12 +423,13 @@ static int tbf_init(struct Qdisc *sch, s {struct tbf_sched_data *q =qdisc_priv (sch); +qdisc_watchdog_init (&q->watchdog, sch); + q->qdisc = &noop_qdisc; +if (opt ==NULL )return -EINVAL ; q->t_c =ktime_get_ns (); -qdisc_watchdog_init (&q->watchdog, sch); - q->qdisc = &noop_qdisc;return tbf_change (sch, opt); }
Greg Kroah-Hartman
maintainerPATCH 73/78 mei: me: allow runtime pm for platform with D0i3
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Winkler <[email protected]>
commit cc365dcf0e56271bedf3de95f88922abe248e951 upstream.
Quoted 1 line
From the pci power documentation:
"The driver itself should not call pm_runtime_allow(), though. Instead, it should let user space or some platform-specific code do that (user space can do it via sysfs as stated above)..."
However, the S0ix residency cannot be reached without MEI device getting into low power state. Hence, for mei devices that support D0i3, it's better to make runtime power management mandatory and not rely on the system integration such as udev rules.
This policy cannot be applied globally as some older platforms were found to have broken power management.
--- drivers/misc/mei/pci-me.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/misc/mei/pci-me.c +4 -1
@@ -229,8 +229,11 @@ static int mei_me_probe(struct pci_dev *if (!pci_dev_run_wake (pdev))mei_me_set_pm_domain (dev); -if (mei_pg_is_enabled (dev)) +if (mei_pg_is_enabled (dev)) {pm_runtime_put_noidle (&pdev->dev); +if (hw->d0i3_supported) +pm_runtime_allow (&pdev->dev); + }dev_dbg (&pdev->dev,"initialization successful.\n" );
Greg Kroah-Hartman
maintainerPATCH 74/78 s390/lib: use expoline for all bcr instructions
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Schwidefsky <[email protected]>
commit 5eda25b10297684c1f46a14199ec00210f3c346e upstream.
The memove, memset, memcpy, __memset16, __memset32 and __memset64 function have an additional indirect return branch in form of a "bzr" instruction. These need to use expolines as well.
--- arch/s390/lib/mem.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/s390/lib/mem.S +6 -3
@@ -27,7 +27,7 @@ */ ENTRY(memset) ltgr %r4,%r4 - bzr %r14 + jz .Lmemset_exit ltgr %r3,%r3 jnz .Lmemset_fill aghi %r4,-1
@@ -42,12 +42,13 @@ ENTRY(memset) .Lmemset_clear_rest: larl %r3,.Lmemset_xc ex %r4,0(%r3) +.Lmemset_exit: BR_EX %r14 .Lmemset_fill: stc %r3,0(%r2) cghi %r4,1 lgr %r1,%r2 - ber %r14 + je .Lmemset_fill_exit aghi %r4,-2 srlg %r3,%r4,8 ltgr %r3,%r3
@@ -59,6 +60,7 @@ ENTRY(memset) .Lmemset_fill_rest: larl %r3,.Lmemset_mvc ex %r4,0(%r3) +.Lmemset_fill_exit: BR_EX %r14 .Lmemset_xc: xc 0(1,%r1),0(%r1)
@@ -73,7 +75,7 @@ EXPORT_SYMBOL(memset) */ ENTRY(memcpy) ltgr %r4,%r4 - bzr %r14 + jz .Lmemcpy_exit aghi %r4,-1 srlg %r5,%r4,8 ltgr %r5,%r5
@@ -82,6 +84,7 @@ ENTRY(memcpy) .Lmemcpy_rest: larl %r5,.Lmemcpy_mvc ex %r4,0(%r5) +.Lmemcpy_exit: BR_EX %r14 .Lmemcpy_loop: mvc 0(256,%r1),0(%r3)
Greg Kroah-Hartman
maintainerPATCH 75/78 ASoC: wm8994: Fix missing break in switch
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit ad0eaee6195db1db1749dd46b9e6f4466793d178 upstream.
Add missing break statement in order to prevent the code from falling through to the default case.
Addresses-Coverity-ID: 115050 ("Missing break in switch")
--- sound/soc/codecs/wm8994.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm8994.c +1 -0
@@ -2431,6 +2431,7 @@ static int wm8994_set_dai_sysclk(structsnd_soc_update_bits (codec,WM8994_POWER_MANAGEMENT_2 ,WM8994_OPCLK_ENA ,0 ); } +break ;default :return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 76/78 btrfs: use correct compare function of dirty_metadata_bytes
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Lien <[email protected]>
commit d814a49198eafa6163698bdd93961302f3a877a4 upstream.
We use customized, nodesize batch value to update dirty_metadata_bytes. We should also use batch version of compare function or we will easily goto fast path and get false result from percpu_counter_compare().
nb: Rebased on 4.4.y ]
--- fs/btrfs/disk-io.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/btrfs/disk-io.c +6 -4
@@ -1096,8 +1096,9 @@ static int btree_writepages(struct addre fs_info =BTRFS_I (mapping->host)->root->fs_info;/* this is a bit racy, but that's ok */ - ret =percpu_counter_compare (&fs_info->dirty_metadata_bytes, -BTRFS_DIRTY_METADATA_THRESH ); + ret =__percpu_counter_compare (&fs_info->dirty_metadata_bytes, +BTRFS_DIRTY_METADATA_THRESH , + fs_info->dirty_metadata_batch);if (ret <0 )return 0 ; }
@@ -4107,8 +4108,9 @@ static void __btrfs_btree_balance_dirty(if (flush_delayed)btrfs_balance_delayed_items (root); - ret =percpu_counter_compare (&root->fs_info->dirty_metadata_bytes, -BTRFS_DIRTY_METADATA_THRESH ); + ret =__percpu_counter_compare (&root->fs_info->dirty_metadata_bytes, +BTRFS_DIRTY_METADATA_THRESH , + root->fs_info->dirty_metadata_batch);if (ret >0 ) {balance_dirty_pages_ratelimited ( root->fs_info->btree_inode->i_mapping);
Greg Kroah-Hartman
maintainerPATCH 77/78 arm64: Fix mismatched cache line size detection
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
commit 4c4a39dd5fe2d13e2d2fa5fceb8ef95d19fc389a upstream.
If there is a mismatch in the I/D min line size, we must always use the system wide safe value both in applications and in the kernel, while performing cache operations. However, we have been checking more bits than just the min line sizes, which triggers false negatives. We may need to trap the user accesses in such cases, but not necessarily patch the kernel.
This patch fixes the check to do the right thing as advertised. A new capability will be added to check mismatches in other fields and ensure we trap the CTR accesses.
--- arch/arm64/include/asm/cachetype.h | 5 +++++ arch/arm64/kernel/cpu_errata.c | 7 +++++-- arch/arm64/kernel/cpufeature.c | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-)
arch/arm64/include/asm/cachetype.h +5 -0
@@ -22,6 +22,11 @@#define CTR_L1IP_MASK 3#define CTR_CWG_SHIFT 24#define CTR_CWG_MASK 15 +#define CTR_DMINLINE_SHIFT 16 +#define CTR_IMINLINE_SHIFT 0 + +#define CTR_CACHE_MINLINE_MASK \ + ((0xf << CTR_DMINLINE_SHIFT) | (0xf << CTR_IMINLINE_SHIFT))#define ICACHE_POLICY_RESERVED 0#define ICACHE_POLICY_AIVIVT 1
arch/arm64/kernel/cpu_errata.c +5 -2
@@ -17,6 +17,7 @@*/ #include <linux/types.h> +#include <asm/cachetype.h> #include <asm/cpu.h> #include <asm/cputype.h> #include <asm/cpufeature.h>
@@ -34,9 +35,11 @@ static bool has_mismatched_cache_line_size(const struct arm64_cpu_capabilities *entry, int scope) { +u64 mask =CTR_CACHE_MINLINE_MASK ; +WARN_ON (scope !=SCOPE_LOCAL_CPU ||preemptible ()); -return (read_cpuid_cachetype () & arm64_ftr_reg_ctrel0.strict_mask) != - (arm64_ftr_reg_ctrel0.sys_val & arm64_ftr_reg_ctrel0.strict_mask); +return (read_cpuid_cachetype () & mask) != + (arm64_ftr_reg_ctrel0.sys_val & mask); }static int cpu_enable_trap_ctr_access (void *__unused)
arch/arm64/kernel/cpufeature.c +2 -2
@@ -152,7 +152,7 @@ static const struct arm64_ftr_bits ftr_cARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,28 ,3 ,0 ),ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_SAFE ,24 ,4 ,0 ),/* CWG */ ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,20 ,4 ,0 ),/* ERG */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,16 ,4 ,1 ),/* DminLine */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,CTR_DMINLINE_SHIFT ,4 ,1 ),/* * Linux can handle differing I-cache policies. Userspace JITs will * make use of *minLine.
@@ -160,7 +160,7 @@ static const struct arm64_ftr_bits ftr_c*/ ARM64_FTR_BITS (FTR_NONSTRICT ,FTR_EXACT ,14 ,2 ,ICACHE_POLICY_AIVIVT ),/* L1Ip */ ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,4 ,10 ,0 ),/* RAZ */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,0 ,4 ,0 ),/* IminLine */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,CTR_IMINLINE_SHIFT ,4 ,0 ), ARM64_FTR_END, };
Greg Kroah-Hartman
maintainerPATCH 78/78 arm64: Handle mismatched cache type
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
commit 314d53d297980676011e6fd83dac60db4a01dc70 upstream.
Track mismatches in the cache type register (CTR_EL0), other than the D/I min line sizes and trap user accesses if there are any.
--- arch/arm64/include/asm/cpucaps.h | 3 ++- arch/arm64/kernel/cpu_errata.c | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)
arch/arm64/include/asm/cpucaps.h +2 -1
@@ -37,7 +37,8 @@#define ARM64_UNMAP_KERNEL_AT_EL0 16#define ARM64_HARDEN_BRANCH_PREDICTOR 17#define ARM64_SSBD 18 +#define ARM64_MISMATCHED_CACHE_TYPE 19 -#define ARM64_NCAPS 19 +#define ARM64_NCAPS 20#endif /* __ASM_CPUCAPS_H */
arch/arm64/kernel/cpu_errata.c +14 -3
@@ -32,11 +32,15 @@ is_affected_midr_range(const struct arm6 }static bool -has_mismatched_cache_line_size (const struct arm64_cpu_capabilities *entry, -int scope) +has_mismatched_cache_type (const struct arm64_cpu_capabilities *entry, +int scope) {u64 mask =CTR_CACHE_MINLINE_MASK ; +/* Skip matching the min line sizes for cache type check */ +if (entry->capability ==ARM64_MISMATCHED_CACHE_TYPE ) + mask ^= arm64_ftr_reg_ctrel0.strict_mask; +WARN_ON (scope !=SCOPE_LOCAL_CPU ||preemptible ());return (read_cpuid_cachetype () & mask) != (arm64_ftr_reg_ctrel0.sys_val & mask);
@@ -449,7 +453,14 @@ const struct arm64_cpu_capabilities arm6 { .desc = "Mismatched cache line size", .capability = ARM64_MISMATCHED_CACHE_LINE_SIZE, - .matches = has_mismatched_cache_line_size, + .matches = has_mismatched_cache_type, + .def_scope = SCOPE_LOCAL_CPU, + .enable = cpu_enable_trap_ctr_access, + }, + { + .desc = "Mismatched cache type", + .capability = ARM64_MISMATCHED_CACHE_TYPE, + .matches = has_mismatched_cache_type, .def_scope = SCOPE_LOCAL_CPU, .enable = cpu_enable_trap_ctr_access, },
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.127 release. There are 78 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat Sep 15 13:17:41 UTC 2018. 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.9.127-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Merged, compiled with -Werror, and installed onto my OnePlus 6.
No initial issues noticed in dmesg or general usage.
Thanks!
Nathan
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.127 release. There are 78 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat Sep 15 13:17:41 UTC 2018. 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.9.127-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.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.
This report is on 4.9.127-rc2.
Summary
------------------------------------------------------------------------
kernel: 4.9.127-rc2
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: 2d4a2997954fc37bbd2ba52f43381b929b9e9ca4
git describe: v4.9.126-79-g2d4a2997954f
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.126-79-g2d4a2997954f
No regressions (compared to build v4.9.126)
Ran 21306 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
-----------
* boot
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-containers-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-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* ltp-open-posix-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.127 release. There are 78 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat Sep 15 13:17:41 UTC 2018. Anything received after that time might be too late.
Build results:
total: 151 pass: 151 fail: 0 Qemu test results: total: 305 pass: 305 fail: 0
Details are available at https://kerneltests.org/builders/.
Guenter