Linux 5.4.129
Sasha Levin
maintainer-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I'm announcing the release of the 5.4.129 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
Thanks,
Sasha
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmDcdE8ACgkQ3qZv95d3 LNwMew/9HLxjRRYhe6jCrc66+H2ekkh7TqhkWrgr4zEzYg2k4Xb34MKsq6/jowkw BuAQdY2R1Hrg3UgjmXMnYw6aCVOyOFbbsmK1A07CjW36a4IFrKaKLmdL0nKJl5Vr V+y2v8f9uJfJ9ceN6VdUR7hH1bJLRuoTv0klKOBcGEvvInZiZ2qxzLujVCWYD8CF a8xwvtzt/QWAsPrfMFPa6voLZkLPfNu5sYiqJsboXyt7a9XJYQZ1sJBDfb3HK+uo c0rPcrbQTthmjYmmfFpU6EfBpRBqHui3aWPOCR4OFRtw/1KcB3NIUqkNyTLXxIWB 7OSfLESDXTKCd+RX+tctOCaIaMtRWT/o7RqQy/knI6VXpJk42o/w9tmMVxIU1zr3 v+kqJd7wQ/B03zei4XhZBTnPhT2tOFNtMFzYvagGyJXR9u0UjDK4Jf8i8ppFOJD5 USkl54p8xzHqnoSHV4SidmiQr6adUlnZhJFcr/0ODTd74+7+08KjhIiNbO+HY0lx EKrW7lmcXCbr5zvHHJMODbYkgYf0iQ/RawRxU/VZ4GQzFT+92ep0qKENDcDTmE8F 9OBIgdOw6kt7p41LM/H6XxHQMLRnVne/2btUxmg7nWfESTyn+2iPp749X2qhuPeW ufUQVGqajlQIklGVVcG0sHxfOFjvZEqNQfqEdcP5mK3g0RoIhPw= =k7Vi
-----END PGP SIGNATURE-----
Sasha Levin
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 128 +SUBLEVEL = 129 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm/kernel/setup.c +9 -7
@@ -544,9 +544,11 @@ void notrace cpu_init(void)* In Thumb-2, msr with an immediate value is not allowed. */ #ifdef CONFIG_THUMB2_KERNEL -#define PLC "r" +#define PLC_l "l" +#define PLC_r "r"#else -#define PLC "I" +#define PLC_l "I" +#define PLC_r "I"#endif /*
@@ -568,15 +570,15 @@ void notrace cpu_init(void) "msr cpsr_c, %9" : : "r" (stk), - PLC (PSR_F_BIT | PSR_I_BIT | IRQ_MODE), + PLC_r (PSR_F_BIT | PSR_I_BIT | IRQ_MODE), "I" (offsetof(struct stack, irq[0])), - PLC (PSR_F_BIT | PSR_I_BIT | ABT_MODE), + PLC_r (PSR_F_BIT | PSR_I_BIT | ABT_MODE), "I" (offsetof(struct stack, abt[0])), - PLC (PSR_F_BIT | PSR_I_BIT | UND_MODE), + PLC_r (PSR_F_BIT | PSR_I_BIT | UND_MODE), "I" (offsetof(struct stack, und[0])), - PLC (PSR_F_BIT | PSR_I_BIT | FIQ_MODE), + PLC_r (PSR_F_BIT | PSR_I_BIT | FIQ_MODE), "I" (offsetof(struct stack, fiq[0])), - PLC (PSR_F_BIT | PSR_I_BIT | SVC_MODE) + PLC_l (PSR_F_BIT | PSR_I_BIT | SVC_MODE) : "r14");#endif }
arch/arm64/Makefile +7 -3
@@ -10,7 +10,7 @@ # # Copyright (C) 1995-2001 by Russell King -LDFLAGS_vmlinux :=--no-undefined -X -z norelro +LDFLAGS_vmlinux :=--no-undefined -X CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) GZFLAGS :=-9
@@ -82,17 +82,21 @@ CHECKFLAGS += -D__AARCH64EB__ AS += -EB # Prefer the baremetal ELF build target, but not all toolchains include # it so fall back to the standard linux version if needed. -KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb) +KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb -z norelro) UTS_MACHINE := aarch64_be else KBUILD_CPPFLAGS += -mlittle-endian CHECKFLAGS += -D__AARCH64EL__ AS += -EL # Same as above, prefer ELF but fall back to linux target if needed. -KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux) +KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux -z norelro) UTS_MACHINE := aarch64 endif +ifeq ($(CONFIG_LD_IS_LLD), y) +KBUILD_LDFLAGS += -z norelro +endif + CHECKFLAGS += -D__aarch64__ ifeq ($(CONFIG_ARM64_MODULE_PLTS),y)
arch/mips/generic/board-boston.its.S +5 -5
@@ -1,22 +1,22 @@ / { images { - fdt@boston { + fdt-boston { description = "img,boston Device Tree"; data = /incbin/("boot/dts/img/boston.dtb"); type = "flat_dt"; arch = "mips"; compression = "none"; - hash@0 { + hash { algo = "sha1"; }; }; }; configurations { - conf@boston { + conf-boston { description = "Boston Linux kernel"; - kernel = "kernel@0"; - fdt = "fdt@boston"; + kernel = "kernel"; + fdt = "fdt-boston"; }; }; };
arch/mips/generic/board-ni169445.its.S +5 -5
@@ -1,22 +1,22 @@ / { images { - fdt@ni169445 { + fdt-ni169445 { description = "NI 169445 device tree"; data = /incbin/("boot/dts/ni/169445.dtb"); type = "flat_dt"; arch = "mips"; compression = "none"; - hash@0 { + hash { algo = "sha1"; }; }; }; configurations { - conf@ni169445 { + conf-ni169445 { description = "NI 169445 Linux Kernel"; - kernel = "kernel@0"; - fdt = "fdt@ni169445"; + kernel = "kernel"; + fdt = "fdt-ni169445"; }; }; };
arch/mips/generic/board-ocelot.its.S +10 -10
@@ -1,40 +1,40 @@ /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ / { images { - fdt@ocelot_pcb123 { + fdt-ocelot_pcb123 { description = "MSCC Ocelot PCB123 Device Tree"; data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb"); type = "flat_dt"; arch = "mips"; compression = "none"; - hash@0 { + hash { algo = "sha1"; }; }; - fdt@ocelot_pcb120 { + fdt-ocelot_pcb120 { description = "MSCC Ocelot PCB120 Device Tree"; data = /incbin/("boot/dts/mscc/ocelot_pcb120.dtb"); type = "flat_dt"; arch = "mips"; compression = "none"; - hash@0 { + hash { algo = "sha1"; }; }; }; configurations { - conf@ocelot_pcb123 { + conf-ocelot_pcb123 { description = "Ocelot Linux kernel"; - kernel = "kernel@0"; - fdt = "fdt@ocelot_pcb123"; + kernel = "kernel"; + fdt = "fdt-ocelot_pcb123"; }; - conf@ocelot_pcb120 { + conf-ocelot_pcb120 { description = "Ocelot Linux kernel"; - kernel = "kernel@0"; - fdt = "fdt@ocelot_pcb120"; + kernel = "kernel"; + fdt = "fdt-ocelot_pcb120"; }; }; };
arch/mips/generic/board-xilfpga.its.S +5 -5
@@ -1,22 +1,22 @@ / { images { - fdt@xilfpga { + fdt-xilfpga { description = "MIPSfpga (xilfpga) Device Tree"; data = /incbin/("boot/dts/xilfpga/nexys4ddr.dtb"); type = "flat_dt"; arch = "mips"; compression = "none"; - hash@0 { + hash { algo = "sha1"; }; }; }; configurations { - conf@xilfpga { + conf-xilfpga { description = "MIPSfpga Linux kernel"; - kernel = "kernel@0"; - fdt = "fdt@xilfpga"; + kernel = "kernel"; + fdt = "fdt-xilfpga"; }; }; };
arch/mips/generic/vmlinux.its.S +5 -5
@@ -6,7 +6,7 @@ #address-cells = <ADDR_CELLS>; images { - kernel@0 { + kernel { description = KERNEL_NAME; data = /incbin/(VMLINUX_BINARY); type = "kernel";
@@ -15,18 +15,18 @@ compression = VMLINUX_COMPRESSION; load = /bits/ ADDR_BITS <VMLINUX_LOAD_ADDRESS>; entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>; - hash@0 { + hash { algo = "sha1"; }; }; }; configurations { - default = "conf@default"; + default = "conf-default"; - conf@default { + conf-default { description = "Generic Linux kernel"; - kernel = "kernel@0"; + kernel = "kernel"; }; }; };
arch/x86/pci/fixup.c +44 -0
48 lines not on this page · raw message
certs/Kconfig +9 -0
@@ -83,4 +83,13 @@ config SYSTEM_BLACKLIST_HASH_LIST wrapper to incorporate the list into the kernel. Each <hash> should be a string of hex digits. +config SYSTEM_REVOCATION_LIST + bool "Provide system-wide ring of revocation certificates" + depends on SYSTEM_BLACKLIST_KEYRING + depends on PKCS7_MESSAGE_PARSER=y + help + If set, this allows revocation certificates to be stored in the + blacklist keyring and implements a hook whereby a PKCS#7 message can + be checked to see if it matches such a certificate. + endmenu
certs/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o +obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"") obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
certs/blacklist.c +52 -0
58 lines not on this page · raw message
certs/blacklist.h +2 -0
@@ -1,3 +1,5 @@#include <linux/kernel.h> +#include <linux/errno.h> +#include <crypto/pkcs7.h> extern const char __initconst *const blacklist_hashes[];
certs/common.c new file +57 -0
57 lines not on this page · raw message
certs/common.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef _CERT_COMMON_H +#define _CERT_COMMON_H + +int load_certificate_list (const u8 cert_list[],const unsigned long list_size, +const struct key *keyring); + +#endif
certs/system_keyring.c +9 -46
75 lines not on this page · raw message
drivers/dma/mediatek/mtk-uart-apdma.c +14 -13
@@ -131,10 +131,7 @@ static unsigned int mtk_uart_apdma_read(struct mtk_chan *c, unsigned int reg)static void mtk_uart_apdma_desc_free (struct virt_dma_desc *vd) { -struct dma_chan *chan = vd->tx.chan; -struct mtk_chan *c =to_mtk_uart_apdma_chan (chan); - -kfree (c->desc); +kfree (container_of(vd ,struct mtk_uart_apdma_desc ,vd )); }static void mtk_uart_apdma_start_tx (struct mtk_chan *c)
@@ -207,14 +204,9 @@ static void mtk_uart_apdma_start_rx(struct mtk_chan *c)static void mtk_uart_apdma_tx_handler (struct mtk_chan *c) { -struct mtk_uart_apdma_desc *d = c->desc; -mtk_uart_apdma_write (c,VFF_INT_FLAG ,VFF_TX_INT_CLR_B );mtk_uart_apdma_write (c,VFF_INT_EN ,VFF_INT_EN_CLR_B );mtk_uart_apdma_write (c,VFF_EN ,VFF_EN_CLR_B ); - -list_del (&d->vd.node); -vchan_cookie_complete (&d->vd); }static void mtk_uart_apdma_rx_handler (struct mtk_chan *c)
@@ -245,9 +237,17 @@ static void mtk_uart_apdma_rx_handler(struct mtk_chan *c) c->rx_status = d->avail_len - cnt;mtk_uart_apdma_write (c,VFF_RPT , wg); +} -list_del (&d->vd.node); -vchan_cookie_complete (&d->vd); +static void mtk_uart_apdma_chan_complete_handler (struct mtk_chan *c) +{ +struct mtk_uart_apdma_desc *d = c->desc; + +if (d) { +list_del (&d->vd.node); +vchan_cookie_complete (&d->vd); + c->desc =NULL ; + } }static irqreturn_t mtk_uart_apdma_irq_handler (int irq,void *dev_id)
@@ -261,6 +261,7 @@ static irqreturn_t mtk_uart_apdma_irq_handler(int irq, void *dev_id)mtk_uart_apdma_rx_handler (c); else if (c->dir == DMA_MEM_TO_DEV) mtk_uart_apdma_tx_handler(c); +mtk_uart_apdma_chan_complete_handler (c );spin_unlock_irqrestore (&c->vc.lock, flags);return IRQ_HANDLED ;
@@ -348,7 +349,7 @@ static struct dma_async_tx_descriptor *mtk_uart_apdma_prep_slave_sgreturn NULL ;/* Now allocate and setup the descriptor */ - d =kzalloc (sizeof (*d),GFP_ATOMIC ); + d =kzalloc (sizeof (*d),GFP_NOWAIT );if (!d)return NULL ;
@@ -366,7 +367,7 @@ static void mtk_uart_apdma_issue_pending(struct dma_chan *chan)unsigned long flags;spin_lock_irqsave (&c->vc.lock, flags); -if (vchan_issue_pending (&c->vc)) { +if (vchan_issue_pending (&c->vc) && !c->desc) { vd =vchan_next_desc (&c->vc); c->desc =to_mtk_uart_apdma_desc (&vd->tx);
drivers/dma/sh/rcar-dmac.c +1 -1
@@ -1855,7 +1855,7 @@ static int rcar_dmac_probe(struct platform_device *pdev)/* Enable runtime PM and initialize the device. */ pm_runtime_enable (&pdev->dev); - ret =pm_runtime_get_sync (&pdev->dev); + ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) {dev_err (&pdev->dev,"runtime PM get sync failed (%d)\n" , ret);return ret;
drivers/dma/xilinx/zynqmp_dma.c +1 -1
@@ -467,7 +467,7 @@ static int zynqmp_dma_alloc_chan_resources(struct dma_chan *dchan)struct zynqmp_dma_desc_sw *desc;int i, ret; - ret =pm_runtime_get_sync (chan->dev); + ret =pm_runtime_resume_and_get (chan->dev);if (ret <0 )return ret;
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -5
@@ -3416,12 +3416,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)if (ring->use_doorbell) {WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_LOWER, (adev->doorbell_index.kiq *2 ) <<2 ); -/* If GC has entered CGPG, ringing doorbell > first page doesn't -* wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround -* this issue. -*/ WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_UPPER, - (adev->doorbell.size -4 )); + (adev->doorbell_index.userqueue_end *2 ) <<2 ); } WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -5
@@ -3593,12 +3593,8 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)if (ring->use_doorbell) {WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_LOWER, (adev->doorbell_index.kiq *2 ) <<2 ); -/* If GC has entered CGPG, ringing doorbell > first page doesn't -* wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround -* this issue. -*/ WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_UPPER, - (adev->doorbell.size -4 )); + (adev->doorbell_index.userqueue_end *2 ) <<2 ); } WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
drivers/gpu/drm/nouveau/nouveau_prime.c +16 -1
@@ -112,7 +112,22 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)if (ret)return -EINVAL ; -return 0 ; + ret =ttm_bo_reserve (&nvbo->bo, false, false,NULL ); +if (ret) + goto error; + +if (nvbo->bo.moving) + ret =dma_fence_wait (nvbo->bo.moving, true); + +ttm_bo_unreserve (&nvbo->bo); +if (ret) + goto error; + +return ret; + +error: +nouveau_bo_unpin (nvbo); +return ret; }void nouveau_gem_prime_unpin (struct drm_gem_object *obj)
drivers/gpu/drm/radeon/radeon_prime.c +13 -3
@@ -94,9 +94,19 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)/* pin buffer into GTT */ ret =radeon_bo_pin (bo,RADEON_GEM_DOMAIN_GTT ,NULL ); -if (likely (ret ==0 )) - bo->prime_shared_count++; - +if (unlikely (ret)) + goto error; + +if (bo->tbo.moving) { + ret =dma_fence_wait (bo->tbo.moving, false); +if (unlikely (ret)) { +radeon_bo_unpin (bo); + goto error; + } + } + + bo->prime_shared_count++; +error:radeon_bo_unreserve (bo);return ret; }
drivers/i2c/busses/i2c-robotfuzz-osif.c +2 -2
@@ -83,7 +83,7 @@ static int osif_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, } } - ret =osif_usb_read (adapter,OSIFI2C_STOP ,0 ,0 ,NULL ,0 ); + ret =osif_usb_write (adapter,OSIFI2C_STOP ,0 ,0 ,NULL ,0 );if (ret) {dev_err (&adapter->dev,"failure sending STOP\n" );return -EREMOTEIO ;
@@ -153,7 +153,7 @@ static int osif_probe(struct usb_interface *interface,* Set bus frequency. The frequency is: * 120,000,000 / ( 16 + 2 * div * 4^prescale). * Using dev = 52, prescale = 0 give 100KHz */ - ret =osif_usb_read (&priv->adapter,OSIFI2C_SET_BIT_RATE ,52 ,0 , + ret =osif_usb_write (&priv->adapter,OSIFI2C_SET_BIT_RATE ,52 ,0 ,NULL ,0 );if (ret) {dev_err (&interface->dev,"failure sending bit rate" );
drivers/mmc/host/meson-gx-mmc.c +45 -5
80 lines not on this page · raw message
drivers/net/caif/caif_serial.c +1 -0
@@ -351,6 +351,7 @@ static int ldisc_open(struct tty_struct *tty)rtnl_lock (); result =register_netdevice (dev);if (result) { +tty_kref_put (tty);rtnl_unlock ();free_netdev (dev);return -ENODEV ;
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +3 -1
@@ -1293,9 +1293,11 @@ int qed_dcbx_get_config_params(struct qed_hwfn *p_hwfn, p_hwfn->p_dcbx_info->set.ver_num |=DCBX_CONFIG_VERSION_STATIC ; p_hwfn->p_dcbx_info->set.enabled = dcbx_info->operational.enabled; +BUILD_BUG_ON (sizeof (dcbx_info->operational.params) != +sizeof (p_hwfn->p_dcbx_info->set.config.params));memcpy (&p_hwfn->p_dcbx_info->set.config.params, &dcbx_info->operational.params, -sizeof (struct qed_dcbx_admin_params )); +sizeof (p_hwfn->p_dcbx_info->set.config.params)); p_hwfn->p_dcbx_info->set.config.valid = true;memcpy (params, &p_hwfn->p_dcbx_info->set,sizeof (struct qed_dcbx_set ));
drivers/net/ethernet/realtek/r8169_main.c +1 -1
@@ -1801,7 +1801,7 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data) {switch (stringset) {case ETH_SS_STATS : -memcpy (data, *rtl8169_gstrings,sizeof (rtl8169_gstrings)); +memcpy (data, rtl8169_gstrings,sizeof (rtl8169_gstrings));break ; } }
drivers/net/ethernet/renesas/sh_eth.c +1 -1
@@ -2322,7 +2322,7 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data) {switch (stringset) {case ETH_SS_STATS : -memcpy (data, *sh_eth_gstrings_stats, +memcpy (data, sh_eth_gstrings_stats,sizeof (sh_eth_gstrings_stats));break ; }
drivers/net/ethernet/xilinx/ll_temac_main.c +18 -1
@@ -770,12 +770,15 @@ static void temac_start_xmit_done(struct net_device *ndev) stat =be32_to_cpu (cur_p->app0);while (stat &STS_CTRL_APP0_CMPLT ) { +/* Make sure that the other fields are read after bd is +* released by dma +*/ +rmb ();dma_unmap_single (ndev->dev.parent,be32_to_cpu (cur_p->phys),be32_to_cpu (cur_p->len),DMA_TO_DEVICE ); skb = (struct sk_buff *)ptr_from_txbd (cur_p);if (skb)dev_consume_skb_irq (skb); - cur_p->app0 =0 ; cur_p->app1 =0 ; cur_p->app2 =0 ; cur_p->app3 =0 ;
@@ -784,6 +787,12 @@ static void temac_start_xmit_done(struct net_device *ndev) ndev->stats.tx_packets++; ndev->stats.tx_bytes +=be32_to_cpu (cur_p->len); +/* app0 must be visible last, as it is used to flag +* availability of the bd +*/ +smp_mb (); + cur_p->app0 =0 ; + lp->tx_bd_ci++;if (lp->tx_bd_ci >=TX_BD_NUM ) lp->tx_bd_ci =0 ;
@@ -810,6 +819,9 @@ static inline int temac_check_tx_bd_space(struct temac_local *lp, int num_frag)if (cur_p->app0)return NETDEV_TX_BUSY ; +/* Make sure to read next bd app0 after this one */ +rmb (); + tail++;if (tail >=TX_BD_NUM ) tail =0 ;
@@ -927,6 +939,11 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)wmb (); lp->dma_out (lp,TX_TAILDESC_PTR , tail_p);/* DMA start */ +if (temac_check_tx_bd_space (lp,MAX_SKB_FRAGS +1 )) { +netdev_info (ndev,"%s -> netif_stop_queue\n" , __func__); +netif_stop_queue (ndev); + } +return NETDEV_TX_OK ; }
drivers/net/phy/dp83867.c +1 -5
@@ -468,16 +468,12 @@ static int dp83867_phy_reset(struct phy_device *phydev) {int err; - err =phy_write (phydev,DP83867_CTRL ,DP83867_SW_RESET ); + err =phy_write (phydev,DP83867_CTRL ,DP83867_SW_RESTART );if (err <0 )return err;usleep_range (10 ,20 ); -/* After reset FORCE_LINK_GOOD bit is set. Although the -* default value should be unset. Disable FORCE_LINK_GOOD -* for the phy to work properly. -*/ return phy_modify (phydev,MII_DP83867_PHYCTRL ,DP83867_PHYCR_FORCE_LINK_GOOD ,0 ); }
drivers/net/usb/r8152.c +1 -1
@@ -5065,7 +5065,7 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) {switch (stringset) {case ETH_SS_STATS : -memcpy (data, *rtl8152_gstrings,sizeof (rtl8152_gstrings)); +memcpy (data, rtl8152_gstrings,sizeof (rtl8152_gstrings));break ; } }
drivers/net/wireless/mac80211_hwsim.c +5 -0
@@ -1458,8 +1458,13 @@ static int mac80211_hwsim_start(struct ieee80211_hw *hw)static void mac80211_hwsim_stop (struct ieee80211_hw *hw) {struct mac80211_hwsim_data *data = hw->priv; + data->started = false;hrtimer_cancel (&data->beacon_timer); + +while (!skb_queue_empty (&data->pending)) +ieee80211_free_txskb (hw,skb_dequeue (&data->pending)); +wiphy_dbg (hw->wiphy,"%s\n" , __func__); }
drivers/pci/pci.c +13 -3
@@ -1666,11 +1666,21 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)int err;int i, bars =0 ; -if (atomic_inc_return (&dev->enable_cnt) >1 ) { -pci_update_current_state (dev, dev->current_state); -return 0 ;/* already enabled */ +/* +* Power state could be unknown at this point, either due to a fresh +* boot or a device removal call. So get the current power state +* so that things like MSI message writing will behave as expected +* (e.g. if the device really is in D0 at enable time). +*/ +if (dev->pm_cap) { +u16 pmcsr; +pci_read_config_word (dev, dev->pm_cap +PCI_PM_CTRL , &pmcsr); + dev->current_state = (pmcsr &PCI_PM_CTRL_STATE_MASK ); } +if (atomic_inc_return (&dev->enable_cnt) >1 ) +return 0 ;/* already enabled */ + bridge =pci_upstream_bridge (dev);if (bridge)pci_enable_bridge (bridge);
drivers/pinctrl/stm32/pinctrl-stm32.c +7 -2
@@ -1153,7 +1153,7 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl,struct resource res;struct reset_control *rstc;int npins =STM32_GPIO_PINS_PER_BANK ; -int bank_nr, err; +int bank_nr, err, i =0 ; rstc =of_reset_control_get_exclusive (np,NULL );if (!IS_ERR (rstc))
@@ -1182,9 +1182,14 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl,of_property_read_string (np,"st,bank-name" , &bank->gpio_chip.label); -if (!of_parse_phandle_with_fixed_args (np,"gpio-ranges" ,3 ,0 , &args)) { +if (!of_parse_phandle_with_fixed_args (np,"gpio-ranges" ,3 , i, &args)) { bank_nr = args.args[1 ] /STM32_GPIO_PINS_PER_BANK ; bank->gpio_chip.base = args.args[1 ]; + + npins = args.args[2 ]; +while (!of_parse_phandle_with_fixed_args (np,"gpio-ranges" ,3 , + ++i, &args)) + npins += args.args[2 ]; }else { bank_nr = pctl->nbanks; bank->gpio_chip.base = bank_nr *STM32_GPIO_PINS_PER_BANK ;
drivers/spi/spi-nxp-fspi.c +5 -6
@@ -975,12 +975,6 @@ static int nxp_fspi_probe(struct platform_device *pdev) goto err_put_ctrl; } -/* Clear potential interrupts */ - reg =fspi_readl (f, f->iobase +FSPI_INTR ); -if (reg) -fspi_writel (f, reg, f->iobase +FSPI_INTR ); - -/* find the resources - controller memory mapped space */ res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"fspi_mmap" ); f->ahb_addr =devm_ioremap_resource (dev, res);
@@ -1012,6 +1006,11 @@ static int nxp_fspi_probe(struct platform_device *pdev) goto err_put_ctrl; } +/* Clear potential interrupts */ + reg =fspi_readl (f, f->iobase +FSPI_INTR ); +if (reg) +fspi_writel (f, reg, f->iobase +FSPI_INTR ); +/* find the irq */ ret =platform_get_irq (pdev,0 );if (ret <0 )
fs/nilfs2/sysfs.c +1 -0
@@ -1054,6 +1054,7 @@ void nilfs_sysfs_delete_device_group(struct the_nilfs *nilfs)nilfs_sysfs_delete_superblock_group (nilfs);nilfs_sysfs_delete_segctor_group (nilfs);kobject_del (&nilfs->ns_dev_kobj); +kobject_put (&nilfs->ns_dev_kobj);kfree (nilfs->ns_dev_subgroups); }
include/keys/system_keyring.h +21 -0
@@ -31,16 +31,37 @@ extern int restrict_link_by_builtin_and_secondary_trusted(#define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted#endif +extern struct pkcs7_message *pkcs7;#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING extern int mark_hash_blacklisted (const char *hash);extern int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type); +extern int is_binary_blacklisted (const u8 *hash,size_t hash_len);#else static inline int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type) {return 0 ; } + +static inline int is_binary_blacklisted (const u8 *hash,size_t hash_len) +{ +return 0 ; +} +#endif + +#ifdef CONFIG_SYSTEM_REVOCATION_LIST +extern int add_key_to_revocation_list (const char *data,size_t size); +extern int is_key_on_revocation_list (struct pkcs7_message *pkcs7); +#else +static inline int add_key_to_revocation_list (const char *data,size_t size) +{ +return 0 ; +} +static inline int is_key_on_revocation_list (struct pkcs7_message *pkcs7) +{ +return -ENOKEY ; +}#endif #ifdef CONFIG_IMA_BLACKLIST_KEYRING
include/linux/huge_mm.h +7 -1
@@ -259,6 +259,7 @@ struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long addr,extern vm_fault_t do_huge_pmd_numa_page (struct vm_fault *vmf,pmd_t orig_pmd);extern struct page *huge_zero_page; +extern unsigned long huge_zero_pfn;static inline bool is_huge_zero_page (struct page *page) {
@@ -267,7 +268,7 @@ static inline bool is_huge_zero_page(struct page *page)static inline bool is_huge_zero_pmd (pmd_t pmd) { -return is_huge_zero_page (pmd_page (pmd)); +return READ_ONCE (huge_zero_pfn) ==pmd_pfn (pmd) &&pmd_present (pmd); }static inline bool is_huge_zero_pud (pud_t pud)
@@ -398,6 +399,11 @@ static inline bool is_huge_zero_page(struct page *page)return false; } +static inline bool is_huge_zero_pmd (pmd_t pmd) +{ +return false; +} +static inline bool is_huge_zero_pud (pud_t pud) {return false;
include/linux/hugetlb.h +0 -16
@@ -469,17 +469,6 @@ static inline int hstate_index(struct hstate *h)return h - hstates; } -pgoff_t __basepage_index (struct page *page); - -/* Return page->index in PAGE_SIZE units */ -static inline pgoff_t basepage_index (struct page *page) -{ -if (!PageCompound (page)) -return page->index; - -return __basepage_index (page); -} -extern int dissolve_free_huge_page (struct page *page);extern int dissolve_free_huge_pages (unsigned long start_pfn,unsigned long end_pfn);
@@ -695,11 +684,6 @@ static inline int hstate_index(struct hstate *h)return 0 ; } -static inline pgoff_t basepage_index (struct page *page) -{ -return page->index; -} -static inline int dissolve_free_huge_page (struct page *page) {return 0 ;
include/linux/mm.h +3 -0
@@ -1459,6 +1459,7 @@ struct zap_details {struct address_space *check_mapping;/* Check page->mapping if set */ pgoff_t first_index;/* Lowest page->index to unmap */ pgoff_t last_index;/* Highest page->index to unmap */ +struct page *single_page;/* Locked page to be unmapped */ }; struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
@@ -1505,6 +1506,7 @@ extern vm_fault_t handle_mm_fault(struct vm_area_struct *vma,extern int fixup_user_fault (struct task_struct *tsk,struct mm_struct *mm,unsigned long address,unsigned int fault_flags,bool *unlocked); +void unmap_mapping_page (struct page *page);void unmap_mapping_pages (struct address_space *mapping,pgoff_t start,pgoff_t nr,bool even_cows); void unmap_mapping_range(struct address_space *mapping,
@@ -1525,6 +1527,7 @@ static inline int fixup_user_fault(struct task_struct *tsk,BUG ();return -EFAULT ; } +static inline void unmap_mapping_page (struct page *page) { }static inline void unmap_mapping_pages (struct address_space *mapping,pgoff_t start,pgoff_t nr,bool even_cows) { } static inline void unmap_mapping_range(struct address_space *mapping,
include/linux/mmdebug.h +13 -0
@@ -37,6 +37,18 @@ void dump_mm(const struct mm_struct *mm);BUG (); \ } \ } while (0) +#define VM_WARN_ON_ONCE_PAGE (cond, page) ({ \ + static bool __section(".data.once") __warned; \ + int __ret_warn_once = !!(cond); \ + \ + if (unlikely(__ret_warn_once && !__warned)) { \ + dump_page(page, "VM_WARN_ON_ONCE_PAGE(" __stringify(cond)")");\ + __warned = true; \ + WARN_ON(1); \ + } \ + unlikely(__ret_warn_once); \ +}) +#define VM_WARN_ON (cond) (void)WARN_ON(cond)#define VM_WARN_ON_ONCE (cond) (void)WARN_ON_ONCE(cond) #define VM_WARN_ONCE(cond, format...) (void)WARN_ONCE(cond, format)
@@ -48,6 +60,7 @@ void dump_mm(const struct mm_struct *mm);#define VM_BUG_ON_MM (cond, mm) VM_BUG_ON(cond)#define VM_WARN_ON (cond) BUILD_BUG_ON_INVALID(cond)#define VM_WARN_ON_ONCE (cond) BUILD_BUG_ON_INVALID(cond) +#define VM_WARN_ON_ONCE_PAGE (cond, page) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond) #define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond)#endif
include/linux/pagemap.h +7 -6
@@ -397,7 +397,7 @@ static inline struct page *read_mapping_page(struct address_space *mapping, }/* -* Get index of the page with in radix-tree +* Get index of the page within radix-tree (but not for hugetlb pages). * (TODO: remove once hugetlb pages will have ->index in PAGE_SIZE) */ static inline pgoff_t page_to_index (struct page *page)
@@ -416,15 +416,16 @@ static inline pgoff_t page_to_index(struct page *page)return pgoff; } +extern pgoff_t hugetlb_basepage_index (struct page *page); +/* -* Get the offset in PAGE_SIZE. -* (TODO: hugepage should have ->index in PAGE_SIZE) +* Get the offset in PAGE_SIZE (even for hugetlb pages). +* (TODO: hugetlb pages should have ->index in PAGE_SIZE) */ static inline pgoff_t page_to_pgoff (struct page *page) { -if (unlikely (PageHeadHuge (page))) -return page->index <<compound_order (page); - +if (unlikely (PageHuge (page))) +return hugetlb_basepage_index (page);return page_to_index (page); }
include/linux/rmap.h +2 -1
@@ -98,7 +98,8 @@ enum ttu_flags {* do a final flush if necessary */ TTU_RMAP_LOCKED =0x80 ,/* do not grab rmap lock: * caller holds it */ - TTU_SPLIT_FREEZE = 0x100, /* freeze pte under splitting thp */ +TTU_SPLIT_FREEZE =0x100 ,/* freeze pte under splitting thp */ + TTU_SYNC = 0x200, /* avoid racy checks with PVMW_SYNC */ };#ifdef CONFIG_MMU
include/net/sock.h +7 -3
@@ -1860,7 +1860,8 @@ static inline u32 net_tx_rndhash(void)static inline void sk_set_txhash (struct sock *sk) { - sk->sk_txhash =net_tx_rndhash (); +/* This pairs with READ_ONCE() in skb_set_hash_from_sk() */ +WRITE_ONCE (sk->sk_txhash,net_tx_rndhash ()); }static inline void sk_rethink_txhash (struct sock *sk)
@@ -2125,9 +2126,12 @@ static inline void sock_poll_wait(struct file *filp, struct socket *sock,static inline void skb_set_hash_from_sk (struct sk_buff *skb,struct sock *sk) { -if (sk->sk_txhash) { +/* This pairs with WRITE_ONCE() in sk_set_txhash() */ +u32 txhash =READ_ONCE (sk->sk_txhash); + +if (txhash) { skb->l4_hash =1 ; - skb->hash = sk->sk_txhash; + skb->hash = txhash; } }
init/Kconfig +3 -0
@@ -20,6 +20,9 @@ config GCC_VERSION config CC_IS_CLANG def_bool $(success,$(CC) --version | head -n 1 | grep -q clang) +config LD_IS_LLD + def_bool $(success,$(LD) -v | head -n 1 | grep -q LLD) + config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
kernel/futex.c +1 -1
@@ -737,7 +737,7 @@ again: key->both.offset |=FUT_OFF_INODE ;/* inode-based key */ key->shared.i_seq =get_inode_sequence_number (inode); - key->shared.pgoff =basepage_index (tail); + key->shared.pgoff =page_to_pgoff (tail);rcu_read_unlock (); }
kernel/kthread.c +51 -26
105 lines not on this page · raw message
kernel/module.c +9 -5
@@ -268,9 +268,18 @@ static void module_assert_mutex_or_preempt(void)#endif } +#ifdef CONFIG_MODULE_SIG static bool sig_enforce =IS_ENABLED (CONFIG_MODULE_SIG_FORCE );module_param (sig_enforce, bool_enable_only,0644 ); +void set_module_sig_enforced (void ) +{ + sig_enforce = true; +} +#else +#define sig_enforce false +#endif +/* * Export sig_enforce kernel cmdline parameter to allow other subsystems rely * on that instead of directly to CONFIG_MODULE_SIG_FORCE config.
@@ -281,11 +290,6 @@ bool is_module_sig_enforced(void) }EXPORT_SYMBOL (is_module_sig_enforced); -void set_module_sig_enforced (void ) -{ - sig_enforce = true; -} -/* Block module loading/unloading? */ int modules_disabled =0 ;core_param (nomodule, modules_disabled, bint,0 );
mm/huge_memory.c +29 -27
125 lines not on this page · raw message
mm/hugetlb.c +1 -4
@@ -1461,15 +1461,12 @@ int PageHeadHuge(struct page *page_head)return get_compound_page_dtor (page_head) == free_huge_page; } -pgoff_t __basepage_index (struct page *page) +pgoff_t hugetlb_basepage_index (struct page *page) {struct page *page_head =compound_head (page);pgoff_t index =page_index (page_head);unsigned long compound_idx; -if (!PageHuge (page_head)) -return page_index (page); -if (compound_order (page_head) >=MAX_ORDER ) compound_idx =page_to_pfn (page) -page_to_pfn (page_head);else
mm/internal.h +39 -14
66 lines not on this page · raw message
mm/memory.c +41 -0
54 lines not on this page · raw message
mm/migrate.c +1 -0
@@ -321,6 +321,7 @@ void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep, goto out; page =migration_entry_to_page (entry); + page =compound_head (page);/* * Once page cache replacement of page migration started, page_count
mm/page_vma_mapped.c +99 -61
220 lines not on this page · raw message
mm/pgtable-generic.c +2 -2
@@ -126,8 +126,8 @@ pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address, {pmd_t pmd;VM_BUG_ON (address & ~HPAGE_PMD_MASK ); -VM_BUG_ON ((pmd_present (*pmdp) && !pmd_trans_huge (*pmdp) && - !pmd_devmap (*pmdp)) || !pmd_present (*pmdp)); +VM_BUG_ON (pmd_present (*pmdp) && !pmd_trans_huge (*pmdp) && + !pmd_devmap (*pmdp)); pmd =pmdp_huge_get_and_clear (vma->vm_mm, address, pmdp);flush_pmd_tlb_range (vma, address, address +HPAGE_PMD_SIZE );return pmd;
mm/rmap.c +30 -20
116 lines not on this page · raw message
mm/truncate.c +19 -24
75 lines not on this page · raw message
net/core/ethtool.c +5 -5
@@ -1508,7 +1508,7 @@ static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr,if (eeprom.offset + eeprom.len > total_len)return -EINVAL ; - data =kmalloc (PAGE_SIZE ,GFP_USER ); + data =kzalloc (PAGE_SIZE ,GFP_USER );if (!data)return -ENOMEM ;
@@ -1573,7 +1573,7 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)if (eeprom.offset + eeprom.len > ops->get_eeprom_len (dev))return -EINVAL ; - data =kmalloc (PAGE_SIZE ,GFP_USER ); + data =kzalloc (PAGE_SIZE ,GFP_USER );if (!data)return -ENOMEM ;
@@ -1764,7 +1764,7 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr)return -EFAULT ; test.len = test_len; - data =kmalloc_array (test_len,sizeof (u64),GFP_USER ); + data =kcalloc (test_len,sizeof (u64),GFP_USER );if (!data)return -ENOMEM ;
@@ -2295,7 +2295,7 @@ static int ethtool_get_tunable(struct net_device *dev, void __user *useraddr) ret =ethtool_tunable_valid (&tuna);if (ret)return ret; - data =kmalloc (tuna.len,GFP_USER ); + data =kzalloc (tuna.len,GFP_USER );if (!data)return -ENOMEM ; ret = ops->get_tunable (dev, &tuna, data);
@@ -2481,7 +2481,7 @@ static int get_phy_tunable(struct net_device *dev, void __user *useraddr) ret =ethtool_phy_tunable_valid (&tuna);if (ret)return ret; - data =kmalloc (tuna.len,GFP_USER ); + data =kzalloc (tuna.len,GFP_USER );if (!data)return -ENOMEM ;mutex_lock (&phydev->lock);
net/ipv4/devinet.c +1 -1
@@ -1989,7 +1989,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla)return -EAFNOSUPPORT ;if (nla_parse_nested_deprecated (tb,IFLA_INET_MAX , nla,NULL ,NULL ) <0 ) -BUG (); +return -EINVAL ;if (tb[IFLA_INET_CONF ]) {nla_for_each_nested (a, tb[IFLA_INET_CONF ], rem)
net/ipv4/ping.c +7 -5
@@ -963,6 +963,7 @@ bool ping_rcv(struct sk_buff *skb)struct sock *sk;struct net *net =dev_net (skb->dev);struct icmphdr *icmph =icmp_hdr (skb); +bool rc = false;/* We assume the packet has already been checked by icmp_rcv */
@@ -977,14 +978,15 @@ bool ping_rcv(struct sk_buff *skb)struct sk_buff *skb2 =skb_clone (skb,GFP_ATOMIC );pr_debug ("rcv on socket %p\n" , sk); -if (skb2) -ping_queue_rcv_skb (sk, skb2); +if (skb2 && !ping_queue_rcv_skb (sk, skb2)) + rc = true;sock_put (sk); -return true; } -pr_debug ("no socket, dropping\n" ); -return false; +if (!rc) +pr_debug ("no socket, dropping\n" ); + +return rc; }EXPORT_SYMBOL_GPL (ping_rcv);
net/ipv6/addrconf.c +1 -1
@@ -5761,7 +5761,7 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)return -EAFNOSUPPORT ;if (nla_parse_nested_deprecated (tb,IFLA_INET6_MAX , nla,NULL ,NULL ) <0 ) -BUG (); +return -EINVAL ;if (tb[IFLA_INET6_TOKEN ]) { err =inet6_set_iftoken (idev,nla_data (tb[IFLA_INET6_TOKEN ]));
net/mac80211/ieee80211_i.h +1 -1
@@ -1420,7 +1420,7 @@ ieee80211_get_sband(struct ieee80211_sub_if_data *sdata)rcu_read_lock (); chanctx_conf =rcu_dereference (sdata->vif.chanctx_conf); -if (WARN_ON_ONCE (!chanctx_conf)) { +if (!chanctx_conf) {rcu_read_unlock ();return NULL ; }
net/mac80211/rx.c +3 -6
@@ -2200,17 +2200,15 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) sc =le16_to_cpu (hdr->seq_ctrl); frag = sc &IEEE80211_SCTL_FRAG ; -if (is_multicast_ether_addr (hdr->addr1)) { -I802_DEBUG_INC (rx->local->dot11MulticastReceivedFrameCount); - goto out_no_led; - } -if (rx->sta) cache = &rx->sta->frags;if (likely (!ieee80211_has_morefrags (fc) && frag ==0 )) goto out; +if (is_multicast_ether_addr (hdr->addr1)) +return RX_DROP_MONITOR ; +I802_DEBUG_INC (rx->local->rx_handlers_fragments);if (skb_linearize (rx->skb))
@@ -2336,7 +2334,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) out:ieee80211_led_rx (rx->local); - out_no_led:if (rx->sta) rx->sta->rx_stats.packets++;return RX_CONTINUE ;
net/packet/af_packet.c +17 -15
@@ -2656,7 +2656,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) }if (likely (saddr ==NULL )) { dev =packet_cached_dev_get (po); - proto = po->num; + proto =READ_ONCE (po->num); }else { err = -EINVAL ;if (msg->msg_namelen <sizeof (struct sockaddr_ll ))
@@ -2869,7 +2869,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)if (likely (saddr ==NULL )) { dev =packet_cached_dev_get (po); - proto = po->num; + proto =READ_ONCE (po->num); }else { err = -EINVAL ;if (msg->msg_namelen <sizeof (struct sockaddr_ll ))
@@ -3141,7 +3141,7 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,/* prevents packet_notifier() from calling * register_prot_hook() */ - po->num =0 ; +WRITE_ONCE (po->num,0 );__unregister_prot_hook (sk, true);rcu_read_lock (); dev_curr = po->prot_hook.dev;
@@ -3151,17 +3151,17 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex, }BUG_ON (po->running); - po->num = proto; +WRITE_ONCE (po->num, proto); po->prot_hook.type = proto;if (unlikely (unlisted)) {dev_put (dev); po->prot_hook.dev =NULL ; - po->ifindex =-1 ; +WRITE_ONCE (po->ifindex,-1 );packet_cached_dev_reset (po); }else { po->prot_hook.dev = dev; - po->ifindex = dev ? dev->ifindex :0 ; +WRITE_ONCE (po->ifindex, dev ? dev->ifindex :0 );packet_cached_dev_assign (po, dev); } }
@@ -3475,7 +3475,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr, uaddr->sa_family =AF_PACKET ;memset (uaddr->sa_data,0 ,sizeof (uaddr->sa_data));rcu_read_lock (); - dev =dev_get_by_index_rcu (sock_net (sk),pkt_sk (sk)->ifindex); + dev =dev_get_by_index_rcu (sock_net (sk),READ_ONCE (pkt_sk (sk)->ifindex));if (dev)strlcpy (uaddr->sa_data, dev->name,sizeof (uaddr->sa_data));rcu_read_unlock ();
@@ -3490,16 +3490,18 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,struct sock *sk = sock->sk;struct packet_sock *po =pkt_sk (sk); DECLARE_SOCKADDR(struct sockaddr_ll *, sll, uaddr); +int ifindex;if (peer)return -EOPNOTSUPP ; + ifindex =READ_ONCE (po->ifindex); sll->sll_family =AF_PACKET ; - sll->sll_ifindex = po->ifindex; - sll->sll_protocol = po->num; + sll->sll_ifindex = ifindex; + sll->sll_protocol =READ_ONCE (po->num); sll->sll_pkttype =0 ;rcu_read_lock (); - dev =dev_get_by_index_rcu (sock_net (sk), po->ifindex); + dev =dev_get_by_index_rcu (sock_net (sk), ifindex);if (dev) { sll->sll_hatype = dev->type; sll->sll_halen = dev->addr_len;
@@ -4099,7 +4101,7 @@ static int packet_notifier(struct notifier_block *this, }if (msg ==NETDEV_UNREGISTER ) {packet_cached_dev_reset (po); - po->ifindex =-1 ; +WRITE_ONCE (po->ifindex,-1 );if (po->prot_hook.dev)dev_put (po->prot_hook.dev); po->prot_hook.dev =NULL ;
@@ -4405,7 +4407,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, was_running = po->running; num = po->num;if (was_running) { - po->num =0 ; +WRITE_ONCE (po->num,0 );__unregister_prot_hook (sk, false); }spin_unlock (&po->bind_lock);
@@ -4440,7 +4442,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,spin_lock (&po->bind_lock);if (was_running) { - po->num = num; +WRITE_ONCE (po->num, num);register_prot_hook (sk); }spin_unlock (&po->bind_lock);
@@ -4613,8 +4615,8 @@ static int packet_seq_show(struct seq_file *seq, void *v) s,refcount_read (&s->sk_refcnt), s->sk_type, -ntohs (po->num), - po->ifindex, +ntohs (READ_ONCE (po->num)), +READ_ONCE (po->ifindex), po->running,atomic_read (&s->sk_rmem_alloc), from_kuid_munged(seq_user_ns(seq), sock_i_uid(s)),
net/wireless/util.c +3 -0
@@ -1006,6 +1006,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,case NL80211_IFTYPE_MESH_POINT :/* mesh should be handled? */ break ; +case NL80211_IFTYPE_OCB : +cfg80211_leave_ocb (rdev, dev); +break ;default :break ; }
scripts/recordmcount.h +10 -5
@@ -192,15 +192,20 @@ static unsigned int get_symindex(Elf_Sym const *sym, Elf32_Word const *symtab, Elf32_Word const *symtab_shndx) {unsigned long offset; +unsigned short shndx =w2 (sym->st_shndx);int index; -if (sym->st_shndx !=SHN_XINDEX ) -return w2 (sym->st_shndx); +if (shndx >SHN_UNDEF && shndx <SHN_LORESERVE ) +return shndx; - offset = (unsigned long )sym - (unsigned long )symtab; - index = offset /sizeof (*sym); +if (shndx ==SHN_XINDEX ) { + offset = (unsigned long )sym - (unsigned long )symtab; + index = offset /sizeof (*sym); -return w (symtab_shndx[index]); +return w (symtab_shndx[index]); + } + +return 0 ; }static unsigned int get_shnum (Elf_Ehdr const *ehdr,Elf_Shdr const *shdr0)
security/integrity/Makefile +2 -1
@@ -11,7 +11,8 @@ integrity-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o integrity-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ - platform_certs/load_uefi.o + platform_certs/load_uefi.o \ + platform_certs/keyring_handler.o integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o obj-$(CONFIG_IMA) += ima/
security/integrity/platform_certs/keyring_handler.c new file +91 -0
91 lines not on this page · raw message
security/integrity/platform_certs/keyring_handler.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef PLATFORM_CERTS_INTERNAL_H +#define PLATFORM_CERTS_INTERNAL_H + +#include <linux/efi.h> + +void blacklist_hash (const char *source,const void *data, +size_t len,const char *type, +size_t type_len); + +/* +* Blacklist an X509 TBS hash. +*/ +void blacklist_x509_tbs (const char *source,const void *data,size_t len); + +/* +* Blacklist the hash of an executable. +*/ +void blacklist_binary (const char *source,const void *data,size_t len); + +/* +* Return the handler for particular signature list types found in the db. +*/ +efi_element_handler_t get_handler_for_db (const efi_guid_t *sig_type); + +/* +* Return the handler for particular signature list types found in the dbx. +*/ +efi_element_handler_t get_handler_for_dbx (const efi_guid_t *sig_type); + +#endif
security/integrity/platform_certs/load_uefi.c +1 -66
79 lines not on this page · raw message
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -54,7 +54,7 @@ int kvm_check_cap(long cap)exit (KSFT_SKIP ); ret =ioctl (kvm_fd,KVM_CHECK_EXTENSION , cap); -TEST_ASSERT (ret !=-1 ,"KVM_CHECK_EXTENSION IOCTL failed,\n" +TEST_ASSERT (ret >=0 ,"KVM_CHECK_EXTENSION IOCTL failed,\n" " rc: %i errno: %i" , ret, errno);close (kvm_fd);
virt/kvm/kvm_main.c +17 -2
@@ -1593,6 +1593,13 @@ static bool vma_is_valid(struct vm_area_struct *vma, bool write_fault)return true; } +static int kvm_try_get_pfn (kvm_pfn_t pfn) +{ +if (kvm_is_reserved_pfn (pfn)) +return 1 ; +return get_page_unless_zero (pfn_to_page (pfn)); +} + static int hva_to_pfn_remapped(struct vm_area_struct *vma, unsigned long addr, bool *async, bool write_fault, bool *writable,
@@ -1642,13 +1649,21 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma,* Whoever called remap_pfn_range is also going to call e.g. * unmap_mapping_range before the underlying pages are freed, * causing a call to our MMU notifier. +* +* Certain IO or PFNMAP mappings can be backed with valid +* struct pages, but be allocated without refcounting e.g., +* tail pages of non-compound higher order allocations, which +* would then underflow the refcount when the caller does the +* required put_page. Don't allow those pages here. */ -kvm_get_pfn (pfn); +if (!kvm_try_get_pfn (pfn)) + r = -EFAULT ; out:pte_unmap_unlock (ptep, ptl); *p_pfn = pfn; -return 0 ; + +return r; }/*
Samuel Zou
Tested-by Hulk RobotQuoted 7 lines · Sasha Levin
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512I'm announcing the release of the 5.4.129 kernel.
All users of the 5.4 kernel series must upgrade.
Quoted 9 lines
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summaryThanks,
Sasha
Tested on arm64 and x86 for 5.4.129,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-5.4.y
Version: 5.4.129
Commit: 82ffbc138a1fc9076f55e626bd8352fc9a2ca9e9
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8905
passed: 8905
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8905
passed: 8905
failed: 0
timeout: 0
--------------------------------------------------------------------