October 2022 - Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS] nilfs2: fix use-after-free bug of struct nilfs_root
by Yongqiang Liu 27 Oct '22

27 Oct '22

From: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> mainline inclusion from mainline-v6.1-rc1 commit d325dc6eb763c10f591c239550b8c7e5466a5d09 category: bugfix bugzilla: 187877,https://gitee.com/src-openeuler/kernel/issues/I5X3MX CVE: CVE-2022-3649 -------------------------------- If the beginning of the inode bitmap area is corrupted on disk, an inode with the same inode number as the root inode can be allocated and fail soon after. In this case, the subsequent call to nilfs_clear_inode() on that bogus root inode will wrongly decrement the reference counter of struct nilfs_root, and this will erroneously free struct nilfs_root, causing kernel oopses. This fixes the problem by changing nilfs_new_inode() to skip reserved inode numbers while repairing the inode bitmap. Link: https://lkml.kernel.org/r/20221003150519.39789-1-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> Reported-by: syzbot+b8c672b0e22615c80fe0(a)syzkaller.appspotmail.com Reported-by: Khalid Masum <khalid.masum.92(a)gmail.com> Tested-by: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Conflict: fs/nilfs2/inode.c Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- fs/nilfs2/inode.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 671085512e0f..ca380c6d7825 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -335,6 +335,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) struct inode *inode; struct nilfs_inode_info *ii; struct nilfs_root *root; + struct buffer_head *bh; int err = -ENOMEM; ino_t ino; @@ -350,11 +351,26 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) ii->i_state = BIT(NILFS_I_NEW); ii->i_root = root; - err = nilfs_ifile_create_inode(root->ifile, &ino, &ii->i_bh); + err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); if (unlikely(err)) goto failed_ifile_create_inode; /* reference count of i_bh inherits from nilfs_mdt_read_block() */ + if (unlikely(ino < NILFS_USER_INO)) { + nilfs_msg(sb, KERN_WARNING, + "inode bitmap is inconsistent for reserved inodes"); + do { + brelse(bh); + err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); + if (unlikely(err)) + goto failed_ifile_create_inode; + } while (ino < NILFS_USER_INO); + + nilfs_msg(sb, KERN_INFO, + "repaired inode bitmap for reserved inodes"); + } + ii->i_bh = bh; + atomic64_inc(&root->inodes_count); inode_init_owner(inode, dir, mode); inode->i_ino = ino; -- 2.25.1

1 0

[PATCH openEuler-5.10-LTS] nilfs2: fix use-after-free bug of struct nilfs_root
by Zheng Zengkai 27 Oct '22

27 Oct '22

From: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> stable inclusion from stable-v5.10.148 commit 21ee3cffed8fbabb669435facfd576ba18ac8652 category: bugfix bugzilla:187877,https://gitee.com/src-openeuler/kernel/issues/I5X3MX CVE: CVE-2022-3649 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit d325dc6eb763c10f591c239550b8c7e5466a5d09 upstream. If the beginning of the inode bitmap area is corrupted on disk, an inode with the same inode number as the root inode can be allocated and fail soon after. In this case, the subsequent call to nilfs_clear_inode() on that bogus root inode will wrongly decrement the reference counter of struct nilfs_root, and this will erroneously free struct nilfs_root, causing kernel oopses. This fixes the problem by changing nilfs_new_inode() to skip reserved inode numbers while repairing the inode bitmap. Link: https://lkml.kernel.org/r/20221003150519.39789-1-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> Reported-by: syzbot+b8c672b0e22615c80fe0(a)syzkaller.appspotmail.com Reported-by: Khalid Masum <khalid.masum.92(a)gmail.com> Tested-by: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- fs/nilfs2/inode.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 95684fa3c985..3e4874b0c55c 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -332,6 +332,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) struct inode *inode; struct nilfs_inode_info *ii; struct nilfs_root *root; + struct buffer_head *bh; int err = -ENOMEM; ino_t ino; @@ -347,11 +348,25 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) ii->i_state = BIT(NILFS_I_NEW); ii->i_root = root; - err = nilfs_ifile_create_inode(root->ifile, &ino, &ii->i_bh); + err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); if (unlikely(err)) goto failed_ifile_create_inode; /* reference count of i_bh inherits from nilfs_mdt_read_block() */ + if (unlikely(ino < NILFS_USER_INO)) { + nilfs_warn(sb, + "inode bitmap is inconsistent for reserved inodes"); + do { + brelse(bh); + err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); + if (unlikely(err)) + goto failed_ifile_create_inode; + } while (ino < NILFS_USER_INO); + + nilfs_info(sb, "repaired inode bitmap for reserved inodes"); + } + ii->i_bh = bh; + atomic64_inc(&root->inodes_count); inode_init_owner(inode, dir, mode); inode->i_ino = ino; -- 2.20.1

1 0

[PATCH openEuler-5.10-LTS 01/31] ubifs: Rectify space budget for ubifs_symlink() if symlink is encrypted
by Zheng Zengkai 26 Oct '22

26 Oct '22

From: Zhihao Cheng <chengzhihao1(a)huawei.com> hulk inclusion category: bugfix bugzilla: 187685, https://gitee.com/openeuler/kernel/issues/I5VVZX CVE: NA -------------------------------- Fix bad space budget when symlink file is encrypted. Bad space budget may let make_reservation() return with -ENOSPC, which could turn ubifs to read-only mode in do_writepage() process. Fetch a reproducer in [Link]. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216490 Fixes: ca7f85be8d6cf9 ("ubifs: Add support for encrypted symlinks") Signed-off-by: Zhihao Cheng <chengzhihao1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- fs/ubifs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index f5777f59a101..b73904c1fbf7 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1145,7 +1145,6 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, int err, sz_change, len = strlen(symname); struct fscrypt_str disk_link; struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, - .new_ino_d = ALIGN(len, 8), .dirtied_ino = 1 }; struct fscrypt_name nm; @@ -1161,6 +1160,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, * Budget request settings: new inode, new direntry and changing parent * directory inode. */ + req.new_ino_d = ALIGN(disk_link.len - 1, 8); err = ubifs_budget_space(c, &req); if (err) return err; -- 2.20.1

1 30

[openEuler-5.10-LTS 00/99] Backport 5.10.127 LTS
by Zheng Zengkai 26 Oct '22

26 Oct '22

Backport 5.10.127 LTS patches from upstream. git cherry-pick v5.10.126..v5.10.127~1 -s Already merged(-1): 3acb7dc242ca vt: drop old FONT ioctls kabi changed and its related patch(-2): 3ee62a1f0701a nvme: split nvme_alloc_request() ba388d4e9a68 nvme: don't check nvme_req flags for new req Total patches: 102 - 1 - 2 = 99 Aidan MacDonald (1): regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips Alan Stern (2): usb: gadget: Fix non-unique driver names in raw-gadget driver USB: gadget: Fix double-free bug in raw_gadget driver Alexander Stein (1): ARM: dts: imx7: Move hsic_phy power domain to HSIC PHY node Anatolii Gerasymenko (1): ice: ethtool: advertise 1000M speeds properly Andrew Donnellan (1): powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address Andy Shevchenko (1): usb: typec: wcove: Drop wrong dependency to INTEL_SOC_PMIC Baruch Siach (1): iio: adc: vf610: fix conversion mode sysfs node name Carlo Lobrano (1): USB: serial: option: add Telit LE910Cx 0x1250 composition Chaitanya Kulkarni (2): nvme: centralize setting the timeout in nvme_alloc_request nvme: mark nvme_setup_passsthru() inline Chevron Li (1): mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing Christoph Hellwig (1): nvme: move the Samsung X5 quirk entry to the core quirks Claudiu Manoil (1): phy: aquantia: Fix AN when higher speeds than 1G are not advertised Damien Le Moal (1): scsi: scsi_debug: Fix zone transition to full condition Dan Carpenter (1): gpio: winbond: Fix error code in winbond_gpio_get() David Howells (1): afs: Fix dynamic root getattr David Sterba (1): btrfs: add error messages to all unrecognized mount options Dmitry Rokosov (3): iio:chemical:ccs811: rearrange iio trigger get and register iio:accel:bma180: rearrange iio trigger get and register iio:accel:mxc4005: rearrange iio trigger get and register Edward Wu (1): ata: libata: add qc->flags in ata_qc_complete_template tracepoint Enzo Matsumiya (1): nvme-pci: add NO APST quirk for Kioxia device Eric Dumazet (1): erspan: do not assume transport header is always set Florian Westphal (1): netfilter: use get_random_u32 instead of prandom Gerd Hoffmann (1): udmabuf: add back sanity check Haibo Chen (2): iio: mma8452: fix probe fail when device tree compatible is used. iio: accel: mma8452: ignore the return value of reset operation Hans de Goede (1): iio: adc: axp288: Override TS pin bias current for some models Helge Deller (2): parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI parisc: Enable ARCH_HAS_STRICT_MODULE_RWX Hoang Le (1): tipc: fix use-after-free Read in tipc_named_reinit Jaegeuk Kim (1): f2fs: attach inline_data after setting compression Jakub Kicinski (1): Revert "net/tls: fix tls_sk_proto_close executed repeatedly" Jakub Sitnicki (1): bpf, x86: Fix tail call count offset calculation on bpf2bpf call Jason A. Donenfeld (5): random: schedule mix_interrupt_randomness() less often random: quiet urandom warning ratelimit suppression message powerpc/powernv: wire up rng during setup_arch random: update comment from copy_to_user() -> copy_to_iter() powerpc/pseries: wire up rng during setup_arch() Jay Vosburgh (1): bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers Jean-Baptiste Maneyrol (1): iio: imu: inv_icm42600: Fix broken icm42600 (chip id 0 value) Jie2x Zhou (1): selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh Jon Maxwell (1): bpf: Fix request_sock leak in sk lookup helpers Jonathan Marek (1): drm/msm: use for_each_sgtable_sg to iterate over scatterlist Julien Grall (1): x86/xen: Remove undefined behavior in setup_features() Kai-Heng Feng (1): igb: Make DMA faster when CPU is active on the PCIe link Kailang Yang (1): ALSA: hda/realtek - ALC897 headset MIC no sound Keith Busch (1): nvme-pci: allocate nvme_command within driver pdu Kuogee Hsieh (5): drm/msm/dp: check core_initialized before disable interrupts at dp_display_unbind() drm/msm/dp: fixes wrong connection state caused by failure of link train drm/msm/dp: deinitialize mainlink if link training failed drm/msm/dp: promote irq_hpd handle to handle link training correctly drm/msm/dp: fix connect/disconnect handled at irq_hpd Liang He (2): xtensa: xtfpga: Fix refcount leak bug in setup xtensa: Fix refcount leak bug in time.c Lorenzo Bianconi (1): igb: fix a use-after-free issue in igb_clean_tx_ring Lucas Stach (1): ARM: dts: imx6qdl: correct PU regulator ramp delay Macpaul Lin (1): USB: serial: option: add Quectel RM500K module support Masahiro Yamada (2): modpost: fix section mismatch check for exported init/exit sections kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS (2nd attempt) Mathias Nyman (1): xhci: turn off port power in shutdown Maximilian Luz (1): drm/msm: Fix double pm_runtime_disable() call Miaoqian Lin (7): drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf iio: adc: adi-axi-adc: Fix refcount leak in adi_axi_adc_attach_client ARM: exynos: Fix refcount leak in exynos_map_pmu soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe ARM: Fix refcount leak in axxia_boot_secondary memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings ARM: cns3xxx: Fix refcount leak in cns3xxx_init Mikulas Patocka (1): dm mirror log: clear log bits up to BITS_PER_LONG boundary Naveen N. Rao (1): powerpc: Enable execve syscall exit tracepoint Nikos Tsironis (1): dm era: commit metadata in postsuspend after worker stops Olivier Moysan (1): iio: adc: stm32: fix maximum clock rate for stm32mp15x Pablo Neira Ayuso (2): netfilter: nftables: add nft_parse_register_load() and use it netfilter: nftables: add nft_parse_register_store() and use it Peilin Ye (1): net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms Rosemarie O'Riorden (1): net: openvswitch: fix parsing of nw_proto for IPv6 fragments Samuel Holland (1): drm/sun4i: Fix crash during suspend after component bind failure Sascha Hauer (1): mtd: rawnand: gpmi: Fix setting busy timeout setting Soham Sen (1): ALSA: hda/realtek: Add mute LED quirk for HP Omen laptop Stephan Gerhold (1): virtio_net: fix xdp_rxq_info bug after suspend/resume Takashi Iwai (3): ALSA: hda/via: Fix missing beep setup ALSA: hda/conexant: Fix missing beep setup ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly Tanveer Alam (1): xhci-pci: Allow host runtime PM as default for Intel Raptor Lake xHCI Thomas Richter (1): s390/cpumf: Handle events cycles and instructions identical Tim Crawford (2): ALSA: hda/realtek: Add quirk for Clevo PD70PNT ALSA: hda/realtek: Add quirk for Clevo NS50PU Utkarsh Patel (1): xhci-pci: Allow host runtime PM as default for Intel Meteor Lake xHCI Vincent Whitchurch (1): iio: trigger: sysfs: fix use-after-free on remove Xin Long (1): tipc: simplify the finalize work queue Xu Yang (1): usb: chipidea: udc: check request status before setting device address Yannick Brosseau (2): iio: adc: stm32: Fix ADCs iteration in irq handler iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message Yonglin Tan (1): USB: serial: option: add Quectel EM05-G modem Zheyu Ma (1): iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up() Ziyang Xuan (1): net/tls: fix tls_sk_proto_close executed repeatedly huhai (1): MIPS: Remove repetitive increase irq_err_count Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- Makefile | 2 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- arch/arm/mach-axxia/platsmp.c | 1 + arch/arm/mach-cns3xxx/core.c | 2 + arch/arm/mach-exynos/exynos.c | 1 + arch/mips/vr41xx/common/icu.c | 2 - arch/parisc/Kconfig | 1 + arch/parisc/include/asm/fb.h | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/rtas.c | 11 +- arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 ++++-- arch/powerpc/platforms/powernv/setup.c | 2 + arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/rng.c | 11 +- arch/powerpc/platforms/pseries/setup.c | 2 + arch/s390/kernel/perf_cpum_cf.c | 22 ++- arch/x86/net/bpf_jit_comp.c | 3 +- arch/xtensa/kernel/time.c | 1 + arch/xtensa/platforms/xtfpga/setup.c | 1 + drivers/base/regmap/regmap-irq.c | 5 +- drivers/char/random.c | 6 +- drivers/dma-buf/udmabuf.c | 5 +- drivers/gpio/gpio-vr41xx.c | 2 - drivers/gpio/gpio-winbond.c | 7 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 + drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- drivers/gpu/drm/msm/dp/dp_catalog.h | 2 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 40 ++++- drivers/gpu/drm/msm/dp/dp_display.c | 149 ++++++++++++------ drivers/gpu/drm/msm/dp/dp_panel.c | 5 + drivers/gpu/drm/msm/msm_iommu.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- drivers/iio/accel/bma180.c | 3 +- drivers/iio/accel/mma8452.c | 22 ++- drivers/iio/accel/mxc4005.c | 4 +- drivers/iio/adc/adi-axi-adc.c | 3 + drivers/iio/adc/axp288_adc.c | 8 + drivers/iio/adc/stm32-adc-core.c | 9 +- drivers/iio/adc/stm32-adc.c | 10 -- drivers/iio/chemical/ccs811.c | 4 +- drivers/iio/gyro/mpu3050-core.c | 1 + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + .../iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- drivers/iio/trigger/iio-trig-sysfs.c | 1 + drivers/md/dm-era-target.c | 8 +- drivers/md/dm-log.c | 2 +- drivers/memory/samsung/exynos5422-dmc.c | 29 ++-- drivers/mmc/host/sdhci-pci-o2micro.c | 2 + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 39 ++++- drivers/net/ethernet/intel/igb/igb_main.c | 19 +-- drivers/net/phy/aquantia_main.c | 15 +- drivers/net/virtio_net.c | 25 +-- drivers/nvme/host/core.c | 41 ++++- drivers/nvme/host/lightnvm.c | 3 +- drivers/nvme/host/pci.c | 17 +- drivers/scsi/scsi_debug.c | 22 ++- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + drivers/usb/chipidea/udc.c | 3 + drivers/usb/gadget/legacy/raw_gadget.c | 63 ++++++-- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/host/xhci.c | 15 +- drivers/usb/host/xhci.h | 2 + drivers/usb/serial/option.c | 6 + drivers/usb/typec/tcpm/Kconfig | 1 - drivers/video/console/sticore.c | 2 + drivers/xen/features.c | 2 +- fs/afs/inode.c | 3 +- fs/btrfs/super.c | 39 ++++- fs/f2fs/namei.c | 17 +- include/linux/ratelimit_types.h | 12 +- include/net/netfilter/nf_tables.h | 10 +- include/net/netfilter/nf_tables_core.h | 12 +- include/net/netfilter/nft_fib.h | 2 +- include/net/netfilter/nft_meta.h | 4 +- include/trace/events/libata.h | 1 + net/bridge/netfilter/nft_meta_bridge.c | 5 +- net/core/filter.c | 34 +++- net/ipv4/ip_gre.c | 15 +- net/ipv4/netfilter/nft_dup_ipv4.c | 18 +-- net/ipv6/ip6_gre.c | 15 +- net/ipv6/netfilter/nft_dup_ipv6.c | 18 +-- net/netfilter/nf_tables_api.c | 52 +++++- net/netfilter/nft_bitwise.c | 23 ++- net/netfilter/nft_byteorder.c | 14 +- net/netfilter/nft_cmp.c | 8 +- net/netfilter/nft_ct.c | 12 +- net/netfilter/nft_dup_netdev.c | 6 +- net/netfilter/nft_dynset.c | 12 +- net/netfilter/nft_exthdr.c | 14 +- net/netfilter/nft_fib.c | 5 +- net/netfilter/nft_fwd_netdev.c | 18 +-- net/netfilter/nft_hash.c | 25 ++- net/netfilter/nft_immediate.c | 6 +- net/netfilter/nft_lookup.c | 14 +- net/netfilter/nft_masq.c | 18 +-- net/netfilter/nft_meta.c | 21 +-- net/netfilter/nft_nat.c | 35 ++-- net/netfilter/nft_numgen.c | 27 ++-- net/netfilter/nft_objref.c | 6 +- net/netfilter/nft_osf.c | 8 +- net/netfilter/nft_payload.c | 10 +- net/netfilter/nft_queue.c | 12 +- net/netfilter/nft_range.c | 6 +- net/netfilter/nft_redir.c | 18 +-- net/netfilter/nft_rt.c | 7 +- net/netfilter/nft_socket.c | 7 +- net/netfilter/nft_tproxy.c | 14 +- net/netfilter/nft_tunnel.c | 8 +- net/netfilter/nft_xfrm.c | 7 +- net/openvswitch/flow.c | 2 +- net/sched/sch_netem.c | 4 +- net/tipc/core.c | 7 +- net/tipc/core.h | 8 +- net/tipc/discover.c | 4 +- net/tipc/link.c | 5 + net/tipc/link.h | 1 + net/tipc/net.c | 15 +- scripts/mod/modpost.c | 2 +- sound/pci/hda/hda_auto_parser.c | 7 +- sound/pci/hda/hda_local.h | 1 + sound/pci/hda/patch_conexant.c | 4 +- sound/pci/hda/patch_realtek.c | 36 ++++- sound/pci/hda/patch_via.c | 4 +- .../selftests/netfilter/nft_concat_range.sh | 2 +- 131 files changed, 949 insertions(+), 532 deletions(-) -- 2.20.1

1 99

[openEuler-5.10-LTS 00/10] Backport 5.10.125 LTS
by Zheng Zengkai 26 Oct '22

26 Oct '22

Backport 5.10.125 LTS patches from upstream. git cherry-pick v5.10.124..v5.10.125~1 -s Already merged(-2): 9429b75bc271 tcp: increase source port perturb table to 2^16 df3f3bb5059d io_uring: add missing item types for various requests Context conflict: 24b922a5da00 tcp: dynamically allocate the perturb table used by source ports Total patches: 12 - 2 = 10 Christian Borntraeger (1): s390/mm: use non-quiescing sske for KVM switch to keyed guest Damien Le Moal (1): zonefs: fix zonefs_iomap_begin() for reads Eric Dumazet (1): tcp: add some entropy in __inet_hash_connect() Lukas Wunner (1): serial: core: Initialize rs485 RTS polarity already on probe Marian Postevca (1): usb: gadget: u_ether: fix regression in setting fixed MAC address Will Deacon (1): arm64: mm: Don't invalidate FROM_DEVICE buffers at start of DMA transfer Willy Tarreau (4): tcp: use different parts of the port_offset for index and offset tcp: add small random increments to the source port tcp: dynamically allocate the perturb table used by source ports tcp: drop the hash_32() part from the index calculation arch/arm64/mm/cache.S | 2 - arch/s390/mm/pgtable.c | 2 +- drivers/tty/serial/serial_core.c | 34 ++++------ drivers/usb/gadget/function/u_ether.c | 11 +++- fs/zonefs/super.c | 92 ++++++++++++++++++--------- net/ipv4/inet_hashtables.c | 22 +++++-- 6 files changed, 102 insertions(+), 61 deletions(-) -- 2.20.1

1 10

[PATCH openEuler-5.10-LTS 00/80] Backport 5.10.124 LTS
by Zheng Zengkai 26 Oct '22

26 Oct '22

Backport 5.10.124 LTS patches from upstream. git cherry-pick v5.10.123..v5.10.124~1 -s Already merged(-3): 2c9548bc2650 powerpc/kasan: Silence KASAN warnings in __get_wchan() 6fdaf31ad5f3 ext4: fix bug_on ext4_mb_use_inode_pa 0ca74dacfd47 ext4: make variable "count" signed Context conflict: 4603a37f6eae random: credit cpu and bootloader seeds by default Total patches: 83 - 3 = 80 Adam Ford (2): arm64: dts: imx8mm-beacon: Enable RTS-CTS on UART3 ASoC: wm8962: Fix suspend while playing music Al Viro (1): 9p: missing chunk of "fs/9p: Don't update file type when updating file attributes" Alan Previn (1): drm/i915/reset: Fix error_state_read ptr + offset use Aleksandr Loktionov (1): i40e: Fix call trace in setup_tx_descriptors Alexander Usyskin (1): mei: me: add raptor lake point S DID Andy Chi (1): ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machine Ashish Kalra (1): KVM: SVM: Use kzalloc for sev ioctl interfaces to prevent kernel data leak Bart Van Assche (1): block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Charles Keepax (6): ASoC: cs42l52: Fix TLV scales for mixer controls ASoC: cs35l36: Update digital volume TLV ASoC: cs53l30: Correct number of volume levels on SX controls ASoC: cs42l52: Correct TLV for Bypass Volume ASoC: cs42l56: Correct typo in minimum level for SX volume controls ASoC: cs42l51: Correct minimum value for SX volume control Chen Lin (1): net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag Chengguang Xu (2): scsi: ipr: Fix missing/incorrect resource cleanup in error case scsi: pmcraid: Fix missing resource cleanup in error case Christophe JAILLET (1): net: bgmac: Fix an erroneous kfree() in bgmac_remove() Daniel Wagner (1): nvme: use sysfs_emit instead of sprintf Davide Caratti (1): net/sched: act_police: more accurate MTU policing Duoming Zhou (1): net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg Grzegorz Szczurek (2): i40e: Fix adding ADQ filter to TC0 i40e: Fix calculating the number of queue pairs Hui Wang (1): ASoC: nau8822: Add operation for internal PLL off and on Ian Abbott (1): comedi: vmk80xx: fix expression for tx buffer size Ilpo Järvinen (1): serial: 8250: Store to lsr_save_flags after lsr read Ilya Maximets (1): net: openvswitch: fix misuse of the cached connection on tuple changes James Smart (2): scsi: lpfc: Fix port stuck in bypassed state after LIP in PT2PT topology scsi: lpfc: Allow reduced polling rate for nvme_admin_async_event cmd completion Jason A. Donenfeld (2): random: credit cpu and bootloader seeds by default crypto: memneq - move into lib/ Jiasheng Jiang (1): i2c: npcm7xx: Add check for platform_driver_register Josh Poimboeuf (1): faddr2line: Fix overlapping text section failures, the sequel Linus Torvalds (1): mellanox: mlx5: avoid uninitialized variable warning with gcc-12 Marc Zyngier (1): KVM: arm64: Don't read a HW interrupt pending state in user context Marius Hoch (1): Input: soc_button_array - also add Lenovo Yoga Tablet2 1051F to dmi_use_low_level_irq Mark Brown (2): ASoC: es8328: Fix event generation for deemphasis control ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put() Mark Rutland (2): arm64: ftrace: fix branch range checks arm64: ftrace: consistently handle PLTs. Masahiro Yamada (3): clocksource: hyper-v: unexport __init-annotated hv_init_clocksource() certs/blacklist_hashes.c: fix const confusion in certs blacklist powerpc/book3e: get rid of #include <generated/compile.h> Matthew Wilcox (Oracle) (1): quota: Prevent memory allocation recursion while holding dq_lock Miaoqian Lin (6): misc: atmel-ssc: Fix IRQ check in ssc_probe irqchip/gic/realview: Fix refcount leak in realview_gic_of_init irqchip/gic-v3: Fix error handling in gic_populate_ppi_partitions irqchip/gic-v3: Fix refcount leak in gic_populate_ppi_partitions usb: dwc2: Fix memory leak in dwc2_hcd_init usb: gadget: lpc32xx_udc: Fix refcount leak in lpc32xx_udc_probe Mikulas Patocka (1): dm mirror log: round up region bitmap size to BITS_PER_LONG Murilo Opsfelder Araujo (1): virtio-pci: Remove wrong address verification in vp_del_vqs() Peng Fan (1): clk: imx8mp: fix usb_root_clk parent Petr Machata (1): mlxsw: spectrum_cnt: Reorder counter pools Rob Clark (1): dma-debug: make things less spammy under memory pressure Robert Eckelmann (1): USB: serial: io_ti: add Agilent E5805A support Robin Murphy (1): dma-direct: don't over-decrypt memory Roman Li (1): drm/amd/display: Cap OLED brightness per max frame-average luminance Saurabh Sengar (1): Drivers: hv: vmbus: Release cpu lock in error case Sean Christopherson (1): KVM: x86: Account a variety of miscellaneous allocations Serge Semin (2): gpio: dwapb: Don't print error on -EPROBE_DEFER i2c: designware: Use standard optional ref clock implementation Sergey Shtylyov (1): ata: libata-core: fix NULL pointer deref in ata_host_alloc_pinfo() Slark Xiao (1): USB: serial: option: add support for Cinterion MV31 with new baseline Thomas Weißschuh (1): nvme: add device name to warning in uuid_show() Trond Myklebust (3): nfsd: Replace use of rwsem with errseq_t pNFS: Don't keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE pNFS: Avoid a live lock condition in pnfs_update_layout() Vincent Whitchurch (1): tty: goldfish: Fix free_irq() on remove Vinicius Costa Gomes (2): Revert "PCI: Make pci_enable_ptm() private" igc: Enable PCIe PTM Wang Yufen (1): ipv6: Fix signed integer overflow in l2tp_ip6_sendmsg Wentao Wang (1): scsi: vmw_pvscsi: Expand vcpuHint to 16 bits Xiaohui Zhang (1): nfc: nfcmrvl: Fix memory leak in nfcmrvl_play_deferred Yuntao Wang (1): bpf: Fix incorrect memory charge cost calculation in stack_map_alloc() Yupeng Li (1): MIPS: Loongson-3: fix compile mips cpu_hwmon as module build error. Zhang Yi (1): ext4: add reserved GDT blocks check chengkaitao (1): virtio-mmio: fix missing put_device() when vm_cmdline_parent registration failed huangwenhui (1): ALSA: hda/realtek - Add HW8326 support .../freescale/imx8mm-beacon-baseboard.dtsi | 3 + arch/arm64/kernel/ftrace.c | 137 +++++++++--------- arch/arm64/kvm/vgic/vgic-mmio-v2.c | 4 +- arch/arm64/kvm/vgic/vgic-mmio.c | 19 ++- arch/arm64/kvm/vgic/vgic-mmio.h | 3 + arch/powerpc/mm/nohash/kaslr_booke.c | 8 +- arch/x86/kvm/svm/nested.c | 4 +- arch/x86/kvm/svm/sev.c | 4 +- arch/x86/kvm/vmx/vmx.c | 2 +- block/blk-mq.c | 2 + certs/blacklist_hashes.c | 2 +- crypto/Kconfig | 1 + crypto/Makefile | 2 +- drivers/ata/libata-core.c | 4 +- drivers/char/Kconfig | 54 ++++--- drivers/clk/imx/clk-imx8mp.c | 2 +- drivers/clocksource/hyperv_timer.c | 1 - drivers/gpio/gpio-dwapb.c | 7 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/i915/i915_sysfs.c | 15 +- drivers/hv/channel_mgmt.c | 1 + drivers/i2c/busses/i2c-designware-common.c | 3 - drivers/i2c/busses/i2c-designware-platdrv.c | 13 +- drivers/i2c/busses/i2c-npcm7xx.c | 3 +- drivers/input/misc/soc_button_array.c | 4 +- drivers/irqchip/irq-gic-realview.c | 1 + drivers/irqchip/irq-gic-v3.c | 7 +- drivers/md/dm-log.c | 3 +- drivers/misc/atmel-ssc.c | 4 +- drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 2 + drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 - .../net/ethernet/intel/i40e/i40e_ethtool.c | 25 +++- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 + .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 5 + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 21 ++- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 2 +- .../ethernet/mellanox/mlxsw/spectrum_cnt.h | 2 +- drivers/nfc/nfcmrvl/usb.c | 16 +- drivers/nvme/host/core.c | 44 +++--- drivers/nvme/host/multipath.c | 8 +- drivers/pci/pci.h | 3 - drivers/platform/mips/Kconfig | 2 +- drivers/scsi/ipr.c | 4 +- drivers/scsi/lpfc/lpfc_hw4.h | 3 + drivers/scsi/lpfc/lpfc_nportdisc.c | 3 +- drivers/scsi/lpfc/lpfc_nvme.c | 11 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/vmw_pvscsi.h | 4 +- drivers/staging/comedi/drivers/vmk80xx.c | 2 +- drivers/tty/goldfish.c | 2 +- drivers/tty/serial/8250/8250_port.c | 2 + drivers/usb/dwc2/hcd.c | 2 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 1 + drivers/usb/serial/io_ti.c | 2 + drivers/usb/serial/io_usbvend.h | 1 + drivers/usb/serial/option.c | 6 + drivers/virtio/virtio_mmio.c | 1 + drivers/virtio/virtio_pci_common.c | 3 +- fs/9p/vfs_inode_dotl.c | 10 +- fs/ext4/resize.c | 10 ++ fs/nfs/callback_proc.c | 1 + fs/nfs/pnfs.c | 21 ++- fs/nfs/pnfs.h | 1 + fs/nfsd/filecache.c | 1 - fs/nfsd/filecache.h | 1 - fs/nfsd/nfs4proc.c | 7 +- fs/nfsd/vfs.c | 40 ++--- fs/quota/dquot.c | 10 ++ include/linux/pci.h | 7 + kernel/bpf/stackmap.c | 3 +- kernel/dma/debug.c | 2 +- kernel/dma/direct.c | 16 +- lib/Kconfig | 3 + lib/Makefile | 1 + lib/crypto/Kconfig | 1 + {crypto => lib}/memneq.c | 0 net/ax25/af_ax25.c | 34 ++++- net/l2tp/l2tp_ip6.c | 5 +- net/openvswitch/actions.c | 6 + net/openvswitch/conntrack.c | 3 +- net/sched/act_police.c | 16 +- scripts/faddr2line | 45 ++++-- sound/hda/hdac_device.c | 1 + sound/pci/hda/patch_realtek.c | 15 ++ sound/soc/codecs/cs35l36.c | 3 +- sound/soc/codecs/cs42l51.c | 2 +- sound/soc/codecs/cs42l52.c | 8 +- sound/soc/codecs/cs42l56.c | 4 +- sound/soc/codecs/cs53l30.c | 16 +- sound/soc/codecs/es8328.c | 5 +- sound/soc/codecs/nau8822.c | 4 + sound/soc/codecs/nau8822.h | 3 + sound/soc/codecs/wm8962.c | 1 + sound/soc/codecs/wm_adsp.c | 2 +- .../selftests/net/forwarding/tc_police.sh | 52 +++++++ 97 files changed, 578 insertions(+), 292 deletions(-) rename {crypto => lib}/memneq.c (100%) -- 2.20.1

1 80

[PATCH openEuler-5.10 0/4] Try to fix kabi change caused by Intel AMX
by Zheng Zengkai 26 Oct '22

26 Oct '22

These four patches try to avoid or fix kabi change caused by Intel AMX PR: https://gitee.com/openeuler/kernel/pulls/58 Zheng Zengkai (4): x86: Avoid kabi change caused by adding pkru element in thread_struct x86/extable: Avoid kabi change caused by exception table rework x86/fpu: Avoid kabi change caused by struct fpu mm: Fix kabi change caused by saved_auxv[] in mm_struct for x86_64 arch/x86/include/asm/extable.h | 4 ++++ arch/x86/include/asm/fpu/types.h | 4 ++++ arch/x86/include/asm/processor.h | 2 ++ arch/x86/include/uapi/asm/auxvec.h | 1 + include/linux/mm_types.h | 15 +++++++++++++++ 5 files changed, 26 insertions(+) -- 2.20.1

6 15

[PATCH openEuler-1.0-LTS] nfp: fix use-after-free in area_cache_get()
by Yongqiang Liu 25 Oct '22

25 Oct '22

From: Jialiang Wang <wangjialiang0806(a)163.com> mainline inclusion from mainline-v6.0-rc1 commit 02e1a114fdb71e59ee6770294166c30d437bf86a category: bugfix bugzilla: 187867, https://gitee.com/src-openeuler/kernel/issues/I5W7B5 CVE: CVE-2022-3545 -------------------------------- area_cache_get() is used to distribute cache->area and set cache->id, and if cache->id is not 0 and cache->area->kref refcount is 0, it will release the cache->area by nfp_cpp_area_release(). area_cache_get() set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire(). But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is is already set but the refcount is not increased as expected. At this time, calling the nfp_cpp_area_release() will cause use-after-free. To avoid the use-after-free, set cache->id after area_init() and nfp_cpp_area_acquire() complete successfully. Note: This vulnerability is triggerable by providing emulated device equipped with specified configuration. BUG: KASAN: use-after-free in nfp6000_area_init (drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760) Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1 Call Trace: <TASK> nfp6000_area_init (drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760) area_cache_get.constprop.8 (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884) Allocated by task 1: nfp_cpp_area_alloc_with_name (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303) nfp_cpp_area_cache_add (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802) nfp6000_init (drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:1230) nfp_cpp_from_operations (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215) nfp_pci_probe (drivers/net/ethernet/netronome/nfp/nfp_main.c:744) Freed by task 1: kfree (mm/slub.c:4562) area_cache_get.constprop.8 (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873) nfp_cpp_read (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:924 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973) nfp_cpp_readl (drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c:48) Signed-off-by: Jialiang Wang <wangjialiang0806(a)163.com> Reviewed-by: Yinjun Zhang <yinjun.zhang(a)corigine.com> Acked-by: Simon Horman <simon.horman(a)corigine.com> Link: https://lore.kernel.org/r/20220810073057.4032-1-wangjialiang0806@163.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Yuyao Lin <linyuyao1(a)huawei.com> Reviewed-by: Wei Li <liwei391(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c index 73de57a09800..6f5d69293a25 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c @@ -872,7 +872,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, } /* Adjust the start address to be cache size aligned */ - cache->id = id; cache->addr = addr & ~(u64)(cache->size - 1); /* Re-init to the new ID and address */ @@ -892,6 +891,8 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, return NULL; } + cache->id = id; + exit: /* Adjust offset */ *offset = addr - cache->addr; -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] mISDN: fix use-after-free bugs in l1oip timer handlers
by Yongqiang Liu 25 Oct '22

25 Oct '22

From: Duoming Zhou <duoming(a)zju.edu.cn> mainline inclusion from mainline-v6.1-rc1 commit 2568a7e0832ee30b0a351016d03062ab4e0e0a3f category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5W7YH CVE: CVE-2022-3565 -------------------------------- The l1oip_cleanup() traverses the l1oip_ilist and calls release_card() to cleanup module and stack. However, release_card() calls del_timer() to delete the timers such as keep_tl and timeout_tl. If the timer handler is running, the del_timer() will not stop it and result in UAF bugs. One of the processes is shown below: (cleanup routine) | (timer handler) release_card() | l1oip_timeout() ... | del_timer() | ... ... | kfree(hc) //FREE | | hc->timeout_on = 0 //USE Fix by calling del_timer_sync() in release_card(), which makes sure the timer handlers have finished before the resources, such as l1oip and so on, have been deallocated. What's more, the hc->workq and hc->socket_thread can kick those timers right back in. We add a bool flag to show if card is released. Then, check this flag in hc->workq and hc->socket_thread. Fixes: 3712b42d4b1b ("Add layer1 over IP support") Signed-off-by: Duoming Zhou <duoming(a)zju.edu.cn> Reviewed-by: Leon Romanovsky <leonro(a)nvidia.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: GUO Zihua <guozihua(a)huawei.com> Reviewed-by: GONG Ruiqi <gongruiqi1(a)huawei.com> Reviewed-by: Wang Weiyang <wangweiyang2(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/isdn/mISDN/l1oip.h | 1 + drivers/isdn/mISDN/l1oip_core.c | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/isdn/mISDN/l1oip.h b/drivers/isdn/mISDN/l1oip.h index 7ea10db20e3a..48133d022812 100644 --- a/drivers/isdn/mISDN/l1oip.h +++ b/drivers/isdn/mISDN/l1oip.h @@ -59,6 +59,7 @@ struct l1oip { int bundle; /* bundle channels in one frm */ int codec; /* codec to use for transmis. */ int limit; /* limit number of bchannels */ + bool shutdown; /* if card is released */ /* timer */ struct timer_list keep_tl; diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index b05022f94f18..2f4a01ab25e8 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -289,7 +289,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, p = frame; /* restart timer */ - if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) + if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ) && !hc->shutdown) mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ); else hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; @@ -615,7 +615,9 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) goto multiframe; /* restart timer */ - if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) { + if ((time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || + !hc->timeout_on) && + !hc->shutdown) { hc->timeout_on = 1; mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ); } else /* only adjust timer */ @@ -1247,11 +1249,10 @@ release_card(struct l1oip *hc) { int ch; - if (timer_pending(&hc->keep_tl)) - del_timer(&hc->keep_tl); + hc->shutdown = true; - if (timer_pending(&hc->timeout_tl)) - del_timer(&hc->timeout_tl); + del_timer_sync(&hc->keep_tl); + del_timer_sync(&hc->timeout_tl); cancel_work_sync(&hc->workq); -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] tcp: Fix data races around icsk->icsk_af_ops.
by Yongqiang Liu 25 Oct '22

25 Oct '22

From: Kuniyuki Iwashima <kuniyu(a)amazon.com> mainline inclusion from mainline-v6.1-rc1 commit f49cd2f4d6170d27a2c61f1fecb03d8a70c91f57 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5W7ZF CVE: CVE-2022-3566 -------------------------------- setsockopt(IPV6_ADDRFORM) and tcp_v6_connect() change icsk->icsk_af_ops under lock_sock(), but tcp_(get|set)sockopt() read it locklessly. To avoid load/store tearing, we need to add READ_ONCE() and WRITE_ONCE() for the reads and writes. Thanks to Eric Dumazet for providing the syzbot report: BUG: KCSAN: data-race in tcp_setsockopt / tcp_v6_connect write to 0xffff88813c624518 of 8 bytes by task 23936 on cpu 0: tcp_v6_connect+0x5b3/0xce0 net/ipv6/tcp_ipv6.c:240 __inet_stream_connect+0x159/0x6d0 net/ipv4/af_inet.c:660 inet_stream_connect+0x44/0x70 net/ipv4/af_inet.c:724 __sys_connect_file net/socket.c:1976 [inline] __sys_connect+0x197/0x1b0 net/socket.c:1993 __do_sys_connect net/socket.c:2003 [inline] __se_sys_connect net/socket.c:2000 [inline] __x64_sys_connect+0x3d/0x50 net/socket.c:2000 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd read to 0xffff88813c624518 of 8 bytes by task 23937 on cpu 1: tcp_setsockopt+0x147/0x1c80 net/ipv4/tcp.c:3789 sock_common_setsockopt+0x5d/0x70 net/core/sock.c:3585 __sys_setsockopt+0x212/0x2b0 net/socket.c:2252 __do_sys_setsockopt net/socket.c:2263 [inline] __se_sys_setsockopt net/socket.c:2260 [inline] __x64_sys_setsockopt+0x62/0x70 net/socket.c:2260 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd value changed: 0xffffffff8539af68 -> 0xffffffff8539aff8 Reported by Kernel Concurrency Sanitizer on: CPU: 1 PID: 23937 Comm: syz-executor.5 Not tainted 6.0.0-rc4-syzkaller-00331-g4ed9c1e971b1-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/26/2022 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: syzbot <syzkaller(a)googlegroups.com> Reported-by: Eric Dumazet <edumazet(a)google.com> Signed-off-by: Kuniyuki Iwashima <kuniyu(a)amazon.com> Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Conflicts: net/ipv4/tcp.c net/ipv6/ipv6_sockglue.c net/ipv6/tcp_ipv6.c Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/ipv4/tcp.c | 10 ++++++---- net/ipv6/ipv6_sockglue.c | 3 ++- net/ipv6/tcp_ipv6.c | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 325a1dafbd90..094cd93e50c2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3114,8 +3114,9 @@ int tcp_setsockopt(struct sock *sk, int level, int optname, char __user *optval, const struct inet_connection_sock *icsk = inet_csk(sk); if (level != SOL_TCP) - return icsk->icsk_af_ops->setsockopt(sk, level, optname, - optval, optlen); + /* Paired with WRITE_ONCE() in do_ipv6_setsockopt() and tcp_v6_connect() */ + return READ_ONCE(icsk->icsk_af_ops)->setsockopt(sk, level, optname, + optval, optlen); return do_tcp_setsockopt(sk, level, optname, optval, optlen); } EXPORT_SYMBOL(tcp_setsockopt); @@ -3635,8 +3636,9 @@ int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval, struct inet_connection_sock *icsk = inet_csk(sk); if (level != SOL_TCP) - return icsk->icsk_af_ops->getsockopt(sk, level, optname, - optval, optlen); + /* Paired with WRITE_ONCE() in do_ipv6_setsockopt() and tcp_v6_connect() */ + return READ_ONCE(icsk->icsk_af_ops)->getsockopt(sk, level, optname, + optval, optlen); return do_tcp_getsockopt(sk, level, optname, optval, optlen); } EXPORT_SYMBOL(tcp_getsockopt); diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index d3f3a2f79646..85e5bdfa1f87 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -231,7 +231,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, sock_prot_inuse_add(net, &tcp_prot, 1); local_bh_enable(); sk->sk_prot = &tcp_prot; - icsk->icsk_af_ops = &ipv4_specific; + /* Paired with READ_ONCE() in tcp_(get|set)sockopt() */ + WRITE_ONCE(icsk->icsk_af_ops, &ipv4_specific); sk->sk_socket->ops = &inet_stream_ops; sk->sk_family = PF_INET; tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index de2975175503..ab9e022325e7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -229,7 +229,8 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, sin.sin_port = usin->sin6_port; sin.sin_addr.s_addr = usin->sin6_addr.s6_addr32[3]; - icsk->icsk_af_ops = &ipv6_mapped; + /* Paired with READ_ONCE() in tcp_(get|set)sockopt() */ + WRITE_ONCE(icsk->icsk_af_ops, &ipv6_mapped); sk->sk_backlog_rcv = tcp_v4_do_rcv; #ifdef CONFIG_TCP_MD5SIG tp->af_specific = &tcp_sock_ipv6_mapped_specific; @@ -239,7 +240,8 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, if (err) { icsk->icsk_ext_hdr_len = exthdrlen; - icsk->icsk_af_ops = &ipv6_specific; + /* Paired with READ_ONCE() in tcp_(get|set)sockopt() */ + WRITE_ONCE(icsk->icsk_af_ops, &ipv6_specific); sk->sk_backlog_rcv = tcp_v6_do_rcv; #ifdef CONFIG_TCP_MD5SIG tp->af_specific = &tcp_sock_ipv6_specific; -- 2.25.1

1 0

2024

2023

2022

2021

2020

2019

Kernel October 2022