6.0.6-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 6.0.6-rc1 review
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-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-6.0.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.0.6-rc1
Seth Jenkins <[email protected]>
mm: /proc/pid/smaps_rollup: fix no vma's null-deref
Werner Sembach <[email protected]>
ACPI: video: Force backlight native for more TongFang devices
Ye Bin <[email protected]>
ext4: fix potential out of bound read in ext4_fc_replay_scan()
Ye Bin <[email protected]>
ext4: factor out ext4_fc_get_tl()
Ye Bin <[email protected]>
ext4: introduce EXT4_FC_TAG_BASE_LEN helper
Jens Axboe <[email protected]>
io_uring: don't gate task_work run on TIF_NOTIFY_SIGNAL
Deren Wu <[email protected]>
wifi: mt76: mt7921e: fix random fw download fail
Jerry Snitselaar <[email protected]>
iommu/vt-d: Clean up si_domain in the init_dmars() error path
Charlotte Tan <[email protected]>
iommu/vt-d: Allow NVS regions in arch_rmrr_sanity_check()
Daniel Bristot de Oliveira <[email protected]>
rv/dot2c: Make automaton definition static
Christoph Böhmwalder <[email protected]>
drbd: only clone bio if we have a backing device
Felix Riemann <[email protected]>
net: phy: dp83822: disable MDI crossover status change interrupt
Eric Dumazet <[email protected]>
net: sched: fix race condition in qdisc_graft()
Yang Yingliang <[email protected]>
net: hns: fix possible memory leak in hnae_ae_register()
Yang Yingliang <[email protected]>
wwan_hwsim: fix possible memory leak in wwan_hwsim_dev_new()
Pieter Jansen van Vuuren <[email protected]>
sfc: include vport_id in filter spec hash and equal()
Harshit Mogalapalli <[email protected]>
io_uring/msg_ring: Fix NULL pointer dereference in io_msg_send_fd()
Paul Blakey <[email protected]>
net: Fix return value of qdisc ingress handling on success
Zhengchao Shao <[email protected]>
net: sched: sfb: fix null pointer access issue when sfb_init() fails
Zhengchao Shao <[email protected]>
net: sched: delete duplicate cleanup of backlog and qlen
Zhengchao Shao <[email protected]>
net: sched: cake: fix null pointer access issue when cake_init() fails
Sagi Grimberg <[email protected]>
nvmet: fix workqueue MEM_RECLAIM flushing dependency
Serge Semin <[email protected]>
nvme-hwmon: kmalloc the NVME SMART log buffer
Christoph Hellwig <[email protected]>
nvme-hwmon: consistently ignore errors from nvme_hwmon_init
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements
Guillaume Nault <[email protected]>
netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.
Phil Sutter <[email protected]>
netfilter: rpfilter/fib: Populate flowic_l3mdev field
Brett Creeley <[email protected]>
ionic: catch NULL pointer issue on reconfig
Eric Dumazet <[email protected]>
net: hsr: avoid possible NULL deref in skb_clone()
Vikas Gupta <[email protected]>
bnxt_en: fix memory leak in bnxt_nvm_test()
Guenter Roeck <[email protected]>
drm/amd/display: Increase frame size limit for display_mode_vba_util_32.o
Genjian Zhang <[email protected]>
dm: remove unnecessary assignment statement in alloc_dev()
Zhang Xiaoxu <[email protected]>
cifs: Fix memory leak when build ntlmssp negotiate blob failed
Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak in cifs_ses_add_channel()
Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak in cifs_flock()
Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak in cifs_copy_file_range()
Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak in cifs_create()
Zhengchao Shao <[email protected]>
ip6mr: fix UAF issue in ip6mr_sk_done() when addrconf_init_net() failed
Kuniyuki Iwashima <[email protected]>
udp: Update reuse->has_conns under reuseport_lock.
Rafael Mendonca <[email protected]>
scsi: lpfc: Fix memory leak in lpfc_create_port()
Yang Yingliang <[email protected]>
net: ethernet: mtk_eth_wed: add missing of_node_put()
Yang Yingliang <[email protected]>
net: ethernet: mtk_eth_wed: add missing put_device() in mtk_wed_add_hw()
Yang Yingliang <[email protected]>
net: ethernet: mtk_eth_soc: fix possible memory leak in mtk_probe()
Jens Axboe <[email protected]>
io_uring/rw: remove leftover debug statement
Yu Kuai <[email protected]>
blk-mq: fix null pointer dereference in blk_mq_clear_rq_mapping()
Gao Xiang <[email protected]>
erofs: shouldn't churn the mapping page for duplicated copies
Eric Dumazet <[email protected]>
skmsg: pass gfp argument to alloc_sk_msg()
Shenwei Wang <[email protected]>
net: stmmac: Enable mac_managed_pm phylink config
Shenwei Wang <[email protected]>
net: phylink: add mac_managed_pm in phylink_config structure
Dan Carpenter <[email protected]>
net/smc: Fix an error code in smc_lgr_create()
Harini Katakam <[email protected]>
net: phy: dp83867: Extend RX strap quirk for SGMII mode
Xiaobo Liu <[email protected]>
net/atm: fix proc_mpc_write incorrect return value
Jonathan Cooper <[email protected]>
sfc: Change VF mac via PF as first preference if available.
José Expósito <[email protected]>
HID: magicmouse: Do not set BTN_MOUSE on double report
Jakub Kicinski <[email protected]>
tls: strp: make sure the TCP skbs do not have overlapping data
Jan Sokolowski <[email protected]>
i40e: Fix DMA mappings leak
Christian Marangi <[email protected]>
net: dsa: qca8k: fix ethtool autocast mib for big-endian systems
Christian Marangi <[email protected]>
net: dsa: qca8k: fix inband mgmt for big-endian systems
Alexander Potapenko <[email protected]>
tipc: fix an information leak in tipc_topsrv_kern_subscr
Mark Tomlinson <[email protected]>
tipc: Fix recognition of trial period
Tony Luck <[email protected]>
ACPI: extlog: Handle multiple records
Maxime Ripard <[email protected]>
drm/vc4: hdmi: Enforce the minimum rate at runtime_resume
Maxime Ripard <[email protected]>
drm/vc4: Add module dependency on hdmi-codec
Filipe Manana <[email protected]>
btrfs: fix processing of delayed tree block refs during backref walking
Filipe Manana <[email protected]>
btrfs: fix processing of delayed data refs during backref walking
Mikulas Patocka <[email protected]>
dm bufio: use the acquire memory barrier when testing for B_READING
Mario Limonciello <[email protected]>
platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems
Zhang Rui <[email protected]>
x86/topology: Fix duplicated core ID within a package
Zhang Rui <[email protected]>
x86/topology: Fix multiple packages shown on a single-package system
Nathan Chancellor <[email protected]>
x86/Kconfig: Drop check for -mabi=ms for CONFIG_EFI_STUB
Bryan O'Donoghue <[email protected]>
media: venus: Fix NV12 decoder buffer discovery on HFI_VERSION_1XX
Bryan O'Donoghue <[email protected]>
media: venus: dec: Handle the case where find_format fails
Sean Young <[email protected]>
media: mceusb: set timeout to at least timeout provided
Sakari Ailus <[email protected]>
media: ipu3-imgu: Fix NULL pointer dereference in active selection access
Eric Ren <[email protected]>
KVM: arm64: vgic: Fix exit condition in scan_its_table()
Alexander Graf <[email protected]>
KVM: x86: Add compat handler for KVM_X86_SET_MSR_FILTER
Alexander Graf <[email protected]>
KVM: x86: Copy filter arg outside kvm_vm_ioctl_set_msr_filter()
Alexander Graf <[email protected]>
kvm: Add support for arch compat vm ioctls
Rik van Riel <[email protected]>
mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
Alex Deucher <[email protected]>
drm/amdgpu: fix sdma doorbell init ordering on APUs
Fabien Parent <[email protected]>
cpufreq: qcom: fix memory leak in error path
Babu Moger <[email protected]>
x86/resctrl: Fix min_cbm_bits for AMD
Kai-Heng Feng <[email protected]>
ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS
Alexander Stein <[email protected]>
ata: ahci-imx: Fix MODULE_ALIAS
Zhang Rui <[email protected]>
hwmon/coretemp: Handle large core ID value
Borislav Petkov <[email protected]>
x86/microcode/AMD: Apply the patch early on every logical thread
Jon Hunter <[email protected]>
cpufreq: tegra194: Fix module loading
Bryan O'Donoghue <[email protected]>
i2c: qcom-cci: Fix ordering of pm_runtime_xx and i2c_add_adapter
Fabien Parent <[email protected]>
cpufreq: qcom: fix writes in read-only memory region
GONG, Ruiqi <[email protected]>
selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()
Steve French <[email protected]>
smb3: interface count displayed incorrectly
Joseph Qi <[email protected]>
ocfs2: fix BUG when iput after ocfs2_mknod fails
Joseph Qi <[email protected]>
ocfs2: clear dinode links count in case of error
Thomas Zimmermann <[email protected]>
video/aperture: Call sysfb_disable() before removing PCI devices
-------------
Diffstat:
Makefile | 4 +- arch/arm64/kvm/vgic/vgic-its.c | 5 +- arch/x86/Kconfig | 1 - arch/x86/include/asm/iommu.h | 4 +- arch/x86/kernel/cpu/microcode/amd.c | 16 ++- arch/x86/kernel/cpu/resctrl/core.c | 8 +- arch/x86/kernel/cpu/topology.c | 16 ++- arch/x86/kvm/x86.c | 87 ++++++++++++--- block/blk-mq.c | 7 +- drivers/acpi/acpi_extlog.c | 33 +++--- drivers/acpi/video_detect.c | 64 +++++++++++ drivers/ata/ahci.h | 2 +- drivers/ata/ahci_imx.c | 2 +- drivers/block/drbd/drbd_req.c | 14 +-- drivers/cpufreq/qcom-cpufreq-nvmem.c | 10 +- drivers/cpufreq/tegra194-cpufreq.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 - drivers/gpu/drm/amd/amdgpu/soc15.c | 21 ++++ drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++ drivers/hid/hid-magicmouse.c | 2 +- drivers/hwmon/coretemp.c | 56 +++++++--- drivers/i2c/busses/i2c-qcom-cci.c | 13 ++- drivers/iommu/intel/iommu.c | 5 + drivers/md/dm-bufio.c | 13 ++- drivers/md/dm.c | 1 - drivers/media/platform/qcom/venus/helpers.c | 13 ++- drivers/media/platform/qcom/venus/vdec.c | 2 + drivers/media/rc/mceusb.c | 2 +- drivers/net/dsa/qca/qca8k-8xxx.c | 83 +++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 - drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 +++++++++-- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++- drivers/net/ethernet/mediatek/mtk_wed.c | 15 ++- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +- drivers/net/ethernet/sfc/ef10.c | 58 ++++------ drivers/net/ethernet/sfc/filter.h | 4 +- drivers/net/ethernet/sfc/rx_common.c | 10 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + drivers/net/phy/dp83822.c | 3 +- drivers/net/phy/dp83867.c | 8 ++ drivers/net/phy/phylink.c | 3 + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 1 + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 2 + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 + drivers/net/wwan/wwan_hwsim.c | 2 +- drivers/nvme/host/core.c | 6 +- drivers/nvme/host/hwmon.c | 32 ++++-- drivers/nvme/target/core.c | 2 +- drivers/platform/x86/amd/pmc.c | 7 ++ drivers/scsi/lpfc/lpfc_init.c | 7 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 31 +++--- drivers/video/aperture.c | 11 ++ fs/btrfs/backref.c | 46 +++++--- fs/cifs/cifsfs.c | 7 +- fs/cifs/dir.c | 6 +- fs/cifs/file.c | 11 +- fs/cifs/sess.c | 1 + fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 2 +- fs/erofs/zdata.c | 8 +- fs/erofs/zdata.h | 6 +- fs/ext4/fast_commit.c | 122 ++++++++++++++------- fs/ext4/fast_commit.h | 3 + fs/ocfs2/namei.c | 23 ++-- fs/proc/task_mmu.c | 2 +- include/linux/dsa/tag_qca.h | 8 +- include/linux/kvm_host.h | 2 + include/linux/phylink.h | 2 + include/net/sch_generic.h | 1 - include/net/sock_reuseport.h | 11 +- io_uring/io_uring.h | 10 +- io_uring/msg_ring.c | 3 + io_uring/rw.c | 2 - mm/hugetlb.c | 2 +- net/atm/mpoa_proc.c | 3 +- net/core/dev.c | 4 + net/core/skmsg.c | 8 +- net/core/sock_reuseport.c | 16 +++ net/hsr/hsr_forward.c | 12 +- net/ipv4/datagram.c | 2 +- net/ipv4/netfilter/ipt_rpfilter.c | 3 +- net/ipv4/netfilter/nft_fib_ipv4.c | 3 +- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 2 + net/ipv6/datagram.c | 2 +- net/ipv6/netfilter/ip6t_rpfilter.c | 10 +- net/ipv6/netfilter/nft_fib_ipv6.c | 7 +- net/ipv6/udp.c | 2 +- net/netfilter/nf_tables_api.c | 5 +- net/sched/sch_api.c | 5 +- net/sched/sch_atm.c | 1 - net/sched/sch_cake.c | 4 + net/sched/sch_cbq.c | 1 - net/sched/sch_choke.c | 2 - net/sched/sch_drr.c | 2 - net/sched/sch_dsmark.c | 2 - net/sched/sch_etf.c | 3 - net/sched/sch_ets.c | 2 - net/sched/sch_fq_codel.c | 2 - net/sched/sch_fq_pie.c | 3 - net/sched/sch_hfsc.c | 2 - net/sched/sch_htb.c | 2 - net/sched/sch_multiq.c | 1 - net/sched/sch_prio.c | 2 - net/sched/sch_qfq.c | 2 - net/sched/sch_red.c | 2 - net/sched/sch_sfb.c | 5 +- net/sched/sch_skbprio.c | 3 - net/sched/sch_taprio.c | 2 - net/sched/sch_tbf.c | 2 - net/sched/sch_teql.c | 1 - net/smc/smc_core.c | 3 +- net/tipc/discover.c | 2 +- net/tipc/topsrv.c | 2 +- net/tls/tls_strp.c | 32 +++++- security/selinux/ss/services.c | 5 +- security/selinux/ss/sidtab.c | 4 +- security/selinux/ss/sidtab.h | 2 +- tools/verification/dot2/dot2c.py | 2 +- virt/kvm/kvm_main.c | 11 ++ 128 files changed, 888 insertions(+), 441 deletions(-)
Greg Kroah-Hartman
maintainerPATCH v2 1/94 video/aperture: Call sysfb_disable() before removing PCI devices
From: Thomas Zimmermann <[email protected]>
Call sysfb_disable() from aperture_remove_conflicting_pci_devices() before removing PCI devices. Without, simpledrm can still bind to simple-framebuffer devices after the hardware driver has taken over the hardware. Both drivers interfere with each other and results are undefined.
Reported modesetting errors [1] are shown below.
---- snap ----
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: { 13-.... } 7 jiffies s: 165 root: 0x2000/.
rcu: blocking rcu_node structures (internal RCU debug):
Task dump for CPU 13:
task:X state:R running task stack: 0 pid: 4242 ppid: 4228 flags:0x00000008
Call Trace:
<TASK>
? commit_tail+0xd7/0x130
? drm_atomic_helper_commit+0x126/0x150
? drm_atomic_commit+0xa4/0xe0
? drm_plane_get_damage_clips.cold+0x1c/0x1c
? drm_atomic_helper_dirtyfb+0x19e/0x280
? drm_mode_dirtyfb_ioctl+0x10f/0x1e0
? drm_mode_getfb2_ioctl+0x2d0/0x2d0
? drm_ioctl_kernel+0xc4/0x150
? drm_ioctl+0x246/0x3f0
? drm_mode_getfb2_ioctl+0x2d0/0x2d0
? __x64_sys_ioctl+0x91/0xd0
? do_syscall_64+0x60/0xd0
? entry_SYSCALL_64_after_hwframe+0x4b/0xb5
</TASK>
...
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: { 13-.... } 30 jiffies s: 169 root: 0x2000/.
rcu: blocking rcu_node structures (internal RCU debug):
Task dump for CPU 13:
task:X state:R running task stack: 0 pid: 4242 ppid: 4228 flags:0x0000400e
Call Trace:
<TASK>
? memcpy_toio+0x76/0xc0
? memcpy_toio+0x1b/0xc0
? drm_fb_memcpy_toio+0x76/0xb0
? drm_fb_blit_toio+0x75/0x2b0
? simpledrm_simple_display_pipe_update+0x132/0x150
? drm_atomic_helper_commit_planes+0xb6/0x230
? drm_atomic_helper_commit_tail+0x44/0x80
? commit_tail+0xd7/0x130
? drm_atomic_helper_commit+0x126/0x150
? drm_atomic_commit+0xa4/0xe0
? drm_plane_get_damage_clips.cold+0x1c/0x1c
? drm_atomic_helper_dirtyfb+0x19e/0x280
? drm_mode_dirtyfb_ioctl+0x10f/0x1e0
? drm_mode_getfb2_ioctl+0x2d0/0x2d0
? drm_ioctl_kernel+0xc4/0x150
? drm_ioctl+0x246/0x3f0
? drm_mode_getfb2_ioctl+0x2d0/0x2d0
? __x64_sys_ioctl+0x91/0xd0
? do_syscall_64+0x60/0xd0
? entry_SYSCALL_64_after_hwframe+0x4b/0xb5
</TASK>The problem was added by commit 5e0137612430 ("video/aperture: Disable and unregister sysfb devices via aperture helpers") to v6.0.3 and does not exist in the mainline branch.
The mainline commit 5e0137612430 ("video/aperture: Disable and unregister sysfb devices via aperture helpers") has been backported from v6.0-rc1 to stable v6.0.3 from a larger patch series [2] that reworks fbdev framebuffer ownership. The backport misses a change to aperture_remove_conflicting_pci_devices(). Mainline itself is fine, because the function does not exist there as a result of the patch series.
Instead of backporting the whole series, fix the additional function.
--- drivers/video/aperture.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/video/aperture.c +11 -0
@@ -358,6 +358,17 @@ int aperture_remove_conflicting_pci_devireturn ret;/* +* If a driver asked to unregister a platform device registered by +* sysfb, then can be assumed that this is a driver for a display +* that is set up by the system firmware and has a generic driver. +* +* Drivers for devices that don't have a generic driver will never +* ask for this, so let's assume that a real driver for the display +* was already probed and prevent sysfb to register devices later. +*/ +sysfb_disable (); + +/* * WARNING: Apparently we must kick fbdev drivers before vgacon, * otherwise the vga fbdev driver falls over. */
Greg Kroah-Hartman
maintainerPATCH 2/94 ocfs2: clear dinode links count in case of error
In reply to Greg Kroah-HartmanFrom: Joseph Qi <[email protected]>
commit 28f4821b1b53e0649706912e810c6c232fc506f9 upstream.
In ocfs2_mknod(), if error occurs after dinode successfully allocated, ocfs2 i_links_count will not be 0.
So even though we clear inode i_nlink before iput in error handling, it still won't wipe inode since we'll refresh inode from dinode during inode lock. So just like clear inode i_nlink, we clear ocfs2 i_links_count as well. Also do the same change for ocfs2_symlink().
--- fs/ocfs2/namei.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/ocfs2/namei.c +10 -2
@@ -232,6 +232,7 @@ static int ocfs2_mknod(struct user_nameshandle_t *handle =NULL ;struct ocfs2_super *osb;struct ocfs2_dinode *dirfe; +struct ocfs2_dinode *fe =NULL ;struct buffer_head *new_fe_bh =NULL ;struct inode *inode =NULL ;struct ocfs2_alloc_context *inode_ac =NULL ;
@@ -382,6 +383,7 @@ static int ocfs2_mknod(struct user_names goto leave; } + fe = (struct ocfs2_dinode *) new_fe_bh->b_data;if (S_ISDIR (mode)) { status =ocfs2_fill_new_dir (osb, handle, dir, inode, new_fe_bh, data_ac, meta_ac);
@@ -454,8 +456,11 @@ roll_back: leave:if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && fe) +ocfs2_set_links_count (fe,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
@@ -2028,8 +2033,11 @@ bail: ocfs2_clusters_to_bytes(osb->sb, 1));if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && fe) +ocfs2_set_links_count (fe,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
Greg Kroah-Hartman
maintainerPATCH 3/94 ocfs2: fix BUG when iput after ocfs2_mknod fails
In reply to Greg Kroah-HartmanFrom: Joseph Qi <[email protected]>
commit 759a7c6126eef5635506453e9b9d55a6a3ac2084 upstream.
Commit b1529a41f777 "ocfs2: should reclaim the inode if '__ocfs2_mknod_locked' returns an error" tried to reclaim the claimed inode if __ocfs2_mknod_locked() fails later. But this introduce a race, the freed bit may be reused immediately by another thread, which will update dinode, e.g. i_generation. Then iput this inode will lead to BUG:inode->i_generation != le32_to_cpu(fe->i_generation)
We could make this inode as bad, but we did want to do operations like wipe in some cases. Since the claimed inode bit can only affect that an dinode is missing and will return back after fsck, it seems not a big problem. So just leave it as is by revert the reclaim logic.
--- fs/ocfs2/namei.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
fs/ocfs2/namei.c +1 -10
@@ -637,18 +637,9 @@ static int ocfs2_mknod_locked(struct ocfreturn status; } - status =__ocfs2_mknod_locked (dir, inode, dev, new_fe_bh, +return __ocfs2_mknod_locked (dir, inode, dev, new_fe_bh, parent_fe_bh, handle, inode_ac, fe_blkno, suballoc_loc, suballoc_bit); -if (status <0 ) { -u64 bg_blkno =ocfs2_which_suballoc_group (fe_blkno, suballoc_bit); -int tmp =ocfs2_free_suballoc_bits (handle, inode_ac->ac_inode, - inode_ac->ac_bh, suballoc_bit, bg_blkno,1 ); -if (tmp) -mlog_errno (tmp); - } - -return status; } static int ocfs2_mkdir(struct user_namespace *mnt_userns,
Greg Kroah-Hartman
maintainerPATCH 4/94 smb3: interface count displayed incorrectly
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 096bbeec7bd6fb683831a9ca4850a6b6a3f04740 upstream.
The "Server interfaces" count in /proc/fs/cifs/DebugData increases as the interfaces are requeried, rather than being reset to the new value. This could cause a problem if the server disabled multichannel as the iface_count is checked in try_adding_channels to see if multichannel still supported.
Also fixes a coverity warning:
Addresses-Coverity: 1526374 ("Concurrent data access violations (MISSING_LOCK)")
--- fs/cifs/smb2ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/smb2ops.c +2 -1
@@ -530,6 +530,7 @@ parse_server_interfaces(struct network_i p = buf;spin_lock (&ses->iface_lock); + ses->iface_count =0 ;/* * Go through iface_list and do kref_put to remove * any unused ifaces. ifaces in use will be removed
@@ -650,9 +651,9 @@ parse_server_interfaces(struct network_ikref_put (&iface->refcount, release_iface); }else list_add_tail (&info->iface_head, &ses->iface_list); -spin_unlock (&ses->iface_lock); ses->iface_count++; +spin_unlock (&ses->iface_lock); ses->iface_last_update = jiffies; next_iface: nb_iface++;
Greg Kroah-Hartman
maintainerPATCH 5/94 selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()
In reply to Greg Kroah-HartmanFrom: GONG, Ruiqi <[email protected]>
commit abe3c631447dcd1ba7af972fe6f054bee6f136fa upstream.
The following warning was triggered on a hardware environment:
SELinux: Converting 162 SID table entries...
BUG: sleeping function called from invalid context at
__might_sleep+0x60/0x74 0x0
in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 5943, name: tar
CPU: 7 PID: 5943 Comm: tar Tainted: P O 5.10.0 #1
Call trace:
dump_backtrace+0x0/0x1c8
show_stack+0x18/0x28
dump_stack+0xe8/0x15c
___might_sleep+0x168/0x17c
__might_sleep+0x60/0x74
__kmalloc_track_caller+0xa0/0x7dc
kstrdup+0x54/0xac
convert_context+0x48/0x2e4
sidtab_context_to_sid+0x1c4/0x36c
security_context_to_sid_core+0x168/0x238
security_context_to_sid_default+0x14/0x24
inode_doinit_use_xattr+0x164/0x1e4
inode_doinit_with_dentry+0x1c0/0x488
selinux_d_instantiate+0x20/0x34
security_d_instantiate+0x70/0xbc
d_splice_alias+0x4c/0x3c0
ext4_lookup+0x1d8/0x200 [ext4]
__lookup_slow+0x12c/0x1e4
walk_component+0x100/0x200
path_lookupat+0x88/0x118
filename_lookup+0x98/0x130
user_path_at_empty+0x48/0x60
vfs_statx+0x84/0x140
vfs_fstatat+0x20/0x30
__se_sys_newfstatat+0x30/0x74
__arm64_sys_newfstatat+0x1c/0x2c
el0_svc_common.constprop.0+0x100/0x184
do_el0_svc+0x1c/0x2c
el0_svc+0x20/0x34
el0_sync_handler+0x80/0x17c
el0_sync+0x13c/0x140
SELinux: Context system_u:object_r:pssp_rsyslog_log_t:s0:c0 is
not valid (left unmapped).It was found that within a critical section of spin_lock_irqsave in sidtab_context_to_sid(), convert_context() (hooked by sidtab_convert_params.func) might cause the process to sleep via allocating memory with GFP_KERNEL, which is problematic.
As Ondrej pointed out [1], convert_context()/sidtab_convert_params.func has another caller sidtab_convert_tree(), which is okay with GFP_KERNEL. Therefore, fix this problem by adding a gfp_t argument for convert_context()/sidtab_convert_params.func and pass GFP_KERNEL/_ATOMIC properly in individual callers.
--- security/selinux/ss/services.c | 5 +++-- security/selinux/ss/sidtab.c | 4 ++-- security/selinux/ss/sidtab.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
security/selinux/ss/services.c +3 -2
@@ -2022,7 +2022,8 @@ static inline int convert_context_handle* in `newc'. Verify that the context is valid * under the new policy. */ -static int convert_context (struct context *oldc,struct context *newc,void *p) +static int convert_context (struct context *oldc,struct context *newc,void *p, +gfp_t gfp_flags) {struct convert_context_args *args;struct ocontext *oc;
@@ -2036,7 +2037,7 @@ static int convert_context(struct contex args = p;if (oldc->str) { - s =kstrdup (oldc->str,GFP_KERNEL ); + s =kstrdup (oldc->str, gfp_flags);if (!s)return -ENOMEM ;
security/selinux/ss/sidtab.c +2 -2
@@ -325,7 +325,7 @@ int sidtab_context_to_sid(struct sidtab } rc = convert->func (context, &dst_convert->context, - convert->args); + convert->args,GFP_ATOMIC );if (rc) {context_destroy (&dst->context); goto out_unlock;
@@ -404,7 +404,7 @@ static int sidtab_convert_tree(union sidwhile (i <SIDTAB_LEAF_ENTRIES && *pos < count) { rc = convert->func (&esrc->ptr_leaf->entries[i].context, &edst->ptr_leaf->entries[i].context, - convert->args); + convert->args,GFP_KERNEL );if (rc)return rc; (*pos)++;
security/selinux/ss/sidtab.h +1 -1
@@ -65,7 +65,7 @@ struct sidtab_isid_entry { };struct sidtab_convert_params { -int (*func)(struct context *oldc,struct context *newc,void *args); +int (*func)(struct context *oldc,struct context *newc,void *args,gfp_t gfp_flags);void *args;struct sidtab *target; };
Greg Kroah-Hartman
maintainerPATCH 6/94 cpufreq: qcom: fix writes in read-only memory region
In reply to Greg Kroah-HartmanFrom: Fabien Parent <[email protected]>
commit 01039fb8e90c9cb684430414bff70cea9eb168c5 upstream.
This commit fixes a kernel oops because of a write in some read-only memory:
[ 9.068287] Unable to handle kernel write to read-only memory at virtual address ffff800009240ad8 ..snip.. [ 9.138790] Internal error: Oops: 9600004f [#1] PREEMPT SMP ..snip.. [ 9.269161] Call trace: [ 9.276271] __memcpy+0x5c/0x230 [ 9.278531] snprintf+0x58/0x80 [ 9.282002] qcom_cpufreq_msm8939_name_version+0xb4/0x190 [ 9.284869] qcom_cpufreq_probe+0xc8/0x39c ..snip..
The following line defines a pointer that point to a char buffer stored in read-only memory:
char *pvs_name = "speedXX-pvsXX-vXX";
This pointer is meant to hold a template "speedXX-pvsXX-vXX" where the XX values get overridden by the qcom_cpufreq_krait_name_version function. Since the template is actually stored in read-only memory, when the function executes the following call we get an oops:
snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d",
speed, pvs, pvs_ver);To fix this issue, we instead store the template name onto the stack by using the following syntax:
char pvs_name_buffer[] = "speedXX-pvsXX-vXX";
Because the pvs_name needs to be able to be assigned to NULL, the template buffer is stored in the pvs_name_buffer and not under the pvs_name variable.
--- drivers/cpufreq/qcom-cpufreq-nvmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpufreq/qcom-cpufreq-nvmem.c +2 -1
@@ -262,7 +262,8 @@ static int qcom_cpufreq_probe(struct plastruct nvmem_cell *speedbin_nvmem;struct device_node *np;struct device *cpu_dev; -char *pvs_name ="speedXX-pvsXX-vXX" ; +char pvs_name_buffer[] ="speedXX-pvsXX-vXX" ; +char *pvs_name = pvs_name_buffer;unsigned cpu;const struct of_device_id *match;int ret;
Greg Kroah-Hartman
maintainerPATCH 7/94 i2c: qcom-cci: Fix ordering of pm_runtime_xx and i2c_add_adapter
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
commit 61775d54d674ff8ec3658495e0dbc537227dc5c1 upstream.
When we compile-in the CCI along with the imx412 driver and run on the RB5 we see that i2c_add_adapter() causes the probe of the imx412 driver to happen.
This probe tries to perform an i2c xfer() and the xfer() in i2c-qcom-cci.c fails on pm_runtime_get() because the i2c-qcom-cci.c::probe() function has not completed to pm_runtime_enable(dev).
Fix this sequence by ensuring pm_runtime_xxx() calls happen prior to adding the i2c adapter.
--- drivers/i2c/busses/i2c-qcom-cci.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-qcom-cci.c +8 -5
@@ -639,6 +639,11 @@ static int cci_probe(struct platform_devif (ret <0 ) goto error; +pm_runtime_set_autosuspend_delay (dev,MSEC_PER_SEC ); +pm_runtime_use_autosuspend (dev); +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +for (i =0 ; i < cci->data->num_masters; i++) {if (!cci->master[i].cci)continue ;
@@ -650,14 +655,12 @@ static int cci_probe(struct platform_dev } } -pm_runtime_set_autosuspend_delay (dev,MSEC_PER_SEC ); -pm_runtime_use_autosuspend (dev); -pm_runtime_set_active (dev); -pm_runtime_enable (dev); -return 0 ; error_i2c: +pm_runtime_disable (dev); +pm_runtime_dont_use_autosuspend (dev); +for (--i ; i >=0 ; i--) {if (cci->master[i].cci) {i2c_del_adapter (&cci->master[i].adap);
Greg Kroah-Hartman
maintainerPATCH 8/94 cpufreq: tegra194: Fix module loading
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
commit 1dcaf30725c32b26daa70d22083999972ab99c29 upstream.
When the Tegra194 CPUFREQ driver is built as a module it is not automatically loaded as expected on Tegra194 devices. Populate the MODULE_DEVICE_TABLE to fix this.
--- drivers/cpufreq/tegra194-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/tegra194-cpufreq.c +1 -0
@@ -592,6 +592,7 @@ static const struct of_device_id tegra19 { .compatible = "nvidia,tegra234-ccplex-cluster", .data = &tegra234_cpufreq_soc }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, tegra194_cpufreq_of_match);static struct platform_driver tegra194_ccplex_driver = { .driver = {
Greg Kroah-Hartman
maintainerPATCH 9/94 x86/microcode/AMD: Apply the patch early on every logical thread
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
commit e7ad18d1169c62e6c78c01ff693fd362d9d65278 upstream.
Currently, the patch application logic checks whether the revision needs to be applied on each logical CPU (SMT thread). Therefore, on SMT designs where the microcode engine is shared between the two threads, the application happens only on one of them as that is enough to update the shared microcode engine.
However, there are microcode patches which do per-thread modification, see Link tag below.
Therefore, drop the revision check and try applying on each thread. This is what the BIOS does too so this method is very much tested.
Btw, change only the early paths. On the late loading paths, there's no point in doing per-thread modification because if is it some case like in the bugzilla below - removing a CPUID flag - the kernel cannot go and un-use features it has detected are there early. For that, one should use early loading anyway.
[ bp: Fixes does not contain the oldest commit which did check for
equality but that is good enough. ]
--- arch/x86/kernel/cpu/microcode/amd.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +13 -3
@@ -440,7 +440,13 @@ apply_microcode_early_amd(u32 cpuid_1_eareturn ret;native_rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy); -if (rev >= mc->hdr.patch_id) + +/* +* Allow application of the same revision to pick up SMT-specific +* changes even if the revision of the other SMT thread is already +* up-to-date. +*/ +if (rev > mc->hdr.patch_id)return ret;if (!__apply_microcode_amd (mc)) {
@@ -528,8 +534,12 @@ void load_ucode_amd_ap(unsigned int cpuinative_rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy); -/* Check whether we have saved a new patch already: */ -if (*new_rev && rev < mc->hdr.patch_id) { +/* +* Check whether a new patch has been saved already. Also, allow application of +* the same revision in order to pick up SMT-thread-specific configuration even +* if the sibling SMT thread already has an up-to-date revision. +*/ +if (*new_rev && rev <= mc->hdr.patch_id) {if (!__apply_microcode_amd (mc)) { *new_rev = mc->hdr.patch_id;return ;
Greg Kroah-Hartman
maintainerPATCH 10/94 hwmon/coretemp: Handle large core ID value
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
commit 7108b80a542b9d65e44b36d64a700a83658c0b73 upstream.
The coretemp driver supports up to a hard-coded limit of 128 cores.
Today, the driver can not support a core with an ID above that limit. Yet, the encoding of core ID's is arbitrary (BIOS APIC-ID) and so they may be sparse and they may be large.
Update the driver to map arbitrary core ID numbers into appropriate array indexes so that 128 cores can be supported, no matter the encoding of core ID's.
--- drivers/hwmon/coretemp.c | 56 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 15 deletions(-)
drivers/hwmon/coretemp.c +41 -15
@@ -46,9 +46,6 @@ MODULE_PARM_DESC(tjmax, "TjMax value in#define TOTAL_ATTRS (MAX_CORE_ATTRS + 1)#define MAX_CORE_DATA (NUM_REAL_CORES + BASE_SYSFS_ATTR_NO) -#define TO_CORE_ID (cpu) (cpu_data(cpu).cpu_core_id) -#define TO_ATTR_NO (cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) -#ifdef CONFIG_SMP #define for_each_sibling (i, cpu) \ for_each_cpu(i, topology_sibling_cpumask(cpu))
@@ -91,6 +88,8 @@ struct temp_data {struct platform_data {struct device *hwmon_dev;u16 pkg_id; +u16 cpu_map[NUM_REAL_CORES ]; +struct ida ida;struct cpumask cpumask;struct temp_data *core_data[MAX_CORE_DATA ];struct device_attribute name_attr;
@@ -441,7 +440,7 @@ static struct temp_data *init_temp_data(MSR_IA32_THERM_STATUS ; tdata->is_pkg_data = pkg_flag; tdata->cpu = cpu; - tdata->cpu_core_id =TO_CORE_ID (cpu); + tdata->cpu_core_id =topology_core_id (cpu); tdata->attr_size =MAX_CORE_ATTRS ;mutex_init (&tdata->update_lock);return tdata;
@@ -454,7 +453,7 @@ static int create_core_data(struct platfstruct platform_data *pdata =platform_get_drvdata (pdev);struct cpuinfo_x86 *c = &cpu_data (cpu);u32 eax, edx; -int err, attr_no; +int err, index, attr_no;/* * Find attr number for sysfs:
@@ -462,14 +461,26 @@ static int create_core_data(struct platf* The attr number is always core id + 2 * The Pkgtemp will always show up as temp1_*, if available */ - attr_no = pkg_flag ?PKG_SYSFS_ATTR_NO :TO_ATTR_NO (cpu); +if (pkg_flag) { + attr_no =PKG_SYSFS_ATTR_NO ; + }else { + index =ida_alloc (&pdata->ida,GFP_KERNEL ); +if (index <0 ) +return index; + pdata->cpu_map[index] =topology_core_id (cpu); + attr_no = index +BASE_SYSFS_ATTR_NO ; + } -if (attr_no >MAX_CORE_DATA -1 ) -return -ERANGE ; +if (attr_no >MAX_CORE_DATA -1 ) { + err = -ERANGE ; + goto ida_free; + } tdata =init_temp_data (cpu, pkg_flag); -if (!tdata) -return -ENOMEM ; +if (!tdata) { + err = -ENOMEM ; + goto ida_free; + }/* Test if we can access the status register */ err =rdmsr_safe_on_cpu (cpu, tdata->status_reg, &eax, &edx);
@@ -505,6 +516,9 @@ static int create_core_data(struct platf exit_free: pdata->core_data[attr_no] =NULL ;kfree (tdata); +ida_free: +if (!pkg_flag) +ida_free (&pdata->ida, index);return err; }
@@ -524,6 +538,9 @@ static void coretemp_remove_core(structkfree (pdata->core_data[indx]); pdata->core_data[indx] =NULL ; + +if (indx >=BASE_SYSFS_ATTR_NO ) +ida_free (&pdata->ida, indx -BASE_SYSFS_ATTR_NO ); }static int coretemp_probe (struct platform_device *pdev)
@@ -537,6 +554,7 @@ static int coretemp_probe(struct platforreturn -ENOMEM ; pdata->pkg_id = pdev->id; +ida_init (&pdata->ida);platform_set_drvdata (pdev, pdata); pdata->hwmon_dev = devm_hwmon_device_register_with_groups(dev, DRVNAME,
@@ -553,6 +571,7 @@ static int coretemp_remove(struct platfoif (pdata->core_data[i])coretemp_remove_core (pdata, i); +ida_destroy (&pdata->ida);return 0 ; }
@@ -647,7 +666,7 @@ static int coretemp_cpu_offline(unsignedstruct platform_device *pdev =coretemp_get_pdev (cpu);struct platform_data *pd;struct temp_data *tdata; -int indx, target; +int i, indx =-1 , target;/* * Don't execute this on suspend as the device remove locks
@@ -660,12 +679,19 @@ static int coretemp_cpu_offline(unsignedif (!pdev)return 0 ; -/* The core id is too big, just return */ - indx =TO_ATTR_NO (cpu); -if (indx >MAX_CORE_DATA -1 ) + pd =platform_get_drvdata (pdev); + +for (i =0 ; i <NUM_REAL_CORES ; i++) { +if (pd->cpu_map[i] ==topology_core_id (cpu)) { + indx = i +BASE_SYSFS_ATTR_NO ; +break ; + } + } + +/* Too many cores and this core is not populated, just return */ +if (indx <0 )return 0 ; - pd =platform_get_drvdata (pdev); tdata = pd->core_data[indx];cpumask_clear_cpu (cpu, &pd->cpumask);
Greg Kroah-Hartman
maintainerPATCH 11/94 ata: ahci-imx: Fix MODULE_ALIAS
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
commit 979556f1521a835a059de3b117b9c6c6642c7d58 upstream.
'ahci:' is an invalid prefix, preventing the module from autoloading. Fix this by using the 'platform:' prefix and DRV_NAME.
--- drivers/ata/ahci_imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/ahci_imx.c +1 -1
@@ -1230,4 +1230,4 @@ module_platform_driver(imx_ahci_driver);MODULE_DESCRIPTION ("Freescale i.MX AHCI SATA platform driver" );MODULE_AUTHOR ("Richard Zhu <[email protected]>" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("ahci:imx" ); +MODULE_ALIAS ("platform:" DRV_NAME );
Greg Kroah-Hartman
maintainerPATCH 12/94 ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 1e41e693f458eef2d5728207dbd327cd3b16580a upstream.
UBSAN complains about array-index-out-of-bounds:
[ 1.980703] kernel: UBSAN: array-index-out-of-bounds in /build/linux-9H675w/linux-5.15.0/drivers/ata/libahci.c:968:41 [ 1.980709] kernel: index 15 is out of range for type 'ahci_em_priv [8]' [ 1.980713] kernel: CPU: 0 PID: 209 Comm: scsi_eh_8 Not tainted 5.15.0-25-generic #25-Ubuntu [ 1.980716] kernel: Hardware name: System manufacturer System Product Name/P5Q3, BIOS 1102 06/11/2010 [ 1.980718] kernel: Call Trace: [ 1.980721] kernel: <TASK> [ 1.980723] kernel: show_stack+0x52/0x58 [ 1.980729] kernel: dump_stack_lvl+0x4a/0x5f [ 1.980734] kernel: dump_stack+0x10/0x12 [ 1.980736] kernel: ubsan_epilogue+0x9/0x45 [ 1.980739] kernel: __ubsan_handle_out_of_bounds.cold+0x44/0x49 [ 1.980742] kernel: ahci_qc_issue+0x166/0x170 [libahci] [ 1.980748] kernel: ata_qc_issue+0x135/0x240 [ 1.980752] kernel: ata_exec_internal_sg+0x2c4/0x580 [ 1.980754] kernel: ? vprintk_default+0x1d/0x20 [ 1.980759] kernel: ata_exec_internal+0x67/0xa0 [ 1.980762] kernel: sata_pmp_read+0x8d/0xc0 [ 1.980765] kernel: sata_pmp_read_gscr+0x3c/0x90 [ 1.980768] kernel: sata_pmp_attach+0x8b/0x310 [ 1.980771] kernel: ata_eh_revalidate_and_attach+0x28c/0x4b0 [ 1.980775] kernel: ata_eh_recover+0x6b6/0xb30 [ 1.980778] kernel: ? ahci_do_hardreset+0x180/0x180 [libahci] [ 1.980783] kernel: ? ahci_stop_engine+0xb0/0xb0 [libahci] [ 1.980787] kernel: ? ahci_do_softreset+0x290/0x290 [libahci] [ 1.980792] kernel: ? trace_event_raw_event_ata_eh_link_autopsy_qc+0xe0/0xe0 [ 1.980795] kernel: sata_pmp_eh_recover.isra.0+0x214/0x560 [ 1.980799] kernel: sata_pmp_error_handler+0x23/0x40 [ 1.980802] kernel: ahci_error_handler+0x43/0x80 [libahci] [ 1.980806] kernel: ata_scsi_port_error_handler+0x2b1/0x600 [ 1.980810] kernel: ata_scsi_error+0x9c/0xd0 [ 1.980813] kernel: scsi_error_handler+0xa1/0x180 [ 1.980817] kernel: ? scsi_unjam_host+0x1c0/0x1c0 [ 1.980820] kernel: kthread+0x12a/0x150 [ 1.980823] kernel: ? set_kthread_struct+0x50/0x50 [ 1.980826] kernel: ret_from_fork+0x22/0x30 [ 1.980831] kernel: </TASK>
This happens because sata_pmp_init_links() initialize link->pmp up to SATA_PMP_MAX_PORTS while em_priv is declared as 8 elements array.
I can't find the maximum Enclosure Management ports specified in AHCI spec v1.3.1, but "12.2.1 LED message type" states that "Port Multiplier Information" can utilize 4 bits, which implies it can support up to 16 ports. Hence, use SATA_PMP_MAX_PORTS as EM_MAX_SLOTS to resolve the issue.
--- drivers/ata/ahci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/ahci.h +1 -1
@@ -252,7 +252,7 @@ enum {PCS_7 =0x94 ,/* 7+ port PCS (Denverton) */ /* em constants */ -EM_MAX_SLOTS =8 , +EM_MAX_SLOTS =SATA_PMP_MAX_PORTS , EM_MAX_RETRY = 5,/* em_ctl bits */
Greg Kroah-Hartman
maintainerPATCH 13/94 x86/resctrl: Fix min_cbm_bits for AMD
In reply to Greg Kroah-HartmanFrom: Babu Moger <[email protected]>
commit 67bf6493449b09590f9f71d7df29efb392b12d25 upstream.
AMD systems support zero CBM (capacity bit mask) for cache allocation. That is reflected in rdt_init_res_defs_amd() by:
r->cache.arch_has_empty_bitmaps = true;
However given the unified code in cbm_validate(), checking for:
val == 0 && !arch_has_empty_bitmaps
is not enough because of another check in cbm_validate():
if ((zero_bit - first_bit) < r->cache.min_cbm_bits)
The default value of r->cache.min_cbm_bits = 1.
Leading to:
$ cd /sys/fs/resctrl
$ mkdir foo
$ cd foo
$ echo L3:0=0 > schemata
-bash: echo: write error: Invalid argument
$ cat /sys/fs/resctrl/info/last_cmd_status
Need at least 1 bits in the maskInitialize the min_cbm_bits to 0 for AMD. Also, remove the default setting of min_cbm_bits and initialize it separately.
After the fix:
$ cd /sys/fs/resctrl
$ mkdir foo
$ cd foo
$ echo L3:0=0 > schemata
$ cat /sys/fs/resctrl/info/last_cmd_status
ok--- arch/x86/kernel/cpu/resctrl/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/resctrl/core.c +2 -6
@@ -66,9 +66,6 @@ struct rdt_hw_resource rdt_resources_all .rid = RDT_RESOURCE_L3, .name = "L3", .cache_level = 3, - .cache = { - .min_cbm_bits = 1, - }, .domains = domain_init(RDT_RESOURCE_L3), .parse_ctrlval = parse_cbm, .format_str = "%d=%0*x",
@@ -83,9 +80,6 @@ struct rdt_hw_resource rdt_resources_all .rid = RDT_RESOURCE_L2, .name = "L2", .cache_level = 2, - .cache = { - .min_cbm_bits = 1, - }, .domains = domain_init(RDT_RESOURCE_L2), .parse_ctrlval = parse_cbm, .format_str = "%d=%0*x",
@@ -877,6 +871,7 @@ static __init void rdt_init_res_defs_int r->cache.arch_has_sparse_bitmaps = false; r->cache.arch_has_empty_bitmaps = false; r->cache.arch_has_per_cpu_cfg = false; + r->cache.min_cbm_bits =1 ; }else if (r->rid ==RDT_RESOURCE_MBA ) { hw_res->msr_base =MSR_IA32_MBA_THRTL_BASE ; hw_res->msr_update = mba_wrmsr_intel;
@@ -897,6 +892,7 @@ static __init void rdt_init_res_defs_amd r->cache.arch_has_sparse_bitmaps = true; r->cache.arch_has_empty_bitmaps = true; r->cache.arch_has_per_cpu_cfg = true; + r->cache.min_cbm_bits =0 ; }else if (r->rid ==RDT_RESOURCE_MBA ) { hw_res->msr_base =MSR_IA32_MBA_BW_BASE ; hw_res->msr_update = mba_wrmsr_amd;
Greg Kroah-Hartman
maintainerPATCH 14/94 cpufreq: qcom: fix memory leak in error path
In reply to Greg Kroah-HartmanFrom: Fabien Parent <[email protected]>
commit 9f42cf54403a42cb092636804d2628d8ecf71e75 upstream.
If for some reason the speedbin length is incorrect, then there is a memory leak in the error path because we never free the speedbin buffer. This commit fixes the error path to always free the speedbin buffer.
--- drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/cpufreq/qcom-cpufreq-nvmem.c +5 -2
@@ -213,6 +213,7 @@ static int qcom_cpufreq_krait_name_versiint speed =0 , pvs =0 , pvs_ver =0 ;u8 *speedbin;size_t len; +int ret =0 ; speedbin =nvmem_cell_read (speedbin_nvmem, &len);
@@ -230,7 +231,8 @@ static int qcom_cpufreq_krait_name_versibreak ;default :dev_err (cpu_dev,"Unable to read nvmem data. Defaulting to 0!\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto len_error; } snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d",
@@ -238,8 +240,9 @@ static int qcom_cpufreq_krait_name_versi drv->versions = (1 << speed); +len_error:kfree (speedbin); -return 0 ; +return ret; }static const struct qcom_cpufreq_match_data match_data_kryo = {
Greg Kroah-Hartman
maintainerPATCH 15/94 drm/amdgpu: fix sdma doorbell init ordering on APUs
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 50b0e4d4da09fa501e722af886f97e60a4f820d6 upstream.
Commit 8795e182b02d ("PCI/portdrv: Don't disable AER reporting in get_port_device_capability()") uncovered a bug in amdgpu that required a reordering of the driver
init sequence to avoid accessing a special register on the GPU
before it was properly set up leading to an PCI AER error. This
reordering uncovered a different hw programming ordering dependency
in some APUs where the SDMA doorbells need to be programmed before
the GFX doorbells. To fix this, move the SDMA doorbell programming
back into the soc15 common code, but use the actual doorbell range
values directly rather than the values stored in the ring structure
since those will not be initialized at this point.
This is a partial revert, but with the doorbell assignment fixed so the proper doorbell index is set before it's used.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 ----- drivers/gpu/drm/amd/amdgpu/soc15.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0 -5
@@ -1504,11 +1504,6 @@ static int sdma_v4_0_start(struct amdgpuWREG32_SDMA (i, mmSDMA0_CNTL, temp);if (!amdgpu_sriov_vf (adev)) { - ring = &adev->sdma.instance[i].ring; - adev->nbio.funcs->sdma_doorbell_range (adev, i, - ring->use_doorbell, ring->doorbell_index, - adev->doorbell_index.sdma_doorbell_range); -/* unhalt engine */ temp =RREG32_SDMA (i, mmSDMA0_F32_CNTL); temp =REG_SET_FIELD (temp,SDMA0_F32_CNTL ,HALT ,0 );
drivers/gpu/drm/amd/amdgpu/soc15.c +21 -0
@@ -1211,6 +1211,20 @@ static int soc15_common_sw_fini(void *hareturn 0 ; } +static void soc15_sdma_doorbell_range_init (struct amdgpu_device *adev) +{ +int i; + +/* sdma doorbell range is programed by hypervisor */ +if (!amdgpu_sriov_vf (adev)) { +for (i =0 ; i < adev->sdma.num_instances; i++) { + adev->nbio.funcs->sdma_doorbell_range (adev, i, + true, adev->doorbell_index.sdma_engine[i] <<1 , + adev->doorbell_index.sdma_doorbell_range); + } + } +} +static int soc15_common_hw_init (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1230,6 +1244,13 @@ static int soc15_common_hw_init(void *ha/* enable the doorbell aperture */ soc15_enable_doorbell_aperture (adev, true); +/* HW doorbell routing policy: doorbell writing not +* in SDMA/IH/MM/ACV range will be routed to CP. So +* we need to init SDMA doorbell range prior +* to CP ip block init and ring test. IH already +* happens before CP. +*/ +soc15_sdma_doorbell_range_init (adev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 16/94 mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
In reply to Greg Kroah-HartmanFrom: Rik van Riel <[email protected]>
commit 12df140f0bdfae5dcfc81800970dd7f6f632e00c upstream.
The h->*_huge_pages counters are protected by the hugetlb_lock, but alloc_huge_page has a corner case where it can decrement the counter outside of the lock.
This could lead to a corrupted value of h->resv_huge_pages, which we have observed on our systems.
Take the hugetlb_lock before decrementing h->resv_huge_pages to avoid a potential race.
--- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hugetlb.c +1 -1
@@ -2928,11 +2928,11 @@ struct page *alloc_huge_page(struct vm_a page =alloc_buddy_huge_page_with_mpol (h, vma, addr);if (!page) goto out_uncharge_cgroup; +spin_lock_irq (&hugetlb_lock);if (!avoid_reserve &&vma_has_reserves (vma, gbl_chg)) {SetHPageRestoreReserve (page); h->resv_huge_pages--; } -spin_lock_irq (&hugetlb_lock);list_add (&page->lru, &h->hugepage_activelist);/* Fall through */ }
Greg Kroah-Hartman
maintainerPATCH 17/94 kvm: Add support for arch compat vm ioctls
In reply to Greg Kroah-HartmanFrom: Alexander Graf <[email protected]>
commit ed51862f2f57cbce6fed2d4278cfe70a490899fd upstream.
We will introduce the first architecture specific compat vm ioctl in the next patch. Add all necessary boilerplate to allow architectures to override compat vm ioctls when necessary.
Message-Id: <[email protected]>
--- include/linux/kvm_host.h | 2 ++ virt/kvm/kvm_main.c | 11 +++++++++++ 2 files changed, 13 insertions(+)
include/linux/kvm_host.h +2 -0
@@ -1391,6 +1391,8 @@ int kvm_vm_ioctl_enable_cap(struct kvm * struct kvm_enable_cap *cap);long kvm_arch_vm_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg); +long kvm_arch_vm_compat_ioctl (struct file *filp,unsigned int ioctl, +unsigned long arg);int kvm_arch_vcpu_ioctl_get_fpu (struct kvm_vcpu *vcpu,struct kvm_fpu *fpu);int kvm_arch_vcpu_ioctl_set_fpu (struct kvm_vcpu *vcpu,struct kvm_fpu *fpu);
virt/kvm/kvm_main.c +11 -0
@@ -4834,6 +4834,12 @@ struct compat_kvm_clear_dirty_log { }; }; +long __weak kvm_arch_vm_compat_ioctl (struct file *filp,unsigned int ioctl, +unsigned long arg) +{ +return -ENOTTY ; +} +static long kvm_vm_compat_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg) {
@@ -4842,6 +4848,11 @@ static long kvm_vm_compat_ioctl(struct fif (kvm->mm != current->mm || kvm->vm_dead)return -EIO ; + + r =kvm_arch_vm_compat_ioctl (filp, ioctl, arg); +if (r != -ENOTTY ) +return r; +switch (ioctl) {#ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT case KVM_CLEAR_DIRTY_LOG : {
Greg Kroah-Hartman
maintainerPATCH 18/94 KVM: x86: Copy filter arg outside kvm_vm_ioctl_set_msr_filter()
In reply to Greg Kroah-HartmanFrom: Alexander Graf <[email protected]>
commit 2e3272bc1790825c43d2c39690bf2836b81c6d36 upstream.
In the next patch we want to introduce a second caller to set_msr_filter() which constructs its own filter list on the stack. Refactor the original function so it takes it as argument instead of reading it through copy_from_user().
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
arch/x86/kvm/x86.c +17 -14
@@ -6406,26 +6406,22 @@ static int kvm_add_msr_filter(struct kvmreturn 0 ; } -static int kvm_vm_ioctl_set_msr_filter (struct kvm *kvm,void __user *argp) +static int kvm_vm_ioctl_set_msr_filter (struct kvm *kvm, +struct kvm_msr_filter *filter) { -struct kvm_msr_filter __user *user_msr_filter = argp;struct kvm_x86_msr_filter *new_filter, *old_filter; -struct kvm_msr_filter filter;bool default_allow;bool empty = true;int r =0 ;u32 i; -if (copy_from_user (&filter, user_msr_filter,sizeof (filter))) -return -EFAULT ; - -if (filter.flags & ~KVM_MSR_FILTER_DEFAULT_DENY ) +if (filter->flags & ~KVM_MSR_FILTER_DEFAULT_DENY )return -EINVAL ; -for (i =0 ; i <ARRAY_SIZE (filter.ranges); i++) - empty &= !filter.ranges[i].nmsrs; +for (i =0 ; i <ARRAY_SIZE (filter->ranges); i++) + empty &= !filter->ranges[i].nmsrs; - default_allow = !(filter.flags &KVM_MSR_FILTER_DEFAULT_DENY ); + default_allow = !(filter->flags &KVM_MSR_FILTER_DEFAULT_DENY );if (empty && !default_allow)return -EINVAL ;
@@ -6433,8 +6429,8 @@ static int kvm_vm_ioctl_set_msr_filter(sif (!new_filter)return -ENOMEM ; -for (i =0 ; i <ARRAY_SIZE (filter.ranges); i++) { - r =kvm_add_msr_filter (new_filter, &filter.ranges[i]); +for (i =0 ; i <ARRAY_SIZE (filter->ranges); i++) { + r =kvm_add_msr_filter (new_filter, &filter->ranges[i]);if (r) {kvm_free_msr_filter (new_filter);return r;
@@ -6879,9 +6875,16 @@ set_pit2_out:case KVM_SET_PMU_EVENT_FILTER : r =kvm_vm_ioctl_set_pmu_event_filter (kvm, argp);break ; -case KVM_X86_SET_MSR_FILTER : - r =kvm_vm_ioctl_set_msr_filter (kvm, argp); +case KVM_X86_SET_MSR_FILTER : { +struct kvm_msr_filter __user *user_msr_filter = argp; +struct kvm_msr_filter filter; + +if (copy_from_user (&filter, user_msr_filter,sizeof (filter))) +return -EFAULT ; + + r =kvm_vm_ioctl_set_msr_filter (kvm, &filter);break ; + }default : r = -ENOTTY ; }
Greg Kroah-Hartman
maintainerPATCH 19/94 KVM: x86: Add compat handler for KVM_X86_SET_MSR_FILTER
In reply to Greg Kroah-HartmanFrom: Alexander Graf <[email protected]>
commit 1739c7017fb1d759965dcbab925ff5980a5318cb upstream.
The KVM_X86_SET_MSR_FILTER ioctls contains a pointer in the passed in struct which means it has a different struct size depending on whether it gets called from 32bit or 64bit code.
This patch introduces compat code that converts from the 32bit struct to its 64bit counterpart which then gets used going forward internally. With this applied, 32bit QEMU can successfully set MSR bitmaps when running on 64bit kernels.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
arch/x86/kvm/x86.c +56 -0
@@ -6453,6 +6453,62 @@ static int kvm_vm_ioctl_set_msr_filter(sreturn 0 ; } +#ifdef CONFIG_KVM_COMPAT +/* for KVM_X86_SET_MSR_FILTER */ +struct kvm_msr_filter_range_compat { +__u32 flags; +__u32 nmsrs; +__u32 base; +__u32 bitmap; +}; + +struct kvm_msr_filter_compat { +__u32 flags; +struct kvm_msr_filter_range_compat ranges[KVM_MSR_FILTER_MAX_RANGES ]; +}; + +#define KVM_X86_SET_MSR_FILTER_COMPAT _IOW(KVMIO, 0xc6, struct kvm_msr_filter_compat) + +long kvm_arch_vm_compat_ioctl (struct file *filp,unsigned int ioctl, +unsigned long arg) +{ +void __user *argp = (void __user *)arg; +struct kvm *kvm = filp->private_data; +long r = -ENOTTY ; + +switch (ioctl) { +case KVM_X86_SET_MSR_FILTER_COMPAT : { +struct kvm_msr_filter __user *user_msr_filter = argp; +struct kvm_msr_filter_compat filter_compat; +struct kvm_msr_filter filter; +int i; + +if (copy_from_user (&filter_compat, user_msr_filter, +sizeof (filter_compat))) +return -EFAULT ; + + filter.flags = filter_compat.flags; +for (i =0 ; i <ARRAY_SIZE (filter.ranges); i++) { +struct kvm_msr_filter_range_compat *cr; + + cr = &filter_compat.ranges[i]; + filter.ranges[i] = (struct kvm_msr_filter_range ) { + .flags = cr->flags, + .nmsrs = cr->nmsrs, + .base = cr->base, + .bitmap = (__u8 *)(ulong )cr->bitmap, + }; + } + + r =kvm_vm_ioctl_set_msr_filter (kvm, &filter); +break ; + } + } + +return r; +} +#endif +#ifdef CONFIG_HAVE_KVM_PM_NOTIFIER static int kvm_arch_suspend_notifier (struct kvm *kvm) {
Greg Kroah-Hartman
maintainerPATCH 20/94 KVM: arm64: vgic: Fix exit condition in scan_its_table()
In reply to Greg Kroah-HartmanFrom: Eric Ren <[email protected]>
commit c000a2607145d28b06c697f968491372ea56c23a upstream.
With some PCIe topologies, restoring a guest fails while parsing the ITS device tables.
Reproducer hints:
1. Create ARM virt VM with pxb-pcie bus which adds extra host bridges, with qemu command like:
``` -device pxb-pcie,bus_nr=8,id=pci.x,numa_node=0,bus=pcie.0 \ -device pcie-root-port,..,bus=pci.x \ ... -device pxb-pcie,bus_nr=37,id=pci.y,numa_node=1,bus=pcie.0 \ -device pcie-root-port,..,bus=pci.y \ ... ```
2. Ensure the guest uses 2-level device table
3. Perform VM migration which calls save/restore device tables
In that setup, we get a big "offset" between 2 device_ids, which makes unsigned "len" round up a big positive number, causing the scan loop to continue with a bad GPA. For example:
1. L1 table has 2 entries;
2. and we are now scanning at L2 table entry index 2075 (pointed to by L1 first entry)
3. if next device id is 9472, we will get a big offset: 7397;
4. with unsigned 'len', 'len -= offset * esz', len will underflow to a positive number, mistakenly into next iteration with a bad GPA; (It should break out of the current L2 table scanning, and jump into the next L1 table entry)
5. that bad GPA fails the guest read.
Fix it by stopping the L2 table scan when the next device id is outside of the current table, allowing the scan to continue from the next L1 table entry.
Thanks to Eric Auger for the fix suggestion.
--- arch/arm64/kvm/vgic/vgic-its.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/kvm/vgic/vgic-its.c +4 -1
@@ -2149,7 +2149,7 @@ static int scan_its_table(struct vgic_itmemset (entry,0 , esz); -while (len >0 ) { +while (true) {int next_offset;size_t byte_offset;
@@ -2162,6 +2162,9 @@ static int scan_its_table(struct vgic_itreturn next_offset; byte_offset = next_offset * esz; +if (byte_offset >= len) +break ; + id += next_offset; gpa += byte_offset; len -= byte_offset;
Greg Kroah-Hartman
maintainerPATCH 21/94 media: ipu3-imgu: Fix NULL pointer dereference in active selection access
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit b9eb3ab6f30bf32f7326909f17949ccb11bab514 upstream.
What the IMGU driver did was that it first acquired the pointers to active and try V4L2 subdev state, and only then figured out which one to use.
The problem with that approach and a later patch (see Fixes: tag) is that as sd_state argument to v4l2_subdev_get_try_crop() et al is NULL, there is now an attempt to dereference that.
Fix this.
Also rewrap lines a little.
--- drivers/staging/media/ipu3/ipu3-v4l2.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
drivers/staging/media/ipu3/ipu3-v4l2.c +14 -17
@@ -192,33 +192,30 @@ static int imgu_subdev_get_selection(strstruct v4l2_subdev_state *sd_state, struct v4l2_subdev_selection *sel) { - struct v4l2_rect *try_sel, *r; -struct imgu_v4l2_subdev *imgu_sd =container_of (sd, - struct imgu_v4l2_subdev, - subdev); + struct imgu_v4l2_subdev *imgu_sd = + container_of(sd, struct imgu_v4l2_subdev, subdev);if (sel->pad !=IMGU_NODE_IN )return -EINVAL ;switch (sel->target) {case V4L2_SEL_TGT_CROP : - try_sel =v4l2_subdev_get_try_crop (sd, sd_state, sel->pad); - r = &imgu_sd->rect.eff; -break ; +if (sel->which ==V4L2_SUBDEV_FORMAT_TRY ) + sel->r = *v4l2_subdev_get_try_crop (sd, sd_state, + sel->pad); +else + sel->r = imgu_sd->rect.eff; +return 0 ;case V4L2_SEL_TGT_COMPOSE : - try_sel =v4l2_subdev_get_try_compose (sd, sd_state, sel->pad); - r = &imgu_sd->rect.bds; -break ; +if (sel->which ==V4L2_SUBDEV_FORMAT_TRY ) + sel->r = *v4l2_subdev_get_try_compose (sd, sd_state, + sel->pad); +else + sel->r = imgu_sd->rect.bds; +return 0 ;default :return -EINVAL ; } - -if (sel->which ==V4L2_SUBDEV_FORMAT_TRY ) - sel->r = *try_sel; -else - sel->r = *r; - -return 0 ; } static int imgu_subdev_set_selection(struct v4l2_subdev *sd,
Greg Kroah-Hartman
maintainerPATCH 22/94 media: mceusb: set timeout to at least timeout provided
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 20b794ddce475ed012deb365000527c17b3e93e6 upstream.
By rounding down, the actual timeout can be lower than requested. As a result, long spaces just below the requested timeout can be incorrectly reported as timeout and truncated.
--- drivers/media/rc/mceusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/mceusb.c +1 -1
@@ -1077,7 +1077,7 @@ static int mceusb_set_timeout(struct rc_struct mceusb_dev *ir = dev->priv;unsigned int units; - units =DIV_ROUND_CLOSEST (timeout,MCE_TIME_UNIT ); + units =DIV_ROUND_UP (timeout,MCE_TIME_UNIT ); cmdbuf[2 ] = units >>8 ; cmdbuf[3 ] = units;
Greg Kroah-Hartman
maintainerPATCH 23/94 media: venus: dec: Handle the case where find_format fails
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
commit 06a2da340f762addc5935bf851d95b14d4692db2 upstream.
Debugging the decoder on msm8916 I noticed the vdec probe was crashing if the fmt pointer was NULL.
A similar fix from Colin Ian King found by Coverity was implemented for the encoder. Implement the same fix on the decoder.
--- drivers/media/platform/qcom/venus/vdec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/qcom/venus/vdec.c +2 -0
@@ -183,6 +183,8 @@ vdec_try_fmt_common(struct venus_inst *ielse return NULL ; fmt =find_format (inst, pixmp->pixelformat, f->type); +if (!fmt) +return NULL ; } pixmp->width = clamp(pixmp->width, frame_width_min(inst),
Greg Kroah-Hartman
maintainerPATCH 24/94 media: venus: Fix NV12 decoder buffer discovery on HFI_VERSION_1XX
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
commit 7f77fa9f378c528edb38dbf23ff1273c81429d49 upstream.
HFI_VERSION_1XX uses HFI_BUFFER_OUTPUT not HFI_BUFFER_OUTPUT2 for decoder buffers.
venus_helper_check_format() places a constraint on an output buffer to be of type HFI_BUFFER_OUTPUT2. HFI_1XX uses HFI_BUFFER_OUTPUT though.
Switching to the logic used in venus_helper_get_out_fmts() first checking for HFI_BUFFER_OUTPUT and then HFI_BUFFER_OUTPUT2 resolves on HFI_1XX.
db410c before:
root@linaro-alip:~# v4l2-ctl -d /dev/video0 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanar [0]: 'MPG4' (MPEG-4 Part 2 ES, compressed)
[1]: 'H263' (H.263, compressed)
[2]: 'H264' (H.264, compressed)
[3]: 'VP80' (VP8, compressed)root@linaro-alip:~# v4l2-ctl -d /dev/video1 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanardb410c after:
root@linaro-alip:~# v4l2-ctl -d /dev/video0 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanar [0]: 'MPG4' (MPEG-4 Part 2 ES, compressed)
[1]: 'H263' (H.263, compressed)
[2]: 'H264' (H.264, compressed)
[3]: 'VP80' (VP8, compressed)root@linaro-alip:~# v4l2-ctl -d /dev/video1 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanar[0]: 'NV12' (Y/CbCr 4:2:0)
Validated playback with ffplay on db410c with h264 and vp8 decoding.
--- drivers/media/platform/qcom/venus/helpers.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/media/platform/qcom/venus/helpers.c +7 -6
@@ -1800,7 +1800,7 @@ bool venus_helper_check_format(struct vestruct venus_core *core = inst->core;u32 fmt =to_hfi_raw_fmt (v4l2_pixfmt);struct hfi_plat_caps *caps; -u32 buftype; +bool found;if (!fmt)return false;
@@ -1809,12 +1809,13 @@ bool venus_helper_check_format(struct veif (!caps)return false; -if (inst->session_type ==VIDC_SESSION_TYPE_DEC ) - buftype =HFI_BUFFER_OUTPUT2 ; -else - buftype =HFI_BUFFER_OUTPUT ; + found =find_fmt_from_caps (caps,HFI_BUFFER_OUTPUT , fmt); +if (found) + goto done; -return find_fmt_from_caps (caps, buftype, fmt); + found =find_fmt_from_caps (caps,HFI_BUFFER_OUTPUT2 , fmt); +done: +return found; }EXPORT_SYMBOL_GPL (venus_helper_check_format);
Greg Kroah-Hartman
maintainerPATCH 25/94 x86/Kconfig: Drop check for -mabi=ms for CONFIG_EFI_STUB
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 33806e7cb8d50379f55c3e8f335e91e1b359dc7b upstream.
A recent change in LLVM made CONFIG_EFI_STUB unselectable because it no longer pretends to support -mabi=ms, breaking the dependency in Kconfig. Lack of CONFIG_EFI_STUB can prevent kernels from booting via EFI in certain circumstances.
This check was added by
8f24f8c2fc82 ("efi/libstub: Annotate firmware routines as __efiapi")
to ensure that __attribute__((ms_abi)) was available, as -mabi=ms is not actually used in any cflags.
According to the GCC documentation, this attribute has been supported since GCC 4.4.7. The kernel currently requires GCC 5.1 so this check is not necessary; even when that change landed in 5.6, the kernel required GCC 4.9 so it was unnecessary then as well.
Clang supports __attribute__((ms_abi)) for all versions that are supported for building the kernel so no additional check is needed. Remove the 'depends on' line altogether to allow CONFIG_EFI_STUB to be selected when CONFIG_EFI is enabled, regardless of compiler.
--- arch/x86/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/x86/Kconfig +0 -1
@@ -1961,7 +1961,6 @@ config EFI config EFI_STUB bool "EFI stub support" depends on EFI - depends on $(cc-option,-mabi=ms) || X86_32 select RELOCATABLE help This kernel feature allows a bzImage to be loaded directly
Greg Kroah-Hartman
maintainerPATCH 26/94 x86/topology: Fix multiple packages shown on a single-package system
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
commit 2b12a7a126d62bdbd81f4923c21bf6e9a7fbd069 upstream.
CPUID.1F/B does not enumerate Package level explicitly, instead, all the APIC-ID bits above the enumerated levels are assumed to be package ID bits.
Current code gets package ID by shifting out all the APIC-ID bits that Linux supports, rather than shifting out all the APIC-ID bits that CPUID.1F enumerates. This introduces problems when CPUID.1F enumerates a level that Linux does not support.
For example, on a single package AlderLake-N, there are 2 Ecore Modules with 4 atom cores in each module. Linux does not support the Module level and interprets the Module ID bits as package ID and erroneously reports a multi module system as a multi-package system.
Fix this by using APIC-ID bits above all the CPUID.1F enumerated levels as package ID.
[ dhansen: spelling fix ]
--- arch/x86/kernel/cpu/topology.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/topology.c +10 -4
@@ -96,6 +96,7 @@ int detect_extended_topology(struct cpuiunsigned int ht_mask_width, core_plus_mask_width, die_plus_mask_width;unsigned int core_select_mask, core_level_siblings;unsigned int die_select_mask, die_level_siblings; +unsigned int pkg_mask_width;bool die_level_present = false;int leaf;
@@ -111,10 +112,10 @@ int detect_extended_topology(struct cpui core_level_siblings = smp_num_siblings =LEVEL_MAX_SIBLINGS (ebx); core_plus_mask_width = ht_mask_width =BITS_SHIFT_NEXT_LEVEL (eax); die_level_siblings =LEVEL_MAX_SIBLINGS (ebx); - die_plus_mask_width =BITS_SHIFT_NEXT_LEVEL (eax); + pkg_mask_width = die_plus_mask_width =BITS_SHIFT_NEXT_LEVEL (eax); sub_index =1 ; - do { +while (true) {cpuid_count (leaf, sub_index, &eax, &ebx, &ecx, &edx);/*
@@ -132,8 +133,13 @@ int detect_extended_topology(struct cpui die_plus_mask_width =BITS_SHIFT_NEXT_LEVEL (eax); } +if (LEAFB_SUBTYPE (ecx) !=INVALID_TYPE ) + pkg_mask_width =BITS_SHIFT_NEXT_LEVEL (eax); +else +break ; + sub_index++; - }while (LEAFB_SUBTYPE (ecx) !=INVALID_TYPE ); + } core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; die_select_mask = (~(-1 << die_plus_mask_width)) >>
@@ -148,7 +154,7 @@ int detect_extended_topology(struct cpui } c->phys_proc_id = apic->phys_pkg_id (c->initial_apicid, - die_plus_mask_width); + pkg_mask_width);/* * Reinit the apicid, now that we have extended initial_apicid. */
Greg Kroah-Hartman
maintainerPATCH 27/94 x86/topology: Fix duplicated core ID within a package
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
commit 71eac7063698b7d7b8fafb1683ac24a034541141 upstream.
Today, core ID is assumed to be unique within each package.
But an AlderLake-N platform adds a Module level between core and package, Linux excludes the unknown modules bits from the core ID, resulting in duplicate core ID's.
To keep core ID unique within a package, Linux must include all APIC-ID bits for known or unknown levels above the core and below the package in the core ID.
It is important to understand that core ID's have always come directly from the APIC-ID encoding, which comes from the BIOS. Thus there is no guarantee that they start at 0, or that they are contiguous. As such, naively using them for array indexes can be problematic.
[ dhansen: un-known -> unknown ]
--- arch/x86/kernel/cpu/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/topology.c +1 -1
@@ -141,7 +141,7 @@ int detect_extended_topology(struct cpui sub_index++; } - core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; + core_select_mask = (~(-1 << pkg_mask_width)) >> ht_mask_width; die_select_mask = (~(-1 << die_plus_mask_width)) >> core_plus_mask_width;
Greg Kroah-Hartman
maintainerPATCH 28/94 platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
commit 0b6e6e149c136677f1cc859d4185b5a2db50ffbf upstream.
commit b0c07116c894 ("platform/x86: amd-pmc: Avoid reading SMU version at probe time") adjusted the behavior for amd-pmc to avoid reading the SMU version at startup but rather on first use to improve boot time.
However the SMU version is also used to decide whether to place a timer based wakeup in the OS_HINT message. If the idlemask hasn't been read before this message was sent then the SMU version will not have been cached.
Ensure the SMU version has been read before deciding whether or not to run this codepath.
--- drivers/platform/x86/amd/pmc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/platform/x86/amd/pmc.c +7 -0
@@ -635,6 +635,13 @@ static int amd_pmc_verify_czn_rtc(structstruct rtc_time tm;int rc; +/* we haven't yet read SMU version */ +if (!pdev->major) { + rc =amd_pmc_get_smu_version (pdev); +if (rc) +return rc; + } +if (pdev->major <64 || (pdev->major ==64 && pdev->minor <53 ))return 0 ;
Greg Kroah-Hartman
maintainerPATCH 29/94 dm bufio: use the acquire memory barrier when testing for B_READING
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 141b3523e9be6f15577acf4bbc3bc1f82d81d6d1 upstream.
The function test_bit doesn't provide any memory barrier. It may be possible that the read requests that follow test_bit(B_READING, &b->state) are reordered before the test, reading invalid data that existed before B_READING was cleared.
Fix this bug by changing test_bit to test_bit_acquire. This is particularly important on arches with weak(er) memory ordering (e.g. arm64).
Depends-On: 8238b4579866 ("wait_on_bit: add an acquire memory barrier")
Depends-On: d6ffe6067a54 ("provide arch_test_bit_acquire for architectures that define test_bit")
--- drivers/md/dm-bufio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/md/dm-bufio.c +7 -6
@@ -795,7 +795,8 @@ static void __make_buffer_clean(struct d {BUG_ON (b->hold_count); -if (!b->state)/* fast case */ +/* smp_load_acquire() pairs with read_endio()'s smp_mb__before_atomic() */ +if (!smp_load_acquire (&b->state))/* fast case */ return ;wait_on_bit_io (&b->state,B_READING ,TASK_UNINTERRUPTIBLE );
@@ -816,7 +817,7 @@ static struct dm_buffer *__get_unclaimedBUG_ON (test_bit (B_DIRTY , &b->state));if (static_branch_unlikely (&no_sleep_enabled) && c->no_sleep && -unlikely (test_bit (B_READING , &b->state))) +unlikely (test_bit_acquire (B_READING , &b->state)))continue ;if (!b->hold_count) {
@@ -1058,7 +1059,7 @@ found_buffer:* If the user called both dm_bufio_prefetch and dm_bufio_get on * the same buffer, it would deadlock if we waited. */ -if (nf ==NF_GET &&unlikely (test_bit (B_READING , &b->state))) +if (nf ==NF_GET &&unlikely (test_bit_acquire (B_READING , &b->state)))return NULL ; b->hold_count++;
@@ -1218,7 +1219,7 @@ void dm_bufio_release(struct dm_buffer ** invalid buffer. */ if ((b->read_error || b->write_error) && - !test_bit (B_READING , &b->state) && + !test_bit_acquire (B_READING , &b->state) && !test_bit (B_WRITING , &b->state) && !test_bit (B_DIRTY , &b->state)) {__unlink_buffer (b);
@@ -1479,7 +1480,7 @@ EXPORT_SYMBOL_GPL(dm_bufio_release_move)static void forget_buffer_locked (struct dm_buffer *b) { -if (likely (!b->hold_count) &&likely (!b->state)) { +if (likely (!b->hold_count) &&likely (!smp_load_acquire (&b->state))) {__unlink_buffer (b);__free_buffer_wake (b); }
@@ -1639,7 +1640,7 @@ static bool __try_evict_buffer(struct dm {if (!(gfp & __GFP_FS) || (static_branch_unlikely (&no_sleep_enabled) && b->c->no_sleep)) { -if (test_bit (B_READING , &b->state) || +if (test_bit_acquire (B_READING , &b->state) ||test_bit (B_WRITING , &b->state) ||test_bit (B_DIRTY , &b->state))return false;
Greg Kroah-Hartman
maintainerPATCH 30/94 btrfs: fix processing of delayed data refs during backref walking
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 4fc7b57228243d09c0d878873bf24fa64a90fa01 ]
When processing delayed data references during backref walking and we are using a share context (we are being called through fiemap), whenever we find a delayed data reference for an inode different from the one we are interested in, then we immediately exit and consider the data extent as shared. This is wrong, because:
1) This might be a DROP reference that will cancel out a reference in the extent tree;
2) Even if it's an ADD reference, it may be followed by a DROP reference that cancels it out.
In either case we should not exit immediately.
Fix this by never exiting when we find a delayed data reference for another inode - instead add the reference and if it does not cancel out other delayed reference, we will exit early when we call extent_is_shared() after processing all delayed references. If we find a drop reference, then signal the code that processes references from the extent tree (add_inline_refs() and add_keyed_refs()) to not exit immediately if it finds there a reference for another inode, since we have delayed drop references that may cancel it out. In this later case we exit once we don't have references in the rb trees that cancel out each other and have two references for different inodes.
Example reproducer for case 1):
$ cat test-1.sh #!/bin/bash
DEV=/dev/sdj
MNT=/mnt/sdj
mkfs.btrfs -f $DEV
mount $DEV $MNT
xfs_io -f -c "pwrite 0 64K" $MNT/foo cp --reflink=always $MNT/foo $MNT/bar
echo
echo "fiemap after cloning:"
xfs_io -c "fiemap -v" $MNT/foo
rm -f $MNT/bar
echo
echo "fiemap after removing file bar:"
xfs_io -c "fiemap -v" $MNT/foo
umount $MNT
Running it before this patch, the extent is still listed as shared, it has the flag 0x2000 (FIEMAP_EXTENT_SHARED) set:
$ ./test-1.sh
fiemap after cloning:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001 fiemap after removing file bar:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001
Example reproducer for case 2):
$ cat test-2.sh #!/bin/bash
DEV=/dev/sdj
MNT=/mnt/sdj
mkfs.btrfs -f $DEV
mount $DEV $MNT
xfs_io -f -c "pwrite 0 64K" $MNT/foo cp --reflink=always $MNT/foo $MNT/bar
# Flush delayed references to the extent tree and commit current
# transaction. sync
echo
echo "fiemap after cloning:"
xfs_io -c "fiemap -v" $MNT/foo
rm -f $MNT/bar
echo
echo "fiemap after removing file bar:"
xfs_io -c "fiemap -v" $MNT/foo
umount $MNT
Running it before this patch, the extent is still listed as shared, it has the flag 0x2000 (FIEMAP_EXTENT_SHARED) set:
$ ./test-2.sh
fiemap after cloning:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001 fiemap after removing file bar:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001
After this patch, after deleting bar in both tests, the extent is not reported with the 0x2000 flag anymore, it gets only the flag 0x1 (which is FIEMAP_EXTENT_LAST):
$ ./test-1.sh
fiemap after cloning:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001 fiemap after removing file bar:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x1
$ ./test-2.sh
fiemap after cloning:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x2001 fiemap after removing file bar:
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..127]: 26624..26751 128 0x1
These tests will later be converted to a test case for fstests.
--- fs/btrfs/backref.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-)
fs/btrfs/backref.c +24 -9
@@ -138,6 +138,7 @@ struct share_check {u64 root_objectid;u64 inum;int share_count; +bool have_delayed_delete_refs; };static inline int extent_is_shared (struct share_check *sc)
@@ -884,13 +885,22 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, key.offset = ref->offset;/* -* Found a inum that doesn't match our known inum, we -* know it's shared. +* If we have a share check context and a reference for +* another inode, we can't exit immediately. This is +* because even if this is a BTRFS_ADD_DELAYED_REF +* reference we may find next a BTRFS_DROP_DELAYED_REF +* which cancels out this ADD reference. +* +* If this is a DROP reference and there was no previous +* ADD reference, then we need to signal that when we +* process references from the extent tree (through +* add_inline_refs() and add_keyed_refs()), we should +* not exit early if we find a reference for another +* inode, because one of the delayed DROP references +* may cancel that reference in the extent tree. */ -if (sc && sc->inum && ref->objectid != sc->inum) { - ret =BACKREF_FOUND_SHARED ; - goto out; - } +if (sc && count <0 ) + sc->have_delayed_delete_refs = true; ret = add_indirect_ref(fs_info, preftrees, ref->root, &key, 0, node->bytenr, count, sc,
@@ -920,7 +930,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, }if (!ret) ret =extent_is_shared (sc); -out: +spin_unlock (&head->lock);return ret; }
@@ -1023,7 +1033,8 @@ static int add_inline_refs(const struct btrfs_fs_info *fs_info, key.type =BTRFS_EXTENT_DATA_KEY ; key.offset =btrfs_extent_data_ref_offset (leaf, dref); -if (sc && sc->inum && key.objectid != sc->inum) { +if (sc && sc->inum && key.objectid != sc->inum && + !sc->have_delayed_delete_refs) { ret =BACKREF_FOUND_SHARED ;break ; }
@@ -1033,6 +1044,7 @@ static int add_inline_refs(const struct btrfs_fs_info *fs_info, ret =add_indirect_ref (fs_info, preftrees, root, &key,0 , bytenr, count, sc,GFP_NOFS ); +break ; }default :
@@ -1122,7 +1134,8 @@ static int add_keyed_refs(struct btrfs_root *extent_root, key.type =BTRFS_EXTENT_DATA_KEY ; key.offset =btrfs_extent_data_ref_offset (leaf, dref); -if (sc && sc->inum && key.objectid != sc->inum) { +if (sc && sc->inum && key.objectid != sc->inum && + !sc->have_delayed_delete_refs) { ret =BACKREF_FOUND_SHARED ;break ; }
@@ -1544,6 +1557,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr, .root_objectid = root->root_key.objectid, .inum = inum, .share_count = 0, + .have_delayed_delete_refs = false, };ulist_init (roots);
@@ -1578,6 +1592,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr,break ; bytenr = node->val; shared.share_count =0 ; + shared.have_delayed_delete_refs = false;cond_resched (); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/94 btrfs: fix processing of delayed tree block refs during backref walking
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 943553ef9b51db303ab2b955c1025261abfdf6fb ]
During backref walking, when processing a delayed reference with a type of BTRFS_TREE_BLOCK_REF_KEY, we have two bugs there:
1) We are accessing the delayed references extent_op, and its key, without the protection of the delayed ref head's lock;
2) If there's no extent op for the delayed ref head, we end up with an uninitialized key in the stack, variable 'tmp_op_key', and then pass it to add_indirect_ref(), which adds the reference to the indirect refs rb tree.
This is wrong, because indirect references should have a NULL key when we don't have access to the key, and in that case they should be added to the indirect_missing_keys rb tree and not to the indirect rb tree.
This means that if have BTRFS_TREE_BLOCK_REF_KEY delayed ref resulting from freeing an extent buffer, therefore with a count of -1, it will not cancel out the corresponding reference we have in the extent tree (with a count of 1), since both references end up in different rb trees.
When using fiemap, where we often need to check if extents are shared through shared subtrees resulting from snapshots, it means we can incorrectly report an extent as shared when it's no longer shared. However this is temporary because after the transaction is committed the extent is no longer reported as shared, as running the delayed reference results in deleting the tree block reference from the extent tree.
Outside the fiemap context, the result is unpredictable, as the key was not initialized but it's used when navigating the rb trees to insert and search for references (prelim_ref_compare()), and we expect all references in the indirect rb tree to have valid keys.
The following reproducer triggers the second bug:
$ cat test.sh #!/bin/bash
DEV=/dev/sdj
MNT=/mnt/sdj
mkfs.btrfs -f $DEV
mount -o compress $DEV $MNT
# With a compressed 128M file we get a tree height of 2 (level 1 root). xfs_io -f -c "pwrite -b 1M 0 128M" $MNT/foo
btrfs subvolume snapshot $MNT $MNT/snap
# Fiemap should output 0x2008 in the flags column. # 0x2000 means shared extent
# 0x8 means encoded extent (because it's compressed) echo
echo "fiemap after snapshot, range [120M, 120M + 128K):" xfs_io -c "fiemap -v 120M 128K" $MNT/foo
echo
# Overwrite one extent and fsync to flush delalloc and COW a new path
# in the snapshot's tree. # # After this we have a BTRFS_DROP_DELAYED_REF delayed ref of type # BTRFS_TREE_BLOCK_REF_KEY with a count of -1 for every COWed extent # buffer in the path. # # In the extent tree we have inline references of type # BTRFS_TREE_BLOCK_REF_KEY, with a count of 1, for the same extent # buffers, so they should cancel each other, and the extent buffers in # the fs tree should no longer be considered as shared. # echo "Overwriting file range [120M, 120M + 128K)..." xfs_io -c "pwrite -b 128K 120M 128K" $MNT/snap/foo xfs_io -c "fsync" $MNT/snap/foo
# Fiemap should output 0x8 in the flags column. The extent in the range # [120M, 120M + 128K) is no longer shared, it's now exclusive to the fs
# tree. echo echo "fiemap after overwrite range [120M, 120M + 128K):" xfs_io -c "fiemap -v 120M 128K" $MNT/foo echo
umount $MNT
Running it before this patch:
$ ./test.sh (...) wrote 134217728/134217728 bytes at offset 0 128 MiB, 128 ops; 0.1152 sec (1.085 GiB/sec and 1110.5809 ops/sec) Create a snapshot of '/mnt/sdj' in '/mnt/sdj/snap'
fiemap after snapshot, range [120M, 120M + 128K):
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [245760..246015]: 34304..34559 256 0x2008
Overwriting file range [120M, 120M + 128K)...
wrote 131072/131072 bytes at offset 125829120
128 KiB, 1 ops; 0.0001 sec (683.060 MiB/sec and 5464.4809 ops/sec)
fiemap after overwrite range [120M, 120M + 128K):
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [245760..246015]: 34304..34559 256 0x2008
The extent in the range [120M, 120M + 128K) is still reported as shared (0x2000 bit set) after overwriting that range and flushing delalloc, which is not correct - an entire path was COWed in the snapshot's tree and the extent is now only referenced by the original fs tree.
Running it after this patch:
$ ./test.sh (...) wrote 134217728/134217728 bytes at offset 0 128 MiB, 128 ops; 0.1198 sec (1.043 GiB/sec and 1068.2067 ops/sec) Create a snapshot of '/mnt/sdj' in '/mnt/sdj/snap'
fiemap after snapshot, range [120M, 120M + 128K):
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [245760..246015]: 34304..34559 256 0x2008
Overwriting file range [120M, 120M + 128K)...
wrote 131072/131072 bytes at offset 125829120
128 KiB, 1 ops; 0.0001 sec (694.444 MiB/sec and 5555.5556 ops/sec)
fiemap after overwrite range [120M, 120M + 128K):
/mnt/sdj/foo:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [245760..246015]: 34304..34559 256 0x8
Now the extent is not reported as shared anymore.
So fix this by passing a NULL key pointer to add_indirect_ref() when processing a delayed reference for a tree block if there's no extent op for our delayed ref head with a defined key. Also access the extent op only after locking the delayed ref head's lock.
The reproducer will be converted later to a test case for fstests.
--- fs/btrfs/backref.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/btrfs/backref.c +7 -6
@@ -821,16 +821,11 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, struct preftrees *preftrees, struct share_check *sc) { struct btrfs_delayed_ref_node *node; -struct btrfs_delayed_extent_op *extent_op = head->extent_op;struct btrfs_key key; -struct btrfs_key tmp_op_key;struct rb_node *n;int count;int ret =0 ; -if (extent_op && extent_op->update_key) -btrfs_disk_key_to_cpu (&tmp_op_key, &extent_op->key); -spin_lock (&head->lock); for (n = rb_first_cached(&head->ref_tree); n; n = rb_next(n)) { node = rb_entry(n, struct btrfs_delayed_ref_node,
@@ -856,10 +851,16 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info,case BTRFS_TREE_BLOCK_REF_KEY : {/* NORMAL INDIRECT METADATA backref */ struct btrfs_delayed_tree_ref *ref; +struct btrfs_key *key_ptr =NULL ; + +if (head->extent_op && head->extent_op->update_key) { +btrfs_disk_key_to_cpu (&key, &head->extent_op->key); + key_ptr = &key; + } ref =btrfs_delayed_node_to_tree_ref (node); ret =add_indirect_ref (fs_info, preftrees, ref->root, - &tmp_op_key, ref->level +1 , + key_ptr, ref->level +1 , node->bytenr, count, sc,GFP_ATOMIC );break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/94 drm/vc4: Add module dependency on hdmi-codec
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit d1c0b7de4dfa5505cf7a1d6220aa72aace4435d0 ]
The VC4 HDMI controller driver relies on the HDMI codec ASoC driver. In order to set it up properly, in vc4_hdmi_audio_init(), our HDMI driver will register a device matching the HDMI codec driver, and then register an ASoC card using that codec.
However, if vc4 is compiled as a module, chances are that the hdmi-codec driver will be too. In such a case, the module loader will have a very narrow window to load the module between the device registration and the card registration.
If it fails to load the module in time, the card registration will fail with EPROBE_DEFER, and we'll abort the audio initialisation, unregistering the HDMI codec device in the process.
The next time the bind callback will be run, it's likely that we end up missing that window again, effectively preventing vc4 to probe entirely.
In order to prevent this, we can create a soft dependency of the vc4 driver on the HDMI codec one so that we're sure the HDMI codec will be loaded before the VC4 module is, and thus we'll never end up in the previous situation.
--- drivers/gpu/drm/vc4/vc4_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/vc4/vc4_drv.c +1 -0
@@ -490,6 +490,7 @@ module_init(vc4_drm_register);module_exit (vc4_drm_unregister);MODULE_ALIAS ("platform:vc4-drm" ); +MODULE_SOFTDEP ("pre: snd-soc-hdmi-codec" );MODULE_DESCRIPTION ("Broadcom VC4 DRM Driver" );MODULE_AUTHOR ("Eric Anholt <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/94 drm/vc4: hdmi: Enforce the minimum rate at runtime_resume
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit ae71ab585c819f83aec84f91eb01157a90552ef2 ]
This is a revert of commit fd5894fa2413 ("drm/vc4: hdmi: Remove clock rate initialization"), with the code slightly moved around.
It turns out that we can't downright remove that code from the driver, since the Pi0-3 and Pi4 are in different cases, and it only works for the Pi4.
Indeed, the commit mentioned above was relying on the RaspberryPi firmware clocks driver to initialize the rate if it wasn't done by the firmware. However, the Pi0-3 are using the clk-bcm2835 clock driver that wasn't doing this initialization. We therefore end up with the clock not being assigned a rate, and the CPU stalling when trying to access a register.
We can't move that initialization in the clk-bcm2835 driver, since the HSM clock we depend on is actually part of the HDMI power domain, so any rate setup is only valid when the power domain is enabled. Thus, we reinstated the minimum rate setup at runtime_suspend, which should address both issues.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/vc4/vc4_hdmi.c +9 -0
@@ -2871,6 +2871,15 @@ static int vc4_hdmi_runtime_resume(struct device *dev)u32 __maybe_unused value;int ret; +/* +* The HSM clock is in the HDMI power domain, so we need to set +* its frequency while the power domain is active so that it +* keeps its rate. +*/ + ret =clk_set_min_rate (vc4_hdmi->hsm_clock,HSM_MIN_CLOCK_FREQ ); +if (ret) +return ret; + ret =clk_prepare_enable (vc4_hdmi->hsm_clock);if (ret)return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/94 ACPI: extlog: Handle multiple records
In reply to Greg Kroah-HartmanFrom: Tony Luck <[email protected]>
[ Upstream commit f6ec01da40e4139b41179f046044ee7c4f6370dc ]
If there is no user space consumer of extlog_mem trace records, then Linux properly handles multiple error records in an ELOG block
extlog_print() print_extlog_rcd() __print_extlog_rcd() cper_estatus_print() apei_estatus_for_each_section()
But the other code path hard codes looking for a single record to output a trace record.
Fix by using the same apei_estatus_for_each_section() iterator to step over all records.
--- drivers/acpi/acpi_extlog.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/acpi/acpi_extlog.c +20 -13
@@ -12,6 +12,7 @@#include <linux/ratelimit.h> #include <linux/edac.h> #include <linux/ras.h> +#include <acpi/ghes.h> #include <asm/cpu.h> #include <asm/mce.h>
@@ -138,8 +139,8 @@ static int extlog_print(struct notifier_block *nb, unsigned long val,int cpu = mce->extcpu;struct acpi_hest_generic_status *estatus, *tmp;struct acpi_hest_generic_data *gdata; -const guid_t *fru_id = &guid_null; -char *fru_text ="" ; +const guid_t *fru_id; +char *fru_text;guid_t *sec_type;static u32 err_seq;
@@ -160,17 +161,23 @@ static int extlog_print(struct notifier_block *nb, unsigned long val,/* log event via trace */ err_seq++; - gdata = (struct acpi_hest_generic_data *)(tmp +1 ); -if (gdata->validation_bits &CPER_SEC_VALID_FRU_ID ) - fru_id = (guid_t *)gdata->fru_id; -if (gdata->validation_bits &CPER_SEC_VALID_FRU_TEXT ) - fru_text = gdata->fru_text; - sec_type = (guid_t *)gdata->section_type; -if (guid_equal (sec_type, &CPER_SEC_PLATFORM_MEM )) { -struct cper_sec_mem_err *mem = (void *)(gdata +1 ); -if (gdata->error_data_length >=sizeof (*mem)) -trace_extlog_mem_event (mem, err_seq, fru_id, fru_text, - (u8 )gdata->error_severity); +apei_estatus_for_each_section (tmp, gdata) { +if (gdata->validation_bits &CPER_SEC_VALID_FRU_ID ) + fru_id = (guid_t *)gdata->fru_id; +else + fru_id = &guid_null; +if (gdata->validation_bits &CPER_SEC_VALID_FRU_TEXT ) + fru_text = gdata->fru_text; +else + fru_text ="" ; + sec_type = (guid_t *)gdata->section_type; +if (guid_equal (sec_type, &CPER_SEC_PLATFORM_MEM )) { +struct cper_sec_mem_err *mem = (void *)(gdata +1 ); + +if (gdata->error_data_length >=sizeof (*mem)) +trace_extlog_mem_event (mem, err_seq, fru_id, fru_text, + (u8 )gdata->error_severity); + } } out:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/94 tipc: Fix recognition of trial period
In reply to Greg Kroah-HartmanFrom: Mark Tomlinson <[email protected]>
[ Upstream commit 28be7ca4fcfd69a2d52aaa331adbf9dbe91f9e6e ]
The trial period exists until jiffies is after addr_trial_end. But as jiffies will eventually overflow, just using time_after will eventually give incorrect results. As the node address is set once the trial period ends, this can be used to know that we are not in the trial period.
--- net/tipc/discover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/discover.c +1 -1
@@ -148,8 +148,8 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d, {struct net *net = d->net;struct tipc_net *tn =tipc_net (net); -bool trial =time_before (jiffies, tn->addr_trial_end);u32 self =tipc_own_addr (net); +bool trial =time_before (jiffies, tn->addr_trial_end) && !self;if (mtyp ==DSC_TRIAL_FAIL_MSG ) {if (!trial)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/94 tipc: fix an information leak in tipc_topsrv_kern_subscr
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
[ Upstream commit 777ecaabd614d47c482a5c9031579e66da13989a ]
Use a 8-byte write to initialize sub.usr_handle in tipc_topsrv_kern_subscr(), otherwise four bytes remain uninitialized when issuing setsockopt(..., SOL_TIPC, ...).
This resulted in an infoleak reported by KMSAN when the packet was received:
=====================================================
BUG: KMSAN: kernel-infoleak in copyout+0xbc/0x100 lib/iov_iter.c:169 instrument_copy_to_user ./include/linux/instrumented.h:121 copyout+0xbc/0x100 lib/iov_iter.c:169 _copy_to_iter+0x5c0/0x20a0 lib/iov_iter.c:527 copy_to_iter ./include/linux/uio.h:176 simple_copy_to_iter+0x64/0xa0 net/core/datagram.c:513 __skb_datagram_iter+0x123/0xdc0 net/core/datagram.c:419 skb_copy_datagram_iter+0x58/0x200 net/core/datagram.c:527 skb_copy_datagram_msg ./include/linux/skbuff.h:3903 packet_recvmsg+0x521/0x1e70 net/packet/af_packet.c:3469 ____sys_recvmsg+0x2c4/0x810 net/socket.c:? ___sys_recvmsg+0x217/0x840 net/socket.c:2743 __sys_recvmsg net/socket.c:2773 __do_sys_recvmsg net/socket.c:2783 __se_sys_recvmsg net/socket.c:2780 __x64_sys_recvmsg+0x364/0x540 net/socket.c:2780 do_syscall_x64 arch/x86/entry/common.c:50 do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd arch/x86/entry/entry_64.S:120
...
Uninit was stored to memory at:
tipc_sub_subscribe+0x42d/0xb50 net/tipc/subscr.c:156 tipc_conn_rcv_sub+0x246/0x620 net/tipc/topsrv.c:375 tipc_topsrv_kern_subscr+0x2e8/0x400 net/tipc/topsrv.c:579 tipc_group_create+0x4e7/0x7d0 net/tipc/group.c:190 tipc_sk_join+0x2a8/0x770 net/tipc/socket.c:3084 tipc_setsockopt+0xae5/0xe40 net/tipc/socket.c:3201 __sys_setsockopt+0x87f/0xdc0 net/socket.c:2252 __do_sys_setsockopt net/socket.c:2263 __se_sys_setsockopt net/socket.c:2260 __x64_sys_setsockopt+0xe0/0x160 net/socket.c:2260 do_syscall_x64 arch/x86/entry/common.c:50 do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd arch/x86/entry/entry_64.S:120
Local variable sub created at:
tipc_topsrv_kern_subscr+0x57/0x400 net/tipc/topsrv.c:562 tipc_group_create+0x4e7/0x7d0 net/tipc/group.c:190
Bytes 84-87 of 88 are uninitialized
Memory access of size 88 starts at ffff88801ed57cd0 Data copied to user address 0000000020000400
...
=====================================================
--- net/tipc/topsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/topsrv.c +1 -1
@@ -568,7 +568,7 @@ bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, sub.seq.upper = upper; sub.timeout =TIPC_WAIT_FOREVER ; sub.filter = filter; - *(u32 *)&sub.usr_handle = port; + *(u64 *)&sub.usr_handle = (u64 )port; con =tipc_conn_alloc (tipc_topsrv (net));if (IS_ERR (con))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/94 net: dsa: qca8k: fix inband mgmt for big-endian systems
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit a2550d3ce53c68f54042bc5e468c4d07491ffe0e ]
The header and the data of the skb for the inband mgmt requires to be in little-endian. This is problematic for big-endian system as the mgmt header is written in the cpu byte order.
Fix this by converting each value for the mgmt header and data to little-endian, and convert to cpu byte order the mgmt header and data sent by the switch.
--- drivers/net/dsa/qca/qca8k-8xxx.c | 63 ++++++++++++++++++++++++-------- include/linux/dsa/tag_qca.h | 6 +-- 2 files changed, 50 insertions(+), 19 deletions(-)
drivers/net/dsa/qca/qca8k-8xxx.c +47 -16
@@ -137,27 +137,42 @@ static void qca8k_rw_reg_ack_handler(struct dsa_switch *ds, struct sk_buff *skb)struct qca8k_mgmt_eth_data *mgmt_eth_data;struct qca8k_priv *priv = ds->priv;struct qca_mgmt_ethhdr *mgmt_ethhdr; +u32 command;u8 len, cmd; +int i; mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb_mac_header (skb); mgmt_eth_data = &priv->mgmt_eth_data; - cmd =FIELD_GET (QCA_HDR_MGMT_CMD , mgmt_ethhdr->command); - len =FIELD_GET (QCA_HDR_MGMT_LENGTH , mgmt_ethhdr->command); + command =get_unaligned_le32 (&mgmt_ethhdr->command); + cmd =FIELD_GET (QCA_HDR_MGMT_CMD , command); + len =FIELD_GET (QCA_HDR_MGMT_LENGTH , command);/* Make sure the seq match the requested packet */ -if (mgmt_ethhdr->seq == mgmt_eth_data->seq) +if (get_unaligned_le32 (&mgmt_ethhdr->seq) == mgmt_eth_data->seq) mgmt_eth_data->ack = true;if (cmd ==MDIO_READ ) { - mgmt_eth_data->data[0 ] = mgmt_ethhdr->mdio_data; +u32 *val = mgmt_eth_data->data; + + *val =get_unaligned_le32 (&mgmt_ethhdr->mdio_data);/* Get the rest of the 12 byte of data. * The read/write function will extract the requested data. */ -if (len >QCA_HDR_MGMT_DATA1_LEN ) -memcpy (mgmt_eth_data->data +1 , skb->data, -QCA_HDR_MGMT_DATA2_LEN ); +if (len >QCA_HDR_MGMT_DATA1_LEN ) { +__le32 *data2 = (__le32 *)skb->data; +int data_len =min_t (int,QCA_HDR_MGMT_DATA2_LEN , + len -QCA_HDR_MGMT_DATA1_LEN ); + + val++; + +for (i =sizeof (u32); i <= data_len; i +=sizeof (u32)) { + *val =get_unaligned_le32 (data2); + val++; + data2++; + } + } }complete (&mgmt_eth_data->rw_done);
@@ -169,8 +184,10 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *struct qca_mgmt_ethhdr *mgmt_ethhdr;unsigned int real_len;struct sk_buff *skb; -u32 *data2; +__le32 *data2; +u32 command;u16 hdr; +int i; skb =dev_alloc_skb (QCA_HDR_MGMT_PKT_LEN );if (!skb)
@@ -199,20 +216,32 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 * hdr |=FIELD_PREP (QCA_HDR_XMIT_DP_BIT ,BIT (0 )); hdr |=FIELD_PREP (QCA_HDR_XMIT_CONTROL ,QCA_HDR_XMIT_TYPE_RW_REG ); - mgmt_ethhdr->command =FIELD_PREP (QCA_HDR_MGMT_ADDR , reg); - mgmt_ethhdr->command |=FIELD_PREP (QCA_HDR_MGMT_LENGTH , real_len); - mgmt_ethhdr->command |=FIELD_PREP (QCA_HDR_MGMT_CMD , cmd); - mgmt_ethhdr->command |=FIELD_PREP (QCA_HDR_MGMT_CHECK_CODE , + command =FIELD_PREP (QCA_HDR_MGMT_ADDR , reg); + command |=FIELD_PREP (QCA_HDR_MGMT_LENGTH , real_len); + command |=FIELD_PREP (QCA_HDR_MGMT_CMD , cmd); + command |=FIELD_PREP (QCA_HDR_MGMT_CHECK_CODE ,QCA_HDR_MGMT_CHECK_CODE_VAL ); +put_unaligned_le32 (command, &mgmt_ethhdr->command); +if (cmd ==MDIO_WRITE ) - mgmt_ethhdr->mdio_data = *val; +put_unaligned_le32 (*val, &mgmt_ethhdr->mdio_data); mgmt_ethhdr->hdr =htons (hdr); data2 =skb_put_zero (skb,QCA_HDR_MGMT_DATA2_LEN +QCA_HDR_MGMT_PADDING_LEN ); -if (cmd ==MDIO_WRITE && len >QCA_HDR_MGMT_DATA1_LEN ) -memcpy (data2, val +1 , len -QCA_HDR_MGMT_DATA1_LEN ); +if (cmd ==MDIO_WRITE && len >QCA_HDR_MGMT_DATA1_LEN ) { +int data_len =min_t (int,QCA_HDR_MGMT_DATA2_LEN , + len -QCA_HDR_MGMT_DATA1_LEN ); + + val++; + +for (i =sizeof (u32); i <= data_len; i +=sizeof (u32)) { +put_unaligned_le32 (*val, data2); + data2++; + val++; + } + }return skb; }
@@ -220,9 +249,11 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *static void qca8k_mdio_header_fill_seq_num (struct sk_buff *skb,u32 seq_num) {struct qca_mgmt_ethhdr *mgmt_ethhdr; +u32 seq; + seq =FIELD_PREP (QCA_HDR_MGMT_SEQ_NUM , seq_num); mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb->data; - mgmt_ethhdr->seq =FIELD_PREP (QCA_HDR_MGMT_SEQ_NUM , seq_num); +put_unaligned_le32 (seq, &mgmt_ethhdr->seq); }static int qca8k_read_eth (struct qca8k_priv *priv,u32 reg,u32 *val,int len)
include/linux/dsa/tag_qca.h +3 -3
@@ -61,9 +61,9 @@ struct sk_buff;/* Special struct emulating a Ethernet header */ struct qca_mgmt_ethhdr { -u32 command;/* command bit 31:0 */ -u32 seq;/* seq 63:32 */ -u32 mdio_data;/* first 4byte mdio */ +__le32 command;/* command bit 31:0 */ +__le32 seq;/* seq 63:32 */ +__le32 mdio_data;/* first 4byte mdio */ __be16 hdr;/* qca hdr */ } __packed;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/94 net: dsa: qca8k: fix ethtool autocast mib for big-endian systems
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit 0d4636f7d72df3179b20a2d32b647881917a5e2a ]
The switch sends autocast mib in little-endian. This is problematic for big-endian system as the values needs to be converted.
Fix this by converting each mib value to cpu byte order.
--- drivers/net/dsa/qca/qca8k-8xxx.c | 20 ++++++++------------ include/linux/dsa/tag_qca.h | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-)
drivers/net/dsa/qca/qca8k-8xxx.c +8 -12
@@ -1518,9 +1518,9 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *skstruct qca8k_priv *priv = ds->priv;const struct qca8k_mib_desc *mib;struct mib_ethhdr *mib_ethhdr; -int i, mib_len, offset =0 ; -u64 *data; +__le32 *data2;u8 port; +int i; mib_ethhdr = (struct mib_ethhdr *)skb_mac_header (skb); mib_eth_data = &priv->mib_eth_data;
@@ -1532,28 +1532,24 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *skif (port != mib_eth_data->req_port) goto exit; - data = mib_eth_data->data; + data2 = (__le32 *)skb->data;for (i =0 ; i < priv->info->mib_count; i++) { mib = &ar8327_mib[i];/* First 3 mib are present in the skb head */ if (i <3 ) { - data[i] = mib_ethhdr->data[i]; + mib_eth_data->data[i] =get_unaligned_le32 (mib_ethhdr->data + i);continue ; } - mib_len =sizeof (uint32_t ); -/* Some mib are 64 bit wide */ if (mib->size ==2 ) - mib_len =sizeof (uint64_t ); - -/* Copy the mib value from packet to the */ -memcpy (data + i, skb->data + offset, mib_len); + mib_eth_data->data[i] =get_unaligned_le64 ((__le64 *)data2); +else + mib_eth_data->data[i] =get_unaligned_le32 (data2); -/* Set the offset for the next mib */ - offset += mib_len; + data2 += mib->size; } exit:
include/linux/dsa/tag_qca.h +1 -1
@@ -73,7 +73,7 @@ enum mdio_cmd { };struct mib_ethhdr { -u32 data[3 ];/* first 3 mib counter */ +__le32 data[3 ];/* first 3 mib counter */ __be16 hdr;/* qca hdr */ } __packed;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/94 i40e: Fix DMA mappings leak
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
[ Upstream commit aae425efdfd1b1d8452260a3cb49344ebf20b1f5 ]
During reallocation of RX buffers, new DMA mappings are created for those buffers.
steps for reproduction:
while :
do
for ((i=0; i<=8160; i=i+32))
do
ethtool -G enp130s0f0 rx $i tx $i
sleep 0.5
ethtool -g enp130s0f0
done
done
This resulted in crash:
i40e 0000:01:00.1: Unable to allocate memory for the Rx descriptor ring, size=65536 Driver BUG
WARNING: CPU: 0 PID: 4300 at net/core/xdp.c:141 xdp_rxq_info_unreg+0x43/0x50 Call Trace: i40e_free_rx_resources+0x70/0x80 [i40e] i40e_set_ringparam+0x27c/0x800 [i40e] ethnl_set_rings+0x1b2/0x290 genl_family_rcv_msg_doit.isra.15+0x10f/0x150 genl_family_rcv_msg+0xb3/0x160 ? rings_fill_reply+0x1a0/0x1a0 genl_rcv_msg+0x47/0x90 ? genl_family_rcv_msg+0x160/0x160 netlink_rcv_skb+0x4c/0x120 genl_rcv+0x24/0x40 netlink_unicast+0x196/0x230 netlink_sendmsg+0x204/0x3d0 sock_sendmsg+0x4c/0x50 __sys_sendto+0xee/0x160 ? handle_mm_fault+0xbe/0x1e0 ? syscall_trace_enter+0x1d3/0x2c0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x5b/0x1a0 entry_SYSCALL_64_after_hwframe+0x65/0xca RIP: 0033:0x7f5eac8b035b Missing register, driver bug WARNING: CPU: 0 PID: 4300 at net/core/xdp.c:119 xdp_rxq_info_unreg_mem_model+0x69/0x140 Call Trace: xdp_rxq_info_unreg+0x1e/0x50 i40e_free_rx_resources+0x70/0x80 [i40e] i40e_set_ringparam+0x27c/0x800 [i40e] ethnl_set_rings+0x1b2/0x290 genl_family_rcv_msg_doit.isra.15+0x10f/0x150 genl_family_rcv_msg+0xb3/0x160 ? rings_fill_reply+0x1a0/0x1a0 genl_rcv_msg+0x47/0x90 ? genl_family_rcv_msg+0x160/0x160 netlink_rcv_skb+0x4c/0x120 genl_rcv+0x24/0x40 netlink_unicast+0x196/0x230 netlink_sendmsg+0x204/0x3d0 sock_sendmsg+0x4c/0x50 __sys_sendto+0xee/0x160 ? handle_mm_fault+0xbe/0x1e0 ? syscall_trace_enter+0x1d3/0x2c0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x5b/0x1a0 entry_SYSCALL_64_after_hwframe+0x65/0xca RIP: 0033:0x7f5eac8b035b
This was caused because of new buffers with different RX ring count should substitute older ones, but those buffers were freed in i40e_configure_rx_ring and reallocated again with i40e_alloc_rx_bi, thus kfree on rx_bi caused leak of already mapped DMA.
Fix this by reallocating ZC with rx_bi_zc struct when BPF program loads. Additionally reallocate back to rx_bi when BPF program unloads.
If BPF program is loaded/unloaded and XSK pools are created, reallocate RX queues accordingly in XSP_SETUP_XSK_POOL handler.
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 3 - drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 ++-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 ++++++++++++++++--- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- 6 files changed, 74 insertions(+), 28 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +0 -3
@@ -2181,9 +2181,6 @@ static int i40e_set_ringparam(struct net_device *netdev,*/ rx_rings[i].tail = hw->hw_addr +I40E_PRTGEN_STATUS ; err =i40e_setup_rx_descriptors (&rx_rings[i]); -if (err) - goto rx_unwind; - err =i40e_alloc_rx_bi (&rx_rings[i]);if (err) goto rx_unwind;
drivers/net/ethernet/intel/i40e/i40e_main.c +9 -7
@@ -3565,12 +3565,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)if (ring->vsi->type ==I40E_VSI_MAIN )xdp_rxq_info_unreg_mem_model (&ring->xdp_rxq); -kfree (ring->rx_bi); ring->xsk_pool =i40e_xsk_pool (ring);if (ring->xsk_pool) { - ret =i40e_alloc_rx_bi_zc (ring); -if (ret) -return ret; ring->rx_buf_len =xsk_pool_get_rx_frame_size (ring->xsk_pool);/* For AF_XDP ZC, we disallow packets to span on
@@ -3588,9 +3584,6 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) ring->queue_index); }else { - ret =i40e_alloc_rx_bi (ring); -if (ret) -return ret; ring->rx_buf_len = vsi->rx_buf_len;if (ring->vsi->type ==I40E_VSI_MAIN ) { ret = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
@@ -13304,6 +13297,14 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, struct bpf_prog *prog,i40e_reset_and_rebuild (pf, true, true); } +if (!i40e_enabled_xdp_vsi (vsi) && prog) { +if (i40e_realloc_rx_bi_zc (vsi, true)) +return -ENOMEM ; + }else if (i40e_enabled_xdp_vsi (vsi) && !prog) { +if (i40e_realloc_rx_bi_zc (vsi, false)) +return -ENOMEM ; + } +for (i =0 ; i < vsi->num_queue_pairs; i++)WRITE_ONCE (vsi->rx_rings[i]->xdp_prog, vsi->xdp_prog);
@@ -13536,6 +13537,7 @@ int i40e_queue_pair_disable(struct i40e_vsi *vsi, int queue_pair)i40e_queue_pair_disable_irq (vsi, queue_pair); err =i40e_queue_pair_toggle_rings (vsi, queue_pair, false/* off */ ); +i40e_clean_rx_ring (vsi->rx_rings[queue_pair]);i40e_queue_pair_toggle_napi (vsi, queue_pair, false/* off */ );i40e_queue_pair_clean_rings (vsi, queue_pair);i40e_queue_pair_reset_stats (vsi, queue_pair);
drivers/net/ethernet/intel/i40e/i40e_txrx.c +5 -8
@@ -1457,14 +1457,6 @@ int i40e_setup_tx_descriptors(struct i40e_ring *tx_ring)return -ENOMEM ; } -int i40e_alloc_rx_bi (struct i40e_ring *rx_ring) -{ -unsigned long sz =sizeof (*rx_ring->rx_bi) * rx_ring->count; - - rx_ring->rx_bi =kzalloc (sz,GFP_KERNEL ); -return rx_ring->rx_bi ?0 : -ENOMEM ; -} -static void i40e_clear_rx_bi (struct i40e_ring *rx_ring) {memset (rx_ring->rx_bi,0 ,sizeof (*rx_ring->rx_bi) * rx_ring->count);
@@ -1593,6 +1585,11 @@ int i40e_setup_rx_descriptors(struct i40e_ring *rx_ring) rx_ring->xdp_prog = rx_ring->vsi->xdp_prog; + rx_ring->rx_bi = +kcalloc (rx_ring->count,sizeof (*rx_ring->rx_bi),GFP_KERNEL ); +if (!rx_ring->rx_bi) +return -ENOMEM ; +return 0 ; }
drivers/net/ethernet/intel/i40e/i40e_txrx.h +0 -1
@@ -469,7 +469,6 @@ int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);bool __i40e_chk_linearize (struct sk_buff *skb);int i40e_xdp_xmit (struct net_device *dev,int n,struct xdp_frame **frames,u32 flags); -int i40e_alloc_rx_bi (struct i40e_ring *rx_ring);/** * i40e_get_head - Retrieve head from head writeback
drivers/net/ethernet/intel/i40e/i40e_xsk.c +59 -8
91 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_xsk.h +1 -1
@@ -32,7 +32,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget);bool i40e_clean_xdp_tx_irq (struct i40e_vsi *vsi,struct i40e_ring *tx_ring);int i40e_xsk_wakeup (struct net_device *dev,u32 queue_id,u32 flags); -int i40e_alloc_rx_bi_zc (struct i40e_ring *rx_ring); +int i40e_realloc_rx_bi_zc (struct i40e_vsi *vsi,bool zc);void i40e_clear_rx_bi_zc (struct i40e_ring *rx_ring);#endif /* _I40E_XSK_H_ */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/94 tls: strp: make sure the TCP skbs do not have overlapping data
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 0d87bbd39d7fd1135ab9eca672d760470f6508e8 ]
TLS tries to get away with using the TCP input queue directly. This does not work if there is duplicated data (multiple skbs holding bytes for the same seq number range due to retransmits). Check for this condition and fall back to copy mode, it should be rare.
--- net/tls/tls_strp.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
net/tls/tls_strp.c +28 -4
@@ -273,7 +273,7 @@ static int tls_strp_read_copyin(struct tls_strparser *strp)return desc.error; } -static int tls_strp_read_short (struct tls_strparser *strp) +static int tls_strp_read_copy (struct tls_strparser *strp,bool qshort) {struct skb_shared_info *shinfo;struct page *page;
@@ -283,7 +283,7 @@ static int tls_strp_read_short(struct tls_strparser *strp)* to read the data out. Otherwise the connection will stall. * Without pressure threshold of INT_MAX will never be ready. */ -if (likely (!tcp_epollin_ready (strp->sk,INT_MAX ))) +if (likely (qshort && !tcp_epollin_ready (strp->sk,INT_MAX )))return 0 ; shinfo =skb_shinfo (strp->anchor);
@@ -315,6 +315,27 @@ static int tls_strp_read_short(struct tls_strparser *strp)return 0 ; } +static bool tls_strp_check_no_dup (struct tls_strparser *strp) +{ +unsigned int len = strp->stm.offset + strp->stm.full_len; +struct sk_buff *skb; +u32 seq; + + skb =skb_shinfo (strp->anchor)->frag_list; + seq =TCP_SKB_CB (skb)->seq; + +while (skb->len < len) { + seq += skb->len; + len -= skb->len; + skb = skb->next; + +if (TCP_SKB_CB (skb)->seq != seq) +return false; + } + +return true; +} +static void tls_strp_load_anchor_with_queue (struct tls_strparser *strp,int len) {struct tcp_sock *tp =tcp_sk (strp->sk);
@@ -373,7 +394,7 @@ static int tls_strp_read_sock(struct tls_strparser *strp)return tls_strp_read_copyin (strp);if (inq < strp->stm.full_len) -return tls_strp_read_short (strp); +return tls_strp_read_copy (strp, true);if (!strp->stm.full_len) {tls_strp_load_anchor_with_queue (strp, inq);
@@ -387,9 +408,12 @@ static int tls_strp_read_sock(struct tls_strparser *strp) strp->stm.full_len = sz;if (!strp->stm.full_len || inq < strp->stm.full_len) -return tls_strp_read_short (strp); +return tls_strp_read_copy (strp, true); } +if (!tls_strp_check_no_dup (strp)) +return tls_strp_read_copy (strp, false); + strp->msg_ready =1 ;tls_rx_msg_ready (strp);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/94 HID: magicmouse: Do not set BTN_MOUSE on double report
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit bb5f0c855dcfc893ae5ed90e4c646bde9e4498bf ]
Under certain conditions the Magic Trackpad can group 2 reports in a single packet. The packet is split and the raw event function is invoked recursively for each part.
However, after processing each part, the BTN_MOUSE status is updated, sending multiple click events. [1]
Return after processing double reports to avoid this issue.
--- drivers/hid/hid-magicmouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-magicmouse.c +1 -1
@@ -480,7 +480,7 @@ static int magicmouse_raw_event(struct hid_device *hdev,magicmouse_raw_event (hdev, report, data +2 , data[1 ]);magicmouse_raw_event (hdev, report, data +2 + data[1 ], size -2 - data[1 ]); -break ; +return 0 ;default :return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/94 sfc: Change VF mac via PF as first preference if available.
In reply to Greg Kroah-HartmanFrom: Jonathan Cooper <[email protected]>
[ Upstream commit a8aed7b35becfd21f22a77c7014029ea837b018f ]
Changing a VF's mac address through the VF (rather than via the PF) fails with EPERM because the latter part of efx_ef10_set_mac_address attempts to change the vport mac address list as the VF. Even with this fixed it still fails with EBUSY because the vadaptor is still assigned on the VF - the vadaptor reassignment must be within a section where the VF has torn down its state.
A major reason this has broken is because we have two functions that ostensibly do the same thing - have a PF and VF cooperate to change a VF mac address. Rather than do this, if we are changing the mac of a VF that has a link to the PF in the same VM then simply call sriov_set_vf_mac instead, which is a proven working function that does that.
If there is no PF available, or that fails non-fatally, then attempt to change the VF's mac address as we would a PF, without updating the PF's data.
Test case:
Create a VF:
echo 1 > /sys/class/net/<if>/device/sriov_numvfs
Set the mac address of the VF directly:
ip link set <vf> addr 00:11:22:33:44:55
Set the MAC address of the VF via the PF:
ip link set <pf> vf 0 mac 00:11:22:33:44:66
Without this patch the last command will fail with ENOENT.
--- drivers/net/ethernet/sfc/ef10.c | 58 ++++++++++++++------------------- 1 file changed, 24 insertions(+), 34 deletions(-)
drivers/net/ethernet/sfc/ef10.c +24 -34
@@ -3277,6 +3277,30 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)bool was_enabled = efx->port_enabled;int rc; +#ifdef CONFIG_SFC_SRIOV +/* If this function is a VF and we have access to the parent PF, +* then use the PF control path to attempt to change the VF MAC address. +*/ +if (efx->pci_dev->is_virtfn && efx->pci_dev->physfn) { +struct efx_nic *efx_pf =pci_get_drvdata (efx->pci_dev->physfn); +struct efx_ef10_nic_data *nic_data = efx->nic_data; +u8 mac[ETH_ALEN ]; + +/* net_dev->dev_addr can be zeroed by efx_net_stop in +* efx_ef10_sriov_set_vf_mac, so pass in a copy. +*/ +ether_addr_copy (mac, efx->net_dev->dev_addr); + + rc =efx_ef10_sriov_set_vf_mac (efx_pf, nic_data->vf_index, mac); +if (!rc) +return 0 ; + +netif_dbg (efx, drv, efx->net_dev, +"Updating VF mac via PF failed (%d), setting directly\n" , + rc); + } +#endif +efx_device_detach_sync (efx);efx_net_stop (efx->net_dev);
@@ -3297,40 +3321,6 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)efx_net_open (efx->net_dev);efx_device_attach_if_not_resetting (efx); -#ifdef CONFIG_SFC_SRIOV -if (efx->pci_dev->is_virtfn && efx->pci_dev->physfn) { -struct efx_ef10_nic_data *nic_data = efx->nic_data; -struct pci_dev *pci_dev_pf = efx->pci_dev->physfn; - -if (rc == -EPERM ) { -struct efx_nic *efx_pf; - -/* Switch to PF and change MAC address on vport */ - efx_pf =pci_get_drvdata (pci_dev_pf); - - rc =efx_ef10_sriov_set_vf_mac (efx_pf, - nic_data->vf_index, - efx->net_dev->dev_addr); - }else if (!rc) { -struct efx_nic *efx_pf =pci_get_drvdata (pci_dev_pf); -struct efx_ef10_nic_data *nic_data = efx_pf->nic_data; -unsigned int i; - -/* MAC address successfully changed by VF (with MAC -* spoofing) so update the parent PF if possible. -*/ -for (i =0 ; i < efx_pf->vf_count; ++i) { -struct ef10_vf *vf = nic_data->vf + i; - -if (vf->efx == efx) { -ether_addr_copy (vf->mac, - efx->net_dev->dev_addr); -return 0 ; - } - } - } - } else -#endif if (rc == -EPERM ) {netif_err (efx, drv, efx->net_dev, "Cannot change MAC address; use sfboot to enable"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/94 net/atm: fix proc_mpc_write incorrect return value
In reply to Greg Kroah-HartmanFrom: Xiaobo Liu <[email protected]>
[ Upstream commit d8bde3bf7f82dac5fc68a62c2816793a12cafa2a ]
Then the input contains '\0' or '\n', proc_mpc_write has read them, so the return value needs +1.
--- net/atm/mpoa_proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/atm/mpoa_proc.c +2 -1
@@ -219,11 +219,12 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff,if (!page)return -ENOMEM ; -for (p = page, len =0 ; len < nbytes; p++, len++) { +for (p = page, len =0 ; len < nbytes; p++) {if (get_user (*p, buff++)) {free_page ((unsigned long )page);return -EFAULT ; } + len +=1 ;if (*p =='\0' || *p =='\n' )break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/94 net: phy: dp83867: Extend RX strap quirk for SGMII mode
In reply to Greg Kroah-HartmanFrom: Harini Katakam <[email protected]>
[ Upstream commit 0c9efbd5c50c64ead434960a404c9c9a097b0403 ]
When RX strap in HW is not set to MODE 3 or 4, bit 7 and 8 in CF4 register should be set. The former is already handled in dp83867_config_init; add the latter in SGMII specific initialization.
--- drivers/net/phy/dp83867.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/phy/dp83867.c +8 -0
@@ -853,6 +853,14 @@ static int dp83867_config_init(struct phy_device *phydev)else val &= ~DP83867_SGMII_TYPE ;phy_write_mmd (phydev,DP83867_DEVADDR ,DP83867_SGMIICTL , val); + +/* This is a SW workaround for link instability if RX_CTRL is +* not strapped to mode 3 or 4 in HW. This is required for SGMII +* in addition to clearing bit 7, handled above. +*/ +if (dp83867->rxctrl_strap_quirk) +phy_set_bits_mmd (phydev,DP83867_DEVADDR ,DP83867_CFG4 , +BIT (8 )); } val =phy_read (phydev,DP83867_CFG3 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/94 net/smc: Fix an error code in smc_lgr_create()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit bdee15e8c58b450ad736a2b62ef8c7a12548b704 ]
If smc_wr_alloc_lgr_mem() fails then return an error code. Don't return success.
--- net/smc/smc_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/smc/smc_core.c +2 -1
@@ -896,7 +896,8 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) }memcpy (lgr->pnet_id, ibdev->pnetid[ibport -1 ],SMC_MAX_PNETID_LEN ); -if (smc_wr_alloc_lgr_mem (lgr)) + rc =smc_wr_alloc_lgr_mem (lgr); +if (rc) goto free_wq;smc_llc_lgr_init (lgr, smc);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/94 net: phylink: add mac_managed_pm in phylink_config structure
In reply to Greg Kroah-HartmanFrom: Shenwei Wang <[email protected]>
[ Upstream commit 96de900ae78e7dbedc937fd91bafe2934579c65a ]
The recent commit
'commit 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")'
requires the MAC driver explicitly tell the phy driver who is managing the PM, otherwise you will see warning during resume stage.
Add a boolean property in the phylink_config structure so that the MAC driver can use it to tell the PHY driver if it wants to manage the PM.
--- drivers/net/phy/phylink.c | 3 +++ include/linux/phylink.h | 2 ++ 2 files changed, 5 insertions(+)
drivers/net/phy/phylink.c +3 -0
@@ -1431,6 +1431,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,if (phy_interrupt_is_valid (phy))phy_request_interrupt (phy); +if (pl->config->mac_managed_pm) + phy->mac_managed_pm = true; +return 0 ; }
include/linux/phylink.h +2 -0
@@ -88,6 +88,7 @@ enum phylink_op_type {* (See commit 7cceb599d15d ("net: phylink: avoid mac_config calls") * @poll_fixed_state: if true, starts link_poll, * if MAC link is at %MLO_AN_FIXED mode. +* @mac_managed_pm: if true, indicate the MAC driver is responsible for PHY PM. * @ovr_an_inband: if true, override PCS to MLO_AN_INBAND * @get_fixed_state: callback to execute to determine the fixed link state, * if MAC link is at %MLO_AN_FIXED mode.
@@ -100,6 +101,7 @@ struct phylink_config {enum phylink_op_type type;bool legacy_pre_march2020;bool poll_fixed_state; +bool mac_managed_pm;bool ovr_an_inband;void (*get_fixed_state)(struct phylink_config *config,struct phylink_link_state *state);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/94 net: stmmac: Enable mac_managed_pm phylink config
In reply to Greg Kroah-HartmanFrom: Shenwei Wang <[email protected]>
[ Upstream commit f151c147b3afcf92dedff53f5f0e965414e4fd2c ]
Enable the mac_managed_pm configuration in the phylink_config structure to avoid the kernel warning during system resume.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
@@ -1214,6 +1214,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)if (priv->plat->tx_queues_to_use >1 ) priv->phylink_config.mac_capabilities &= ~(MAC_10HD |MAC_100HD |MAC_1000HD ); + priv->phylink_config.mac_managed_pm = true; phylink =phylink_create (&priv->phylink_config, fwnode, mode, &stmmac_phylink_mac_ops);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/94 skmsg: pass gfp argument to alloc_sk_msg()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 2d1f274b95c6e4ba6a813b3b8e7a1a38d54a0a08 ]
syzbot found that alloc_sk_msg() could be called from a non sleepable context. sk_psock_verdict_recv() uses rcu_read_lock() protection.
We need the callers to pass a gfp_t argument to avoid issues.
syzbot report was:
BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274
in_atomic(): 0, irqs_disabled(): 0, non_block: 0, pid: 3613, name: syz-executor414preempt_count: 0, expected: 0
RCU nest depth: 1, expected: 0
INFO: lockdep is turned off.
CPU: 0 PID: 3613 Comm: syz-executor414 Not tainted 6.0.0-syzkaller-09589-g55be6084c8e0 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1e3/0x2cb lib/dump_stack.c:106 __might_resched+0x538/0x6a0 kernel/sched/core.c:9877 might_alloc include/linux/sched/mm.h:274 [inline] slab_pre_alloc_hook mm/slab.h:700 [inline] slab_alloc_node mm/slub.c:3162 [inline] slab_alloc mm/slub.c:3256 [inline] kmem_cache_alloc_trace+0x59/0x310 mm/slub.c:3287 kmalloc include/linux/slab.h:600 [inline] kzalloc include/linux/slab.h:733 [inline] alloc_sk_msg net/core/skmsg.c:507 [inline] sk_psock_skb_ingress_self+0x5c/0x330 net/core/skmsg.c:600 sk_psock_verdict_apply+0x395/0x440 net/core/skmsg.c:1014 sk_psock_verdict_recv+0x34d/0x560 net/core/skmsg.c:1201 tcp_read_skb+0x4a1/0x790 net/ipv4/tcp.c:1770 tcp_rcv_established+0x129d/0x1a10 net/ipv4/tcp_input.c:5971 tcp_v4_do_rcv+0x479/0xac0 net/ipv4/tcp_ipv4.c:1681 sk_backlog_rcv include/net/sock.h:1109 [inline] __release_sock+0x1d8/0x4c0 net/core/sock.c:2906 release_sock+0x5d/0x1c0 net/core/sock.c:3462 tcp_sendmsg+0x36/0x40 net/ipv4/tcp.c:1483 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg net/socket.c:734 [inline] __sys_sendto+0x46d/0x5f0 net/socket.c:2117 __do_sys_sendto net/socket.c:2129 [inline] __se_sys_sendto net/socket.c:2125 [inline] __x64_sys_sendto+0xda/0xf0 net/socket.c:2125 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
--- net/core/skmsg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/skmsg.c +4 -4
@@ -500,11 +500,11 @@ bool sk_msg_is_readable(struct sock *sk) }EXPORT_SYMBOL_GPL (sk_msg_is_readable); -static struct sk_msg *alloc_sk_msg (void ) +static struct sk_msg *alloc_sk_msg (gfp_t gfp) {struct sk_msg *msg; - msg =kzalloc (sizeof (*msg), __GFP_NOWARN |GFP_KERNEL ); + msg =kzalloc (sizeof (*msg), gfp | __GFP_NOWARN);if (unlikely (!msg))return NULL ;sg_init_marker (msg->sg.data,NR_MSG_FRAG_IDS );
@@ -520,7 +520,7 @@ static struct sk_msg *sk_psock_create_ingress_msg(struct sock *sk,if (!sk_rmem_schedule (sk, skb, skb->truesize))return NULL ; -return alloc_sk_msg (); +return alloc_sk_msg (GFP_KERNEL ); } static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb,
@@ -597,7 +597,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb,static int sk_psock_skb_ingress_self (struct sk_psock *psock,struct sk_buff *skb,u32 off,u32 len) { -struct sk_msg *msg =alloc_sk_msg (); +struct sk_msg *msg =alloc_sk_msg (GFP_ATOMIC );struct sock *sk = psock->sk;int err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/94 erofs: shouldnt churn the mapping page for duplicated copies
In reply to Greg Kroah-HartmanFrom: Gao Xiang <[email protected]>
[ Upstream commit 63bbb85658ea43dd35dbfde6d4150b47c407fc87 ]
If other duplicated copies exist in one decompression shot, should leave the old page as is rather than replace it with the new duplicated one. Otherwise, the following cold path to deal with duplicated copies will use the invalid bvec. It impacts compressed data deduplication.
Also, shift the onlinepage EIO bit to avoid touching the signed bit.
--- fs/erofs/zdata.c | 8 +++----- fs/erofs/zdata.h | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-)
fs/erofs/zdata.c +3 -5
@@ -838,15 +838,13 @@ static void z_erofs_do_decompressed_bvec(struct z_erofs_decompress_backend *be,if (!((bvec->offset + be->pcl->pageofs_out) & ~PAGE_MASK )) {unsigned int pgnr; -struct page *oldpage; pgnr = (bvec->offset + be->pcl->pageofs_out) >>PAGE_SHIFT ;DBG_BUGON (pgnr >= be->nr_pages); - oldpage = be->decompressed_pages[pgnr]; - be->decompressed_pages[pgnr] = bvec->page; - -if (!oldpage) +if (!be->decompressed_pages[pgnr]) { + be->decompressed_pages[pgnr] = bvec->page;return ; + } }/* (cold path) one pcluster is requested multiple times */
fs/erofs/zdata.h +3 -3
@@ -126,10 +126,10 @@ static inline unsigned int z_erofs_pclusterpages(struct z_erofs_pcluster *pcl) }/* -* bit 31: I/O error occurred on this page -* bit 0 - 30: remaining parts to complete this page +* bit 30: I/O error occurred on this page +* bit 0 - 29: remaining parts to complete this page */ -#define Z_EROFS_PAGE_EIO (1 << 31) +#define Z_EROFS_PAGE_EIO (1 << 30)static inline void z_erofs_onlinepage_init (struct page *page) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/94 blk-mq: fix null pointer dereference in blk_mq_clear_rq_mapping()
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 76dd298094f484c6250ebd076fa53287477b2328 ]
Our syzkaller report a null pointer dereference, root cause is following:
__blk_mq_alloc_map_and_rqs
set->tags[hctx_idx] = blk_mq_alloc_map_and_rqs
blk_mq_alloc_map_and_rqs
blk_mq_alloc_rqs
// failed due to oom
alloc_pages_node
// set->tags[hctx_idx] is still NULL
blk_mq_free_rqs
drv_tags = set->tags[hctx_idx];
// null pointer dereference is triggered
blk_mq_clear_rq_mapping(drv_tags, ...)This is because commit 63064be150e4 ("blk-mq:
Add blk_mq_alloc_map_and_rqs()") merged the two steps:
1) set->tags[hctx_idx] = blk_mq_alloc_rq_map()
2) blk_mq_alloc_rqs(..., set->tags[hctx_idx])
into one step:
set->tags[hctx_idx] = blk_mq_alloc_map_and_rqs()
Since tags is not initialized yet in this case, fix the problem by checking if tags is NULL pointer in blk_mq_clear_rq_mapping().
--- block/blk-mq.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
block/blk-mq.c +5 -2
@@ -3028,8 +3028,11 @@ static void blk_mq_clear_rq_mapping(struct blk_mq_tags *drv_tags,struct page *page;unsigned long flags; -/* There is no need to clear a driver tags own mapping */ -if (drv_tags == tags) +/* +* There is no need to clear mapping if driver tags is not initialized +* or the mapping belongs to the driver tags. +*/ +if (!drv_tags || drv_tags == tags)return ;list_for_each_entry (page, &tags->page_list, lru) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/94 io_uring/rw: remove leftover debug statement
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 5c61795ea97c170347c5c4af0c159bd877b8af71 ]
This debug statement was never meant to go into the upstream release, kill it off before it ends up in a release. It was just part of the testing for the initial version of the patch.
--- io_uring/rw.c | 2 -- 1 file changed, 2 deletions(-)
io_uring/rw.c +0 -2
@@ -192,8 +192,6 @@ static void io_req_io_end(struct io_kiocb *req) { struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw); -WARN_ON (!in_task ()); -if (rw->kiocb.ki_flags &IOCB_WRITE ) {kiocb_end_write (req);fsnotify_modify (req->file);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/94 net: ethernet: mtk_eth_soc: fix possible memory leak in mtk_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b3d0d98179d62f9d55635a600679c4fa362baf8d ]
If mtk_wed_add_hw() has been called, mtk_wed_exit() needs be called in error path or removing module to free the memory allocated in mtk_wed_add_hw().
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +12 -5
@@ -4028,19 +4028,23 @@ static int mtk_probe(struct platform_device *pdev) eth->irq[i] =platform_get_irq (pdev, i);if (eth->irq[i] <0 ) {dev_err (&pdev->dev,"no IRQ%d resource found\n" , i); -return -ENXIO ; + err = -ENXIO ; + goto err_wed_exit; } }for (i =0 ; i <ARRAY_SIZE (eth->clks); i++) { eth->clks[i] =devm_clk_get (eth->dev, mtk_clks_source_name[i]);if (IS_ERR (eth->clks[i])) { -if (PTR_ERR (eth->clks[i]) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (eth->clks[i]) == -EPROBE_DEFER ) { + err = -EPROBE_DEFER ; + goto err_wed_exit; + }if (eth->soc->required_clks &BIT (i)) {dev_err (&pdev->dev,"clock %s not found\n" , mtk_clks_source_name[i]); -return -EINVAL ; + err = -EINVAL ; + goto err_wed_exit; } eth->clks[i] =NULL ; }
@@ -4051,7 +4055,7 @@ static int mtk_probe(struct platform_device *pdev) err =mtk_hw_init (eth);if (err) -return err; + goto err_wed_exit; eth->hwlro =MTK_HAS_CAPS (eth->soc->caps,MTK_HWLRO );
@@ -4140,6 +4144,8 @@ static int mtk_probe(struct platform_device *pdev)mtk_free_dev (eth); err_deinit_hw:mtk_hw_deinit (eth); +err_wed_exit: +mtk_wed_exit ();return err; }
@@ -4159,6 +4165,7 @@ static int mtk_remove(struct platform_device *pdev)phylink_disconnect_phy (mac->phylink); } +mtk_wed_exit ();mtk_hw_deinit (eth);netif_napi_del (ð->tx_napi);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/94 net: ethernet: mtk_eth_wed: add missing put_device() in mtk_wed_add_hw()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 9d4f20a476ca57e4c9246eb1fa2a61bea2354720 ]
After calling get_device() in mtk_wed_add_hw(), in error path, put_device() needs be called.
--- drivers/net/ethernet/mediatek/mtk_wed.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/mediatek/mtk_wed.c +8 -2
@@ -813,11 +813,11 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth,get_device (&pdev->dev); irq =platform_get_irq (pdev,0 );if (irq <0 ) -return ; + goto err_put_device; regs =syscon_regmap_lookup_by_phandle (np,NULL );if (IS_ERR (regs)) -return ; + goto err_put_device;rcu_assign_pointer (mtk_soc_wed_ops, &wed_ops);
@@ -853,8 +853,14 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, hw_list[index] = hw; +mutex_unlock (&hw_lock); + +return ; + unlock:mutex_unlock (&hw_lock); +err_put_device: +put_device (&pdev->dev); }void mtk_wed_exit (void )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/94 net: ethernet: mtk_eth_wed: add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e0bb4659e235770e6f53b3692e958591f49448f5 ]
The device_node pointer returned by of_parse_phandle() with refcount incremented, when finish using it, the refcount need be decreased.
--- drivers/net/ethernet/mediatek/mtk_wed.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/mediatek/mtk_wed.c +4 -1
@@ -808,7 +808,7 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, pdev =of_find_device_by_node (np);if (!pdev) -return ; + goto err_of_node_put;get_device (&pdev->dev); irq =platform_get_irq (pdev,0 );
@@ -861,6 +861,8 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth,mutex_unlock (&hw_lock); err_put_device:put_device (&pdev->dev); +err_of_node_put: +of_node_put (np); }void mtk_wed_exit (void )
@@ -881,6 +883,7 @@ void mtk_wed_exit(void) hw_list[i] =NULL ;debugfs_remove (hw->debugfs_dir);put_device (hw->dev); +of_node_put (hw->node);kfree (hw); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/94 scsi: lpfc: Fix memory leak in lpfc_create_port()
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit dc8e483f684a24cc06e1d5fa958b54db58855093 ]
Commit 5e633302ace1 ("scsi: lpfc: vmid: Add support for VMID in mailbox command") introduced allocations for the VMID resources in lpfc_create_port() after the call to scsi_host_alloc(). Upon failure on the VMID allocations, the new code would branch to the 'out' label, which returns NULL without unwinding anything, thus skipping the call to scsi_host_put().
Fix the problem by creating a separate label 'out_free_vmid' to unwind the VMID resources and make the 'out_put_shost' label call only scsi_host_put(), as was done before the introduction of allocations for VMID.
--- drivers/scsi/lpfc/lpfc_init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +4 -3
@@ -4822,7 +4822,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) rc =lpfc_vmid_res_alloc (phba, vport);if (rc) - goto out; + goto out_put_shost;/* Initialize all internally managed lists. */ INIT_LIST_HEAD (&vport->fc_nodes);
@@ -4840,16 +4840,17 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) error =scsi_add_host_with_dma (shost, dev, &phba->pcidev->dev);if (error) - goto out_put_shost; + goto out_free_vmid;spin_lock_irq (&phba->port_list_lock);list_add_tail (&vport->listentry, &phba->port_list);spin_unlock_irq (&phba->port_list_lock);return vport; -out_put_shost: +out_free_vmid:kfree (vport->vmid);bitmap_free (vport->vmid_priority_range); +out_put_shost:scsi_host_put (shost); out:return NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/94 udp: Update reuse->has_conns under reuseport_lock.
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 69421bf98482d089e50799f45e48b25ce4a8d154 ]
When we call connect() for a UDP socket in a reuseport group, we have to update sk->sk_reuseport_cb->has_conns to 1. Otherwise, the kernel could select a unconnected socket wrongly for packets sent to the connected socket.
However, the current way to set has_conns is illegal and possible to trigger that problem. reuseport_has_conns() changes has_conns under rcu_read_lock(), which upgrades the RCU reader to the updater. Then, it must do the update under the updater's lock, reuseport_lock, but it doesn't for now.
For this reason, there is a race below where we fail to set has_conns resulting in the wrong socket selection. To avoid the race, let's split the reader and updater with proper locking.
cpu1 cpu2
+----+ +----+
__ip[46]_datagram_connect() reuseport_grow() . . |- reuseport_has_conns(sk, true) |- more_reuse = __reuseport_alloc(more_socks_size) | . | | |- rcu_read_lock() | |- reuse = rcu_dereference(sk->sk_reuseport_cb) | | | | | /* reuse->has_conns == 0 here */ | | |- more_reuse->has_conns = reuse->has_conns | |- reuse->has_conns = 1 | /* more_reuse->has_conns SHOULD BE 1 HERE */ | | | | | |- rcu_assign_pointer(reuse->socks[i]->sk_reuseport_cb, | | | more_reuse) | `- rcu_read_unlock() `- kfree_rcu(reuse, rcu) | |- sk->sk_state = TCP_ESTABLISHED
Note the likely(reuse) in reuseport_has_conns_set() is always true, but we put the test there for ease of review. [0]
For the record, usually, sk_reuseport_cb is changed under lock_sock(). The only exception is reuseport_grow() & TCP reqsk migration case.
1) shutdown() TCP listener, which is moved into the latter part of
reuse->socks[] to migrate reqsk.
2) New listen() overflows reuse->socks[] and call reuseport_grow().
3) reuse->max_socks overflows u16 with the new listener.
4) reuseport_grow() pops the old shutdown()ed listener from the array
and update its sk->sk_reuseport_cb as NULL without lock_sock().
shutdown()ed TCP sk->sk_reuseport_cb can be changed without lock_sock(), but, reuseport_has_conns_set() is called only for UDP under lock_sock(), so likely(reuse) never be false in reuseport_has_conns_set().
[0]: https://lore.kernel.org/netdev/CANn89iLja=eQHbsM_Ta2sQF0tOGU8vAGrh_izRuuHjuO1ouUag@mail.gmail.com/
--- include/net/sock_reuseport.h | 11 +++++------ net/core/sock_reuseport.c | 16 ++++++++++++++++ net/ipv4/datagram.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/datagram.c | 2 +- net/ipv6/udp.c | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-)
include/net/sock_reuseport.h +5 -6
@@ -43,21 +43,20 @@ struct sock *reuseport_migrate_sock(struct sock *sk,extern int reuseport_attach_prog (struct sock *sk,struct bpf_prog *prog);extern int reuseport_detach_prog (struct sock *sk); -static inline bool reuseport_has_conns (struct sock *sk,bool set) +static inline bool reuseport_has_conns (struct sock *sk) {struct sock_reuseport *reuse;bool ret = false;rcu_read_lock (); reuse =rcu_dereference (sk->sk_reuseport_cb); -if (reuse) { -if (set) - reuse->has_conns =1 ; - ret = reuse->has_conns; - } +if (reuse && reuse->has_conns) + ret = true;rcu_read_unlock ();return ret; } +void reuseport_has_conns_set (struct sock *sk); +#endif /* _SOCK_REUSEPORT_H */
net/core/sock_reuseport.c +16 -0
@@ -21,6 +21,22 @@ static DEFINE_IDA(reuseport_ida);static int reuseport_resurrect (struct sock *sk,struct sock_reuseport *old_reuse,struct sock_reuseport *reuse,bool bind_inany); +void reuseport_has_conns_set (struct sock *sk) +{ +struct sock_reuseport *reuse; + +if (!rcu_access_pointer (sk->sk_reuseport_cb)) +return ; + +spin_lock_bh (&reuseport_lock); + reuse =rcu_dereference_protected (sk->sk_reuseport_cb, +lockdep_is_held (&reuseport_lock)); +if (likely (reuse)) + reuse->has_conns =1 ; +spin_unlock_bh (&reuseport_lock); +} +EXPORT_SYMBOL (reuseport_has_conns_set); +static int reuseport_sock_index (struct sock *sk,const struct sock_reuseport *reuse,bool closed)
net/ipv4/datagram.c +1 -1
@@ -70,7 +70,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len } inet->inet_daddr = fl4->daddr; inet->inet_dport = usin->sin_port; -reuseport_has_conns (sk, true); +reuseport_has_conns_set (sk); sk->sk_state =TCP_ESTABLISHED ;sk_set_txhash (sk); inet->inet_id =prandom_u32 ();
net/ipv4/udp.c +1 -1
@@ -448,7 +448,7 @@ static struct sock *udp4_lib_lookup2(struct net *net, result =lookup_reuseport (net, sk, skb, saddr, sport, daddr, hnum);/* Fall back to scoring if group has connections */ -if (result && !reuseport_has_conns (sk, false)) +if (result && !reuseport_has_conns (sk))return result; result = result ? : sk;
net/ipv6/datagram.c +1 -1
@@ -256,7 +256,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, goto out; } -reuseport_has_conns (sk, true); +reuseport_has_conns_set (sk); sk->sk_state =TCP_ESTABLISHED ;sk_set_txhash (sk); out:
net/ipv6/udp.c +1 -1
@@ -182,7 +182,7 @@ static struct sock *udp6_lib_lookup2(struct net *net, result =lookup_reuseport (net, sk, skb, saddr, sport, daddr, hnum);/* Fall back to scoring if group has connections */ -if (result && !reuseport_has_conns (sk, false)) +if (result && !reuseport_has_conns (sk))return result; result = result ? : sk;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/94 ip6mr: fix UAF issue in ip6mr_sk_done() when addrconf_init_net() failed
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 1ca695207ed2271ecbf8ee6c641970f621c157cc ]
If the initialization fails in calling addrconf_init_net(), devconf_all is the pointer that has been released. Then ip6mr_sk_done() is called to release the net, accessing devconf->mc_forwarding directly causes invalid pointer access.
The process is as follows:setup_net()
ops_init() addrconf_init_net() all = kmemdup(...) ---> alloc "all" ... net->ipv6.devconf_all = all; __addrconf_sysctl_register() ---> failed ... kfree(all); ---> ipv6.devconf_all invalid ... ops_exit_list() ... ip6mr_sk_done() devconf = net->ipv6.devconf_all; //devconf is invalid pointer if (!devconf || !atomic_read(&devconf->mc_forwarding))
The following is the Call Trace information:
BUG: KASAN: use-after-free in ip6mr_sk_done+0x112/0x3a0 Read of size 4 at addr ffff888075508e88 by task ip/14554 Call Trace: <TASK> dump_stack_lvl+0x8e/0xd1 print_report+0x155/0x454 kasan_report+0xba/0x1f0 kasan_check_range+0x35/0x1b0 ip6mr_sk_done+0x112/0x3a0 rawv6_close+0x48/0x70 inet_release+0x109/0x230 inet6_release+0x4c/0x70 sock_release+0x87/0x1b0 igmp6_net_exit+0x6b/0x170 ops_exit_list+0xb0/0x170 setup_net+0x7ac/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f7963322547 </TASK> Allocated by task 14554: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0xa1/0xb0 __kmalloc_node_track_caller+0x4a/0xb0 kmemdup+0x28/0x60 addrconf_init_net+0x1be/0x840 ops_init+0xa5/0x410 setup_net+0x5aa/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 14554: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x40 ____kasan_slab_free+0x155/0x1b0 slab_free_freelist_hook+0x11b/0x220 __kmem_cache_free+0xa4/0x360 addrconf_init_net+0x623/0x840 ops_init+0xa5/0x410 setup_net+0x5aa/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
--- net/ipv6/addrconf.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/addrconf.c +2 -0
@@ -7214,9 +7214,11 @@ static int __net_init addrconf_init_net(struct net *net)__addrconf_sysctl_unregister (net, all,NETCONFA_IFINDEX_ALL ); err_reg_all:kfree (dflt); + net->ipv6.devconf_dflt =NULL ;#endif err_alloc_dflt:kfree (all); + net->ipv6.devconf_all =NULL ; err_alloc_all:kfree (net->ipv6.inet6_addr_lst); err_alloc_addr:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/94 cifs: Fix xid leak in cifs_create()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit fee0fb1f15054bb6a0ede452acb42da5bef4d587 ]
If the cifs already shutdown, we should free the xid before return, otherwise, the xid will be leaked.
--- fs/cifs/dir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cifs/dir.c +4 -2
@@ -551,8 +551,10 @@ int cifs_create(struct user_namespace *mnt_userns, struct inode *inode,cifs_dbg (FYI ,"cifs_create parent inode = 0x%p name is: %pd and dentry = 0x%p\n" , inode, direntry, direntry); -if (unlikely (cifs_forced_shutdown (CIFS_SB (inode->i_sb)))) -return -EIO ; +if (unlikely (cifs_forced_shutdown (CIFS_SB (inode->i_sb)))) { + rc = -EIO ; + goto out_free_xid; + } tlink =cifs_sb_tlink (CIFS_SB (inode->i_sb)); rc =PTR_ERR (tlink);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/94 cifs: Fix xid leak in cifs_copy_file_range()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 9a97df404a402fe1174d2d1119f87ff2a0ca2fe9 ]
If the file is used by swap, before return -EOPNOTSUPP, should free the xid, otherwise, the xid will be leaked.
--- fs/cifs/cifsfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +5 -2
@@ -1297,8 +1297,11 @@ static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off,ssize_t rc;struct cifsFileInfo *cfile = dst_file->private_data; -if (cfile->swapfile) -return -EOPNOTSUPP ; +if (cfile->swapfile) { + rc = -EOPNOTSUPP ; +free_xid (xid); +return rc; + } rc =cifs_file_copychunk_range (xid, src_file, off, dst_file, destoff, len, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/94 cifs: Fix xid leak in cifs_flock()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 575e079c782b9862ec2626403922d041a42e6ed6 ]
If not flock, before return -ENOLCK, should free the xid, otherwise, the xid will be leaked.
--- fs/cifs/file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/cifs/file.c +7 -4
@@ -1882,11 +1882,13 @@ int cifs_flock(struct file *file, int cmd, struct file_lock *fl)struct cifsFileInfo *cfile;__u32 type; - rc = -EACCES ; xid =get_xid (); -if (!(fl->fl_flags &FL_FLOCK )) -return -ENOLCK ; +if (!(fl->fl_flags &FL_FLOCK )) { + rc = -ENOLCK ; +free_xid (xid); +return rc; + } cfile = (struct cifsFileInfo *)file->private_data; tcon =tlink_tcon (cfile->tlink);
@@ -1905,8 +1907,9 @@ int cifs_flock(struct file *file, int cmd, struct file_lock *fl)* if no lock or unlock then nothing to do since we do not * know what it is */ + rc = -EOPNOTSUPP ;free_xid (xid); -return -EOPNOTSUPP ; +return rc; } rc = cifs_setlk(file, fl, type, wait_flag, posix_lck, lock, unlock,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/94 cifs: Fix xid leak in cifs_ses_add_channel()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit e909d054bdea75ef1ec48c18c5936affdaecbb2c ]
Before return, should free the xid, otherwise, the xid will be leaked.
--- fs/cifs/sess.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/sess.c +1 -0
@@ -496,6 +496,7 @@ cifs_ses_add_channel(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses,cifs_put_tcp_session (chan->server,0 ); } +free_xid (xid);return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/94 cifs: Fix memory leak when build ntlmssp negotiate blob failed
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 30b2d7f8f13664655480d6af45f60270b3eb6736 ]
There is a memory leak when mount cifs:
unreferenced object 0xffff888166059600 (size 448):
comm "mount.cifs", pid 51391, jiffies 4295596373 (age 330.596s)
hex dump (first 32 bytes):
fe 53 4d 42 40 00 00 00 00 00 00 00 01 00 82 00 .SMB@...........
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000060609a61>] mempool_alloc+0xe1/0x260
[<00000000adfa6c63>] cifs_small_buf_get+0x24/0x60
[<00000000ebb404c7>] __smb2_plain_req_init+0x32/0x460
[<00000000bcf875b4>] SMB2_sess_alloc_buffer+0xa4/0x3f0
[<00000000753a2987>] SMB2_sess_auth_rawntlmssp_negotiate+0xf5/0x480
[<00000000f0c1f4f9>] SMB2_sess_setup+0x253/0x410
[<00000000a8b83303>] cifs_setup_session+0x18f/0x4c0
[<00000000854bd16d>] cifs_get_smb_ses+0xae7/0x13c0
[<000000006cbc43d9>] mount_get_conns+0x7a/0x730
[<000000005922d816>] cifs_mount+0x103/0xd10
[<00000000e33def3b>] cifs_smb3_do_mount+0x1dd/0xc90
[<0000000078034979>] smb3_get_tree+0x1d5/0x300
[<000000004371f980>] vfs_get_tree+0x41/0xf0
[<00000000b670d8a7>] path_mount+0x9b3/0xdd0
[<000000005e839a7d>] __x64_sys_mount+0x190/0x1d0
[<000000009404c3b9>] do_syscall_64+0x35/0x80When build ntlmssp negotiate blob failed, the session setup request should be freed.
--- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2pdu.c +1 -1
@@ -1526,7 +1526,7 @@ SMB2_sess_auth_rawntlmssp_negotiate(struct SMB2_sess_data *sess_data) &blob_length, ses, server, sess_data->nls_cp);if (rc) - goto out_err; + goto out;if (use_spnego) {/* BB eventually need to add this */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/94 dm: remove unnecessary assignment statement in alloc_dev()
In reply to Greg Kroah-HartmanFrom: Genjian Zhang <[email protected]>
[ Upstream commit 99f4f5bcb975527508eb7a5e3e34bdb91d576746 ]
--- drivers/md/dm.c | 1 - 1 file changed, 1 deletion(-)
drivers/md/dm.c +0 -1
@@ -2065,7 +2065,6 @@ static struct mapped_device *alloc_dev(int minor) md->disk->minors =1 ; md->disk->flags |=GENHD_FL_NO_PART ; md->disk->fops = &dm_blk_dops; - md->disk->queue = md->queue; md->disk->private_data = md;sprintf (md->disk->disk_name,"dm-%d" , minor);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/94 drm/amd/display: Increase frame size limit for display_mode_vba_util_32.o
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 8a70b2d89ea3f2dc1449f0634ca6befb41472f24 ]
Building 32-bit images may fail with the following error.
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c:
In function ‘dml32_UseMinimumDCFCLK’:drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c:3142:1:
error: the frame size of 1096 bytes is larger than 1024 bytes
This is seen when building i386:allmodconfig with any of the following compilers.
gcc (Debian 12.2.0-3) 12.2.0 gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0
The problem is not seen if the compiler supports GCC_PLUGIN_LATENT_ENTROPY because in that case CONFIG_FRAME_WARN is already set to 2048 even for 32-bit builds.
dml32_UseMinimumDCFCLK() was introduced with commit dda4fb85e433 ("drm/amd/display: DML changes for DCN32/321"). It declares a large number of local variables. Increase the frame size for the affected file to 2048, similar to other files in the same directory, to enable 32-bit build tests with affected compilers.
--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -1
@@ -77,7 +77,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_32.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_rq_dlg_calc_32.o := $(dml_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_ccflags)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/94 bnxt_en: fix memory leak in bnxt_nvm_test()
In reply to Greg Kroah-HartmanFrom: Vikas Gupta <[email protected]>
[ Upstream commit ba077d683d45190afc993c1ce45bcdbfda741a40 ]
Free the kzalloc'ed buffer before returning in the success path.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +6 -5
@@ -613,6 +613,7 @@ static int bnxt_dl_reload_up(struct devlink *dl, enum devlink_reload_action actistatic bool bnxt_nvm_test (struct bnxt *bp,struct netlink_ext_ack *extack) { +bool rc = false;u32 datalen;u16 index;u8 *buf;
@@ -632,20 +633,20 @@ static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)if (bnxt_get_nvram_item (bp->dev, index,0 , datalen, buf)) {NL_SET_ERR_MSG_MOD (extack,"nvm test vpd read error" ); - goto err; + goto done; }if (bnxt_flash_nvram (bp->dev,BNX_DIR_TYPE_VPD ,BNX_DIR_ORDINAL_FIRST ,BNX_DIR_EXT_NONE ,0 ,0 , buf, datalen)) {NL_SET_ERR_MSG_MOD (extack,"nvm test vpd write error" ); - goto err; + goto done; } -return true; + rc = true; -err: +done:kfree (buf); -return false; +return rc; } static bool bnxt_dl_selftest_check(struct devlink *dl, unsigned int id,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/94 net: hsr: avoid possible NULL deref in skb_clone()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit d8b57135fd9ffe9a5b445350a686442a531c5339 ]
syzbot got a crash [1] in skb_clone(), caused by a bug in hsr_get_untagged_frame().
When/if create_stripped_skb_hsr() returns NULL, we must not attempt to call skb_clone().
While we are at it, replace a WARN_ONCE() by netdev_warn_once().
[1]
general protection fault, probably for non-canonical address 0xdffffc000000000f: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000078-0x000000000000007f] CPU: 1 PID: 754 Comm: syz-executor.0 Not tainted 6.0.0-syzkaller-02734-g0326074ff465 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022 RIP: 0010:skb_clone+0x108/0x3c0 net/core/skbuff.c:1641 Code: 93 02 00 00 49 83 7c 24 28 00 0f 85 e9 00 00 00 e8 5d 4a 29 fa 4c 8d 75 7e 48 b8 00 00 00 00 00 fc ff df 4c 89 f2 48 c1 ea 03 <0f> b6 04 02 4c 89 f2 83 e2 07 38 d0 7f 08 84 c0 0f 85 9e 01 00 00 RSP: 0018:ffffc90003ccf4e0 EFLAGS: 00010207
RAX: dffffc0000000000 RBX: ffffc90003ccf5f8 RCX: ffffc9000c24b000
RDX: 000000000000000f RSI: ffffffff8751cb13 RDI: 0000000000000000
RBP: 0000000000000000 R08: 00000000000000f0 R09: 0000000000000140
R10: fffffbfff181d972 R11: 0000000000000000 R12: ffff888161fc3640
R13: 0000000000000a20 R14: 000000000000007e R15: ffffffff8dc5f620
FS: 00007feb621e4700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007feb621e3ff8 CR3: 00000001643a9000 CR4: 00000000003506e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace: <TASK> hsr_get_untagged_frame+0x4e/0x610 net/hsr/hsr_forward.c:164 hsr_forward_do net/hsr/hsr_forward.c:461 [inline] hsr_forward_skb+0xcca/0x1d50 net/hsr/hsr_forward.c:623 hsr_handle_frame+0x588/0x7c0 net/hsr/hsr_slave.c:69 __netif_receive_skb_core+0x9fe/0x38f0 net/core/dev.c:5379 __netif_receive_skb_one_core+0xae/0x180 net/core/dev.c:5483 __netif_receive_skb+0x1f/0x1c0 net/core/dev.c:5599 netif_receive_skb_internal net/core/dev.c:5685 [inline] netif_receive_skb+0x12f/0x8d0 net/core/dev.c:5744 tun_rx_batched+0x4ab/0x7a0 drivers/net/tun.c:1544 tun_get_user+0x2686/0x3a00 drivers/net/tun.c:1995 tun_chr_write_iter+0xdb/0x200 drivers/net/tun.c:2025 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x9e9/0xdd0 fs/read_write.c:584 ksys_write+0x127/0x250 fs/read_write.c:637 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- net/hsr/hsr_forward.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/hsr/hsr_forward.c +6 -6
@@ -150,15 +150,15 @@ struct sk_buff *hsr_get_untagged_frame(struct hsr_frame_info *frame, struct hsr_port *port) {if (!frame->skb_std) { -if (frame->skb_hsr) { +if (frame->skb_hsr) frame->skb_std =create_stripped_skb_hsr (frame->skb_hsr, frame); - }else { -/* Unexpected */ -WARN_ONCE (1 ,"%s:%d: Unexpected frame received (port_src %s)\n" , - __FILE__, __LINE__, port->dev->name); +else +netdev_warn_once (port->dev, +"Unexpected frame received in hsr_get_untagged_frame()\n" ); + +if (!frame->skb_std)return NULL ; - } }return skb_clone (frame->skb_std,GFP_ATOMIC );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/94 ionic: catch NULL pointer issue on reconfig
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit aa1d7e1267c12e07d979aa34c613716a89029db2 ]
It's possible that the driver will dereference a qcq that doesn't exist when calling ionic_reconfigure_queues(), which causes a page fault BUG.
If a reduction in the number of queues is followed by a different reconfig such as changing the ring size, the driver can hit a NULL pointer when trying to clean up non-existent queues.
Fix this by checking to make sure both the qcqs array and qcq entry exists bofore trying to use and free the entry.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +8 -4
@@ -2820,11 +2820,15 @@ int ionic_reconfigure_queues(struct ionic_lif *lif,* than the full array, but leave the qcq shells in place */ for (i = lif->nxqs; i < lif->ionic->ntxqs_per_lif; i++) { - lif->txqcqs[i]->flags &= ~IONIC_QCQ_F_INTR ; -ionic_qcq_free (lif, lif->txqcqs[i]); +if (lif->txqcqs && lif->txqcqs[i]) { + lif->txqcqs[i]->flags &= ~IONIC_QCQ_F_INTR ; +ionic_qcq_free (lif, lif->txqcqs[i]); + } - lif->rxqcqs[i]->flags &= ~IONIC_QCQ_F_INTR ; -ionic_qcq_free (lif, lif->rxqcqs[i]); +if (lif->rxqcqs && lif->rxqcqs[i]) { + lif->rxqcqs[i]->flags &= ~IONIC_QCQ_F_INTR ; +ionic_qcq_free (lif, lif->rxqcqs[i]); + } }if (err)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/94 netfilter: rpfilter/fib: Populate flowic_l3mdev field
In reply to Greg Kroah-HartmanFrom: Phil Sutter <[email protected]>
[ Upstream commit acc641ab95b66b813c1ce856c377a2bbe71e7f52 ]
Use the introduced field for correct operation with VRF devices instead of conditionally overwriting flowic_oif. This is a partial revert of commit b575b24b8eee3 ("netfilter: Fix rpfilter dropping vrf packets by mistake"), implementing a simpler solution.
Stable-dep-of: 1fcc064b305a ("netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.")
--- net/ipv4/netfilter/ipt_rpfilter.c | 2 +- net/ipv4/netfilter/nft_fib_ipv4.c | 2 +- net/ipv6/netfilter/ip6t_rpfilter.c | 9 +++------ net/ipv6/netfilter/nft_fib_ipv6.c | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +1 -1
@@ -78,7 +78,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.flowi4_mark = info->flags &XT_RPFILTER_VALID_MARK ? skb->mark :0 ; flow.flowi4_tos = iph->tos &IPTOS_RT_MASK ; flow.flowi4_scope =RT_SCOPE_UNIVERSE ; - flow.flowi4_oif =l3mdev_master_ifindex_rcu (xt_in (par)); + flow.flowi4_l3mdev =l3mdev_master_ifindex_rcu (xt_in (par));return rpfilter_lookup_reverse (xt_net (par), &flow,xt_in (par), info->flags) ^ invert; }
net/ipv4/netfilter/nft_fib_ipv4.c +1 -1
@@ -84,7 +84,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, oif =NULL ;if (priv->flags &NFTA_FIB_F_IIF ) - fl4.flowi4_oif =l3mdev_master_ifindex_rcu (oif); + fl4.flowi4_l3mdev =l3mdev_master_ifindex_rcu (oif);if (nft_hook (pkt) ==NF_INET_PRE_ROUTING &&nft_fib_is_loopback (pkt->skb,nft_in (pkt))) {
net/ipv6/netfilter/ip6t_rpfilter.c +3 -6
@@ -37,6 +37,7 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,bool ret = false;struct flowi6 fl6 = { .flowi6_iif =LOOPBACK_IFINDEX , + .flowi6_l3mdev =l3mdev_master_ifindex_rcu (dev), .flowlabel = (* (__be32 *) iph) &IPV6_FLOWINFO_MASK , .flowi6_proto = iph->nexthdr, .daddr = iph->saddr,
@@ -55,9 +56,7 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,if (rpfilter_addr_linklocal (&iph->saddr)) { lookup_flags |=RT6_LOOKUP_F_IFACE ; fl6.flowi6_oif = dev->ifindex; -/* Set flowi6_oif for vrf devices to lookup route in l3mdev domain. */ - }else if (netif_is_l3_master (dev) ||netif_is_l3_slave (dev) || - (flags &XT_RPFILTER_LOOSE ) ==0 ) + }else if ((flags &XT_RPFILTER_LOOSE ) ==0 ) fl6.flowi6_oif = dev->ifindex; rt = (void *)ip6_route_lookup (net, &fl6, skb, lookup_flags);
@@ -72,9 +71,7 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb, goto out; } -if (rt->rt6i_idev->dev == dev || -l3mdev_master_ifindex_rcu (rt->rt6i_idev->dev) == dev->ifindex || - (flags &XT_RPFILTER_LOOSE )) +if (rt->rt6i_idev->dev == dev || (flags &XT_RPFILTER_LOOSE )) ret = true; out:ip6_rt_put (rt);
net/ipv6/netfilter/nft_fib_ipv6.c +2 -3
@@ -41,9 +41,8 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv,if (ipv6_addr_type (&fl6->daddr) &IPV6_ADDR_LINKLOCAL ) { lookup_flags |=RT6_LOOKUP_F_IFACE ; fl6->flowi6_oif =get_ifindex (dev ? dev : pkt->skb->dev); - }else if ((priv->flags &NFTA_FIB_F_IIF ) && - (netif_is_l3_master (dev) ||netif_is_l3_slave (dev))) { - fl6->flowi6_oif = dev->ifindex; + }else if (priv->flags &NFTA_FIB_F_IIF ) { + fl6->flowi6_l3mdev =l3mdev_master_ifindex_rcu (dev); }if (ipv6_addr_type (&fl6->saddr) &IPV6_ADDR_UNICAST )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/94 netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 1fcc064b305a1aadeff0d4bff961094d27660acd ]
Currently netfilter's rpfilter and fib modules implicitely initialise ->flowic_uid with 0. This is normally the root UID. However, this isn't the case in user namespaces, where user ID 0 is mapped to a different kernel UID. By initialising ->flowic_uid with sock_net_uid(), we get the root UID of the user namespace, thus keeping the same behaviour whether or not we're running in a user namepspace.
Note, this is similar to commit 8bcfd0925ef1 ("ipv4: add missing initialization for flowi4_uid"), which fixed the rp_filter sysctl.
--- net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + net/ipv6/netfilter/ip6t_rpfilter.c | 1 + net/ipv6/netfilter/nft_fib_ipv6.c | 2 ++ 4 files changed, 5 insertions(+)
net/ipv4/netfilter/ipt_rpfilter.c +1 -0
@@ -79,6 +79,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.flowi4_tos = iph->tos &IPTOS_RT_MASK ; flow.flowi4_scope =RT_SCOPE_UNIVERSE ; flow.flowi4_l3mdev =l3mdev_master_ifindex_rcu (xt_in (par)); + flow.flowi4_uid =sock_net_uid (xt_net (par),NULL );return rpfilter_lookup_reverse (xt_net (par), &flow,xt_in (par), info->flags) ^ invert; }
net/ipv4/netfilter/nft_fib_ipv4.c +1 -0
@@ -65,6 +65,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,struct flowi4 fl4 = { .flowi4_scope =RT_SCOPE_UNIVERSE , .flowi4_iif =LOOPBACK_IFINDEX , + .flowi4_uid =sock_net_uid (nft_net (pkt),NULL ), };const struct net_device *oif;const struct net_device *found;
net/ipv6/netfilter/ip6t_rpfilter.c +1 -0
@@ -40,6 +40,7 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb, .flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev), .flowlabel = (* (__be32 *) iph) & IPV6_FLOWINFO_MASK, .flowi6_proto = iph->nexthdr, + .flowi6_uid = sock_net_uid(net, NULL), .daddr = iph->saddr, };int lookup_flags;
net/ipv6/netfilter/nft_fib_ipv6.c +2 -0
@@ -66,6 +66,7 @@ static u32 __nft_fib6_eval_type(const struct nft_fib *priv,struct flowi6 fl6 = { .flowi6_iif =LOOPBACK_IFINDEX , .flowi6_proto = pkt->tprot, + .flowi6_uid =sock_net_uid (nft_net (pkt),NULL ), };u32 ret =0 ;
@@ -163,6 +164,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,struct flowi6 fl6 = { .flowi6_iif =LOOPBACK_IFINDEX , .flowi6_proto = pkt->tprot, + .flowi6_uid =sock_net_uid (nft_net (pkt),NULL ), };struct rt6_info *rt;int lookup_flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/94 netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 96df8360dbb435cc69f7c3c8db44bf8b1c24cd7b ]
Otherwise EINVAL is bogusly reported to userspace when deleting a set element. NFTA_SET_ELEM_KEY_END does not need to be set in case of:
- insertion: if not present, start key is used as end key.
- deletion: only start key needs to be specified, end key is ignored.
Hence, relax the sanity check.
--- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +3 -2
@@ -5865,8 +5865,9 @@ static bool nft_setelem_valid_key_end(const struct nft_set *set, (NFT_SET_CONCAT | NFT_SET_INTERVAL)) { if (flags & NFT_SET_ELEM_INTERVAL_END) return false; - if (!nla[NFTA_SET_ELEM_KEY_END] && - !(flags & NFT_SET_ELEM_CATCHALL)) + + if (nla[NFTA_SET_ELEM_KEY_END] && + flags & NFT_SET_ELEM_CATCHALL) return false; } else {if (nla[NFTA_SET_ELEM_KEY_END ])
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/94 nvme-hwmon: consistently ignore errors from nvme_hwmon_init
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6b8cf94005187952f794c0c4ed3920a1e8accfa3 ]
An NVMe controller works perfectly fine even when the hwmon initialization fails. Stop returning errors that do not come from a controller reset from nvme_hwmon_init to handle this case consistently.
Stable-dep-of: c94b7f9bab22 ("nvme-hwmon: kmalloc the NVME SMART log buffer")
--- drivers/nvme/host/core.c | 6 +++++- drivers/nvme/host/hwmon.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +5 -1
@@ -3256,8 +3256,12 @@ int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl)return ret;if (!ctrl->identified && !nvme_discovery_ctrl (ctrl)) { +/* +* Do not return errors unless we are in a controller reset, +* the controller works perfectly fine without hwmon. +*/ ret =nvme_hwmon_init (ctrl); -if (ret <0 ) +if (ret == -EINTR )return ret; }
drivers/nvme/host/hwmon.c +8 -5
@@ -230,7 +230,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data) -return 0 ; +return -ENOMEM ; data->ctrl = ctrl;mutex_init (&data->read_lock);
@@ -238,8 +238,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) err =nvme_hwmon_get_smart_log (data);if (err) {dev_warn (dev,"Failed to read smart log (error %d)\n" , err); -kfree (data); -return err; + goto err_free_data; } hwmon = hwmon_device_register_with_info(dev, "nvme",
@@ -247,11 +246,15 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) NULL);if (IS_ERR (hwmon)) {dev_warn (dev,"Failed to instantiate hwmon device\n" ); -kfree (data); -return PTR_ERR (hwmon); + err =PTR_ERR (hwmon); + goto err_free_data; } ctrl->hwmon_device = hwmon;return 0 ; + +err_free_data: +kfree (data); +return err; }void nvme_hwmon_exit (struct nvme_ctrl *ctrl)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/94 nvme-hwmon: kmalloc the NVME SMART log buffer
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit c94b7f9bab22ac504f9153767676e659988575ad ]
Recent commit 52fde2c07da6 ("nvme: set dma alignment to dword") has caused a regression on our platform.
It turned out that the nvme_get_log() method invocation caused the nvme_hwmon_data structure instance corruption. In particular the nvme_hwmon_data.ctrl pointer was overwritten either with zeros or with garbage. After some research we discovered that the problem happened even before the actual NVME DMA execution, but during the buffer mapping. Since our platform is DMA-noncoherent, the mapping implied the cache-line invalidations or write-backs depending on the DMA-direction parameter. In case of the NVME SMART log getting the DMA was performed from-device-to-memory, thus the cache-invalidation was activated during the buffer mapping. Since the log-buffer isn't cache-line aligned, the cache-invalidation caused the neighbour data to be discarded. The neighbouring data turned to be the data surrounding the buffer in the framework of the nvme_hwmon_data structure.
In order to fix that we need to make sure that the whole log-buffer is defined within the cache-line-aligned memory region so the cache-invalidation procedure wouldn't involve the adjacent data. One of the option to guarantee that is to kmalloc the DMA-buffer [1]. Seeing the rest of the NVME core driver prefer that method it has been chosen to fix this problem too.
Note after a deeper researches we found out that the denoted commit wasn't a root cause of the problem. It just revealed the invalidity by activating the DMA-based NVME SMART log getting performed in the framework of the NVME hwmon driver. The problem was here since the initial commit of the driver.
[1] Documentation/core-api/dma-api-howto.rst
--- drivers/nvme/host/hwmon.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/nvme/host/hwmon.c +16 -7
@@ -12,7 +12,7 @@struct nvme_hwmon_data {struct nvme_ctrl *ctrl; -struct nvme_smart_log log; +struct nvme_smart_log *log;struct mutex read_lock; };
@@ -60,14 +60,14 @@ static int nvme_set_temp_thresh(struct nvme_ctrl *ctrl, int sensor, bool under,static int nvme_hwmon_get_smart_log (struct nvme_hwmon_data *data) {return nvme_get_log (data->ctrl,NVME_NSID_ALL ,NVME_LOG_SMART ,0 , -NVME_CSI_NVM , &data->log,sizeof (data->log),0 ); +NVME_CSI_NVM , data->log,sizeof (*data->log),0 ); }static int nvme_hwmon_read (struct device *dev,enum hwmon_sensor_types type,u32 attr,int channel,long *val) {struct nvme_hwmon_data *data =dev_get_drvdata (dev); -struct nvme_smart_log *log = &data->log; +struct nvme_smart_log *log = data->log;int temp;int err;
@@ -163,7 +163,7 @@ static umode_t nvme_hwmon_is_visible(const void *_data,case hwmon_temp_max:case hwmon_temp_min:if ((!channel && data->ctrl->wctemp) || - (channel && data->log.temp_sensor[channel -1 ])) { + (channel && data->log->temp_sensor[channel -1 ])) {if (data->ctrl->quirks &NVME_QUIRK_NO_TEMP_THRESH_CHANGE )return 0444 ;
@@ -176,7 +176,7 @@ static umode_t nvme_hwmon_is_visible(const void *_data,break ;case hwmon_temp_input:case hwmon_temp_label: -if (!channel || data->log.temp_sensor[channel -1 ]) +if (!channel || data->log->temp_sensor[channel -1 ])return 0444 ;break ;default :
@@ -232,13 +232,19 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl)if (!data)return -ENOMEM ; + data->log =kzalloc (sizeof (*data->log),GFP_KERNEL ); +if (!data->log) { + err = -ENOMEM ; + goto err_free_data; + } + data->ctrl = ctrl;mutex_init (&data->read_lock); err =nvme_hwmon_get_smart_log (data);if (err) {dev_warn (dev,"Failed to read smart log (error %d)\n" , err); - goto err_free_data; + goto err_free_log; } hwmon = hwmon_device_register_with_info(dev, "nvme",
@@ -247,11 +253,13 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl)if (IS_ERR (hwmon)) {dev_warn (dev,"Failed to instantiate hwmon device\n" ); err =PTR_ERR (hwmon); - goto err_free_data; + goto err_free_log; } ctrl->hwmon_device = hwmon;return 0 ; +err_free_log: +kfree (data->log); err_free_data:kfree (data);return err;
@@ -265,6 +273,7 @@ void nvme_hwmon_exit(struct nvme_ctrl *ctrl)hwmon_device_unregister (ctrl->hwmon_device); ctrl->hwmon_device =NULL ; +kfree (data->log);kfree (data); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/94 nvmet: fix workqueue MEM_RECLAIM flushing dependency
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit ddd2b8de9f85b388925e7dc46b3890fc1a0d8d24 ]
The keep alive timer needs to stay on nvmet_wq, and not modified to reschedule on the system_wq.
This fixes a warning:
------------[ cut here ]------------ workqueue: WQ_MEM_RECLAIM nvmet-wq:nvmet_rdma_release_queue_work [nvmet_rdma] is flushing !WQ_MEM_RECLAIM events:nvmet_keep_alive_timer [nvmet] WARNING: CPU: 3 PID: 1086 at kernel/workqueue.c:2628 check_flush_dependency+0x16c/0x1e0
--- drivers/nvme/target/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/core.c +1 -1
@@ -1176,7 +1176,7 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl)* reset the keep alive timer when the controller is enabled. */ if (ctrl->kato) -mod_delayed_work (system_wq, &ctrl->ka_work, ctrl->kato *HZ ); +mod_delayed_work (nvmet_wq, &ctrl->ka_work, ctrl->kato *HZ ); }static void nvmet_clear_ctrl (struct nvmet_ctrl *ctrl)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/94 net: sched: cake: fix null pointer access issue when cake_init() fails
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 51f9a8921ceacd7bf0d3f47fa867a64988ba1dcb ]
When the default qdisc is cake, if the qdisc of dev_queue fails to be inited during mqprio_init(), cake_reset() is invoked to clear resources. In this case, the tins is NULL, and it will cause gpf issue.
The process is as follows:qdisc_create_dflt()
cake_init() q->tins = kvcalloc(...) --->failed, q->tins is NULL ... qdisc_put() ... cake_reset() ... cake_dequeue_one() b = &q->tins[...] --->q->tins is NULL
The following is the Call Trace information:
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:cake_dequeue_one+0xc9/0x3c0 Call Trace: <TASK> cake_reset+0xb1/0x140 qdisc_reset+0xed/0x6f0 qdisc_destroy+0x82/0x4c0 qdisc_put+0x9e/0xb0 qdisc_create_dflt+0x2c3/0x4a0 mqprio_init+0xa71/0x1760 qdisc_create+0x3eb/0x1000 tc_modify_qdisc+0x408/0x1720 rtnetlink_rcv_msg+0x38e/0xac0 netlink_rcv_skb+0x12d/0x3a0 netlink_unicast+0x4a2/0x740 netlink_sendmsg+0x826/0xcc0 sock_sendmsg+0xc5/0x100 ____sys_sendmsg+0x583/0x690 ___sys_sendmsg+0xe8/0x160 __sys_sendmsg+0xbf/0x160 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f89e5122d04 </TASK>
--- net/sched/sch_cake.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sched/sch_cake.c +4 -0
@@ -2224,8 +2224,12 @@ static struct sk_buff *cake_dequeue(struct Qdisc *sch)static void cake_reset (struct Qdisc *sch) { +struct cake_sched_data *q =qdisc_priv (sch);u32 c; +if (!q->tins) +return ; +for (c =0 ; c <CAKE_MAX_TINS ; c++)cake_clear_tin (sch, c); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/94 net: sched: delete duplicate cleanup of backlog and qlen
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit c19d893fbf3f2f8fa864ae39652c7fee939edde2 ]
qdisc_reset() is clearing qdisc->q.qlen and qdisc->qstats.backlog _after_ calling qdisc->ops->reset. There is no need to clear them again in the specific reset function.
Stable-dep-of: 2a3fc78210b9 ("net: sched: sfb: fix null pointer access issue when sfb_init() fails")
--- include/net/sch_generic.h | 1 - net/sched/sch_atm.c | 1 - net/sched/sch_cbq.c | 1 - net/sched/sch_choke.c | 2 -- net/sched/sch_drr.c | 2 -- net/sched/sch_dsmark.c | 2 -- net/sched/sch_etf.c | 3 --- net/sched/sch_ets.c | 2 -- net/sched/sch_fq_codel.c | 2 -- net/sched/sch_fq_pie.c | 3 --- net/sched/sch_hfsc.c | 2 -- net/sched/sch_htb.c | 2 -- net/sched/sch_multiq.c | 1 - net/sched/sch_prio.c | 2 -- net/sched/sch_qfq.c | 2 -- net/sched/sch_red.c | 2 -- net/sched/sch_sfb.c | 2 -- net/sched/sch_skbprio.c | 3 --- net/sched/sch_taprio.c | 2 -- net/sched/sch_tbf.c | 2 -- net/sched/sch_teql.c | 1 - 21 files changed, 40 deletions(-)
include/net/sch_generic.h +0 -1
@@ -1137,7 +1137,6 @@ static inline void __qdisc_reset_queue(struct qdisc_skb_head *qh)static inline void qdisc_reset_queue (struct Qdisc *sch) {__qdisc_reset_queue (&sch->q); - sch->qstats.backlog =0 ; } static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new,
net/sched/sch_atm.c +0 -1
@@ -577,7 +577,6 @@ static void atm_tc_reset(struct Qdisc *sch)pr_debug ("atm_tc_reset(sch %p,[qdisc %p])\n" , sch, p);list_for_each_entry (flow, &p->flows, list)qdisc_reset (flow->q); - sch->q.qlen =0 ; }static void atm_tc_destroy (struct Qdisc *sch)
net/sched/sch_cbq.c +0 -1
@@ -975,7 +975,6 @@ cbq_reset(struct Qdisc *sch) cl->cpriority = cl->priority; } } - sch->q.qlen =0 ; }
net/sched/sch_choke.c +0 -2
@@ -315,8 +315,6 @@ static void choke_reset(struct Qdisc *sch)rtnl_qdisc_drop (skb, sch); } - sch->q.qlen =0 ; - sch->qstats.backlog =0 ;if (q->tab)memset (q->tab,0 , (q->tab_mask +1 ) *sizeof (struct sk_buff *)); q->head = q->tail =0 ;
net/sched/sch_drr.c +0 -2
@@ -441,8 +441,6 @@ static void drr_reset_qdisc(struct Qdisc *sch)qdisc_reset (cl->qdisc); } } - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static void drr_destroy_qdisc (struct Qdisc *sch)
net/sched/sch_dsmark.c +0 -2
@@ -409,8 +409,6 @@ static void dsmark_reset(struct Qdisc *sch)pr_debug ("%s(sch %p,[qdisc %p])\n" , __func__, sch, p);if (p->q)qdisc_reset (p->q); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static void dsmark_destroy (struct Qdisc *sch)
net/sched/sch_etf.c +0 -3
@@ -445,9 +445,6 @@ static void etf_reset(struct Qdisc *sch)timesortedlist_clear (sch);__qdisc_reset_queue (&sch->q); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; - q->last =0 ; }
net/sched/sch_ets.c +0 -2
@@ -727,8 +727,6 @@ static void ets_qdisc_reset(struct Qdisc *sch) }for (band =0 ; band < q->nbands; band++)qdisc_reset (q->classes[band].qdisc); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static void ets_qdisc_destroy (struct Qdisc *sch)
net/sched/sch_fq_codel.c +0 -2
@@ -347,8 +347,6 @@ static void fq_codel_reset(struct Qdisc *sch)codel_vars_init (&flow->cvars); }memset (q->backlogs,0 , q->flows_cnt *sizeof (u32)); - sch->q.qlen =0 ; - sch->qstats.backlog =0 ; q->memory_usage =0 ; }
net/sched/sch_fq_pie.c +0 -3
@@ -521,9 +521,6 @@ static void fq_pie_reset(struct Qdisc *sch)INIT_LIST_HEAD (&flow->flowchain);pie_vars_init (&flow->vars); } - - sch->q.qlen =0 ; - sch->qstats.backlog =0 ; }static void fq_pie_destroy (struct Qdisc *sch)
net/sched/sch_hfsc.c +0 -2
@@ -1484,8 +1484,6 @@ hfsc_reset_qdisc(struct Qdisc *sch) } q->eligible =RB_ROOT ;qdisc_watchdog_cancel (&q->watchdog); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; } static void
net/sched/sch_htb.c +0 -2
@@ -1008,8 +1008,6 @@ static void htb_reset(struct Qdisc *sch) }qdisc_watchdog_cancel (&q->watchdog);__qdisc_reset_queue (&q->direct_queue); - sch->q.qlen =0 ; - sch->qstats.backlog =0 ;memset (q->hlevel,0 ,sizeof (q->hlevel));memset (q->row_mask,0 ,sizeof (q->row_mask)); }
net/sched/sch_multiq.c +0 -1
@@ -152,7 +152,6 @@ multiq_reset(struct Qdisc *sch)for (band =0 ; band < q->bands; band++)qdisc_reset (q->queues[band]); - sch->q.qlen =0 ; q->curband =0 ; }
net/sched/sch_prio.c +0 -2
@@ -135,8 +135,6 @@ prio_reset(struct Qdisc *sch)for (prio =0 ; prio < q->bands; prio++)qdisc_reset (q->queues[prio]); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static int prio_offload (struct Qdisc *sch,struct tc_prio_qopt *qopt)
net/sched/sch_qfq.c +0 -2
@@ -1458,8 +1458,6 @@ static void qfq_reset_qdisc(struct Qdisc *sch)qdisc_reset (cl->qdisc); } } - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static void qfq_destroy_qdisc (struct Qdisc *sch)
net/sched/sch_red.c +0 -2
@@ -176,8 +176,6 @@ static void red_reset(struct Qdisc *sch)struct red_sched_data *q =qdisc_priv (sch);qdisc_reset (q->qdisc); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ;red_restart (&q->vars); }
net/sched/sch_sfb.c +0 -2
@@ -456,8 +456,6 @@ static void sfb_reset(struct Qdisc *sch)struct sfb_sched_data *q =qdisc_priv (sch);qdisc_reset (q->qdisc); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; q->slot =0 ; q->double_buffering = false;sfb_zero_all_buckets (q);
net/sched/sch_skbprio.c +0 -3
@@ -213,9 +213,6 @@ static void skbprio_reset(struct Qdisc *sch)struct skbprio_sched_data *q =qdisc_priv (sch);int prio; - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; -for (prio =0 ; prio <SKBPRIO_MAX_PRIORITY ; prio++)__skb_queue_purge (&q->qdiscs[prio]);
net/sched/sch_taprio.c +0 -2
@@ -1638,8 +1638,6 @@ static void taprio_reset(struct Qdisc *sch)if (q->qdiscs[i])qdisc_reset (q->qdiscs[i]); } - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; }static void taprio_destroy (struct Qdisc *sch)
net/sched/sch_tbf.c +0 -2
@@ -330,8 +330,6 @@ static void tbf_reset(struct Qdisc *sch)struct tbf_sched_data *q =qdisc_priv (sch);qdisc_reset (q->qdisc); - sch->qstats.backlog =0 ; - sch->q.qlen =0 ; q->t_c =ktime_get_ns (); q->tokens = q->buffer; q->ptokens = q->mtu;
net/sched/sch_teql.c +0 -1
@@ -124,7 +124,6 @@ teql_reset(struct Qdisc *sch)struct teql_sched_data *dat =qdisc_priv (sch);skb_queue_purge (&dat->q); - sch->q.qlen =0 ; } static void
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/94 net: sched: sfb: fix null pointer access issue when sfb_init() fails
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 2a3fc78210b9f0e85372a2435368962009f480fc ]
When the default qdisc is sfb, if the qdisc of dev_queue fails to be inited during mqprio_init(), sfb_reset() is invoked to clear resources. In this case, the q->qdisc is NULL, and it will cause gpf issue.
The process is as follows:qdisc_create_dflt()
sfb_init() tcf_block_get() --->failed, q->qdisc is NULL ... qdisc_put() ... sfb_reset() qdisc_reset(q->qdisc) --->q->qdisc is NULL ops = qdisc->ops
The following is the Call Trace information:
general protection fault, probably for non-canonical address 0xdffffc0000000003: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] RIP: 0010:qdisc_reset+0x2b/0x6f0 Call Trace: <TASK> sfb_reset+0x37/0xd0 qdisc_reset+0xed/0x6f0 qdisc_destroy+0x82/0x4c0 qdisc_put+0x9e/0xb0 qdisc_create_dflt+0x2c3/0x4a0 mqprio_init+0xa71/0x1760 qdisc_create+0x3eb/0x1000 tc_modify_qdisc+0x408/0x1720 rtnetlink_rcv_msg+0x38e/0xac0 netlink_rcv_skb+0x12d/0x3a0 netlink_unicast+0x4a2/0x740 netlink_sendmsg+0x826/0xcc0 sock_sendmsg+0xc5/0x100 ____sys_sendmsg+0x583/0x690 ___sys_sendmsg+0xe8/0x160 __sys_sendmsg+0xbf/0x160 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f2164122d04 </TASK>
--- net/sched/sch_sfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sched/sch_sfb.c +2 -1
@@ -455,7 +455,8 @@ static void sfb_reset(struct Qdisc *sch) {struct sfb_sched_data *q =qdisc_priv (sch); -qdisc_reset (q->qdisc); +if (likely (q->qdisc)) +qdisc_reset (q->qdisc); q->slot =0 ; q->double_buffering = false;sfb_zero_all_buckets (q);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/94 net: Fix return value of qdisc ingress handling on success
In reply to Greg Kroah-HartmanFrom: Paul Blakey <[email protected]>
[ Upstream commit 672e97ef689a38cb20c2cc6a1814298fea34461e ]
Currently qdisc ingress handling (sch_handle_ingress()) doesn't set a return value and it is left to the old return value of the caller (__netif_receive_skb_core()) which is RX drop, so if the packet is consumed, caller will stop and return this value as if the packet was dropped.
This causes a problem in the kernel tcp stack when having a egress tc rule forwarding to a ingress tc rule.
The tcp stack sending packets on the device having the egress rule will see the packets as not successfully transmitted (although they actually were), will not advance it's internal state of sent data, and packets returning on such tcp stream will be dropped by the tcp stack with reason ack-of-unsent-data. See reproduction in [0] below.
Fix that by setting the return value to RX success if the packet was handled successfully.
[0] Reproduction steps:
$ ip link add veth1 type veth peer name peer1 $ ip link add veth2 type veth peer name peer2 $ ifconfig peer1 5.5.5.6/24 up $ ip netns add ns0 $ ip link set dev peer2 netns ns0 $ ip netns exec ns0 ifconfig peer2 5.5.5.5/24 up $ ifconfig veth2 0 up $ ifconfig veth1 0 up
#ingress forwarding veth1 <-> veth2
$ tc qdisc add dev veth2 ingress $ tc qdisc add dev veth1 ingress $ tc filter add dev veth2 ingress prio 1 proto all flower \ action mirred egress redirect dev veth1 $ tc filter add dev veth1 ingress prio 1 proto all flower \ action mirred egress redirect dev veth2
#steal packet from peer1 egress to veth2 ingress, bypassing the veth pipe
$ tc qdisc add dev peer1 clsact $ tc filter add dev peer1 egress prio 20 proto ip flower \ action mirred ingress redirect dev veth1
#run iperf and see connection not running
$ iperf3 -s& $ ip netns exec ns0 iperf3 -c 5.5.5.6 -i 1
#delete egress rule, and run again, now should work
$ tc filter del dev peer1 egress $ ip netns exec ns0 iperf3 -c 5.5.5.6 -i 1
--- net/core/dev.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/dev.c +4 -0
@@ -5136,11 +5136,13 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,case TC_ACT_SHOT :mini_qdisc_qstats_cpu_drop (miniq);kfree_skb_reason (skb,SKB_DROP_REASON_TC_INGRESS ); + *ret =NET_RX_DROP ;return NULL ;case TC_ACT_STOLEN :case TC_ACT_QUEUED :case TC_ACT_TRAP :consume_skb (skb); + *ret =NET_RX_SUCCESS ;return NULL ;case TC_ACT_REDIRECT :/* skb_mac_header check was done by cls/act_bpf, so
@@ -5153,8 +5155,10 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, *another = true;break ; } + *ret =NET_RX_SUCCESS ;return NULL ;case TC_ACT_CONSUMED : + *ret =NET_RX_SUCCESS ;return NULL ;default :break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/94 io_uring/msg_ring: Fix NULL pointer dereference in io_msg_send_fd()
In reply to Greg Kroah-HartmanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit 16bbdfe5fb0e78e0acb13e45fc127e9a296913f2 ]
Syzkaller produced the below call trace:
BUG: KASAN: null-ptr-deref in io_msg_ring+0x3cb/0x9f0 Write of size 8 at addr 0000000000000070 by task repro/16399 CPU: 0 PID: 16399 Comm: repro Not tainted 6.1.0-rc1 #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 Call Trace: <TASK> dump_stack_lvl+0xcd/0x134 ? io_msg_ring+0x3cb/0x9f0 kasan_report+0xbc/0xf0 ? io_msg_ring+0x3cb/0x9f0 kasan_check_range+0x140/0x190 io_msg_ring+0x3cb/0x9f0 ? io_msg_ring_prep+0x300/0x300 io_issue_sqe+0x698/0xca0 io_submit_sqes+0x92f/0x1c30 __do_sys_io_uring_enter+0xae4/0x24b0 .... RIP: 0033:0x7f2eaf8f8289 RSP: 002b:00007fff40939718 EFLAGS: 00000246 ORIG_RAX: 00000000000001aa RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f2eaf8f8289 RDX: 0000000000000000 RSI: 0000000000006f71 RDI: 0000000000000004 RBP: 00007fff409397a0 R08: 0000000000000000 R09: 0000000000000039 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000004006d0 R13: 00007fff40939880 R14: 0000000000000000 R15: 0000000000000000 </TASK> Kernel panic - not syncing: panic_on_warn set ...
We don't have a NULL check on file_ptr in io_msg_send_fd() function, so when file_ptr is NUL src_file is also NULL and get_file() dereferences a NULL pointer and leads to above crash.
Add a NULL check to fix this issue.
--- io_uring/msg_ring.c | 3 +++ 1 file changed, 3 insertions(+)
io_uring/msg_ring.c +3 -0
@@ -95,6 +95,9 @@ static int io_msg_send_fd(struct io_kiocb *req, unsigned int issue_flags) msg->src_fd =array_index_nospec (msg->src_fd, ctx->nr_user_files); file_ptr =io_fixed_file_slot (&ctx->file_table, msg->src_fd)->file_ptr; +if (!file_ptr) + goto out_unlock; + src_file = (struct file *) (file_ptr &FFS_MASK );get_file (src_file);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/94 sfc: include vport_id in filter spec hash and equal()
In reply to Greg Kroah-HartmanFrom: Pieter Jansen van Vuuren <[email protected]>
[ Upstream commit c2bf23e4a5af37a4d77901d9ff14c50a269f143d ]
Filters on different vports are qualified by different implicit MACs and/or VLANs, so shouldn't be considered equal even if their other match fields are identical.
--- drivers/net/ethernet/sfc/filter.h | 4 ++-- drivers/net/ethernet/sfc/rx_common.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/sfc/filter.h +2 -2
@@ -161,9 +161,9 @@ struct efx_filter_spec { u32 priority:2; u32 flags:6; u32 dmaq_id:12; -u32 vport_id;u32 rss_context; -__be16 outer_vid__aligned(4) ;/* allow jhash2() of match values */ +u32 vport_id; +__be16 outer_vid;__be16 inner_vid;u8 loc_mac[ETH_ALEN ];u8 rem_mac[ETH_ALEN ];
drivers/net/ethernet/sfc/rx_common.c +5 -5
@@ -660,17 +660,17 @@ bool efx_filter_spec_equal(const struct efx_filter_spec *left, (EFX_FILTER_FLAG_RX | EFX_FILTER_FLAG_TX)))return false; -return memcmp (&left->outer_vid, &right->outer_vid, +return memcmp (&left->vport_id, &right->vport_id,sizeof (struct efx_filter_spec ) - - offsetof(struct efx_filter_spec , outer_vid)) ==0 ; + offsetof(struct efx_filter_spec , vport_id)) ==0 ; }u32 efx_filter_spec_hash (const struct efx_filter_spec *spec) { -BUILD_BUG_ON (offsetof(struct efx_filter_spec , outer_vid) &3 ); -return jhash2 ((const u32 *)&spec->outer_vid, +BUILD_BUG_ON (offsetof(struct efx_filter_spec , vport_id) &3 ); +return jhash2 ((const u32 *)&spec->vport_id, (sizeof (struct efx_filter_spec ) - - offsetof(struct efx_filter_spec , outer_vid)) /4 , + offsetof(struct efx_filter_spec , vport_id)) /4 ,0 ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/94 wwan_hwsim: fix possible memory leak in wwan_hwsim_dev_new()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 258ad2fe5ede773625adfda88b173f4123e59f45 ]
Inject fault while probing module, if device_register() fails, but the refcount of kobject is not decreased to 0, the name allocated in dev_set_name() is leaked. Fix this by calling put_device(), so that name can be freed in callback function kobject_cleanup().
unreferenced object 0xffff88810152ad20 (size 8):
comm "modprobe", pid 252, jiffies 4294849206 (age 22.713s) hex dump (first 8 bytes):
68 77 73 69 6d 30 00 ff hwsim0..
backtrace:
[<000000009c3504ed>] __kmalloc_node_track_caller+0x44/0x1b0
[<00000000c0228a5e>] kvasprintf+0xb5/0x140
[<00000000cff8c21f>] kvasprintf_const+0x55/0x180
[<0000000055a1e073>] kobject_set_name_vargs+0x56/0x150
[<000000000a80b139>] dev_set_name+0xab/0xe0--- drivers/net/wwan/wwan_hwsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wwan/wwan_hwsim.c +1 -1
@@ -311,7 +311,7 @@ static struct wwan_hwsim_dev *wwan_hwsim_dev_new(void)return ERR_PTR (err); err_free_dev: -kfree (dev); +put_device (&dev->dev);return ERR_PTR (err); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/94 net: hns: fix possible memory leak in hnae_ae_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ff2f5ec5d009844ec28f171123f9e58750cef4bf ]
Inject fault while probing module, if device_register() fails, but the refcount of kobject is not decreased to 0, the name allocated in dev_set_name() is leaked. Fix this by calling put_device(), so that name can be freed in callback function kobject_cleanup().
unreferenced object 0xffff00c01aba2100 (size 128):
comm "systemd-udevd", pid 1259, jiffies 4294903284 (age 294.152s) hex dump (first 32 bytes):
68 6e 61 65 30 00 00 00 18 21 ba 1a c0 00 ff ff hnae0....!......
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000034783f26>] slab_post_alloc_hook+0xa0/0x3e0
[<00000000748188f2>] __kmem_cache_alloc_node+0x164/0x2b0
[<00000000ab0743e8>] __kmalloc_node_track_caller+0x6c/0x390
[<000000006c0ffb13>] kvasprintf+0x8c/0x118
[<00000000fa27bfe1>] kvasprintf_const+0x60/0xc8
[<0000000083e10ed7>] kobject_set_name_vargs+0x3c/0xc0
[<000000000b87affc>] dev_set_name+0x7c/0xa0
[<000000003fd8fe26>] hnae_ae_register+0xcc/0x190 [hnae]
[<00000000fe97edc9>] hns_dsaf_ae_init+0x9c/0x108 [hns_dsaf]
[<00000000c36ff1eb>] hns_dsaf_probe+0x548/0x748 [hns_dsaf]--- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hnae.c +3 -1
@@ -419,8 +419,10 @@ int hnae_ae_register(struct hnae_ae_dev *hdev, struct module *owner) hdev->cls_dev.release = hnae_release; (void )dev_set_name (&hdev->cls_dev,"hnae%d" , hdev->id); ret =device_register (&hdev->cls_dev); -if (ret) +if (ret) { +put_device (&hdev->cls_dev);return ret; + }__module_get (THIS_MODULE );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/94 net: sched: fix race condition in qdisc_graft()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ebda44da44f6f309d302522b049f43d6f829f7aa ]
We had one syzbot report [1] in syzbot queue for a while. I was waiting for more occurrences and/or a repro but Dmitry Vyukov spotted the issue right away.
<quoting Dmitry>qdisc_graft() drops reference to qdisc in notify_and_destroy while it's still assigned to dev->qdisc
</quoting>
Indeed, RCU rules are clear when replacing a data structure. The visible pointer (dev->qdisc in this case) must be updated to the new object _before_ RCU grace period is started (qdisc_put(old) in this case).
[1]
BUG: KASAN: use-after-free in __tcf_qdisc_find.part.0+0xa3a/0xac0 net/sched/cls_api.c:1066 Read of size 4 at addr ffff88802065e038 by task syz-executor.4/21027 CPU: 0 PID: 21027 Comm: syz-executor.4 Not tainted 6.0.0-rc3-syzkaller-00363-g7726d4c3e60b #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/26/2022 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:317 [inline] print_report.cold+0x2ba/0x719 mm/kasan/report.c:433 kasan_report+0xb1/0x1e0 mm/kasan/report.c:495 __tcf_qdisc_find.part.0+0xa3a/0xac0 net/sched/cls_api.c:1066 __tcf_qdisc_find net/sched/cls_api.c:1051 [inline] tc_new_tfilter+0x34f/0x2200 net/sched/cls_api.c:2018 rtnetlink_rcv_msg+0x955/0xca0 net/core/rtnetlink.c:6081 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2501 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x917/0xe10 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 ____sys_sendmsg+0x6eb/0x810 net/socket.c:2482 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2536 __sys_sendmsg+0xf3/0x1c0 net/socket.c:2565 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f5efaa89279 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f5efbc31168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f5efab9bf80 RCX: 00007f5efaa89279 RDX: 0000000000000000 RSI: 0000000020000140 RDI: 0000000000000005 RBP: 00007f5efaae32e9 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f5efb0cfb1f R14: 00007f5efbc31300 R15: 0000000000022000 </TASK> Allocated by task 21027: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 kasan_set_track mm/kasan/common.c:45 [inline] set_alloc_info mm/kasan/common.c:437 [inline] ____kasan_kmalloc mm/kasan/common.c:516 [inline] ____kasan_kmalloc mm/kasan/common.c:475 [inline] __kasan_kmalloc+0xa9/0xd0 mm/kasan/common.c:525 kmalloc_node include/linux/slab.h:623 [inline] kzalloc_node include/linux/slab.h:744 [inline] qdisc_alloc+0xb0/0xc50 net/sched/sch_generic.c:938 qdisc_create_dflt+0x71/0x4a0 net/sched/sch_generic.c:997 attach_one_default_qdisc net/sched/sch_generic.c:1152 [inline] netdev_for_each_tx_queue include/linux/netdevice.h:2437 [inline] attach_default_qdiscs net/sched/sch_generic.c:1170 [inline] dev_activate+0x760/0xcd0 net/sched/sch_generic.c:1229 __dev_open+0x393/0x4d0 net/core/dev.c:1441 __dev_change_flags+0x583/0x750 net/core/dev.c:8556 rtnl_configure_link+0xee/0x240 net/core/rtnetlink.c:3189 rtnl_newlink_create net/core/rtnetlink.c:3371 [inline] __rtnl_newlink+0x10b8/0x17e0 net/core/rtnetlink.c:3580 rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3593 rtnetlink_rcv_msg+0x43a/0xca0 net/core/rtnetlink.c:6090 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2501 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x917/0xe10 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 ____sys_sendmsg+0x6eb/0x810 net/socket.c:2482 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2536 __sys_sendmsg+0xf3/0x1c0 net/socket.c:2565 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 21020: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 kasan_set_track+0x21/0x30 mm/kasan/common.c:45 kasan_set_free_info+0x20/0x30 mm/kasan/generic.c:370 ____kasan_slab_free mm/kasan/common.c:367 [inline] ____kasan_slab_free+0x166/0x1c0 mm/kasan/common.c:329 kasan_slab_free include/linux/kasan.h:200 [inline] slab_free_hook mm/slub.c:1754 [inline] slab_free_freelist_hook+0x8b/0x1c0 mm/slub.c:1780 slab_free mm/slub.c:3534 [inline] kfree+0xe2/0x580 mm/slub.c:4562 rcu_do_batch kernel/rcu/tree.c:2245 [inline] rcu_core+0x7b5/0x1890 kernel/rcu/tree.c:2505 __do_softirq+0x1d3/0x9c6 kernel/softirq.c:571 Last potentially related work creation: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 __kasan_record_aux_stack+0xbe/0xd0 mm/kasan/generic.c:348 call_rcu+0x99/0x790 kernel/rcu/tree.c:2793 qdisc_put+0xcd/0xe0 net/sched/sch_generic.c:1083 notify_and_destroy net/sched/sch_api.c:1012 [inline] qdisc_graft+0xeb1/0x1270 net/sched/sch_api.c:1084 tc_modify_qdisc+0xbb7/0x1a00 net/sched/sch_api.c:1671 rtnetlink_rcv_msg+0x43a/0xca0 net/core/rtnetlink.c:6090 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2501 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x917/0xe10 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 ____sys_sendmsg+0x6eb/0x810 net/socket.c:2482 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2536 __sys_sendmsg+0xf3/0x1c0 net/socket.c:2565 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd Second to last potentially related work creation: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 __kasan_record_aux_stack+0xbe/0xd0 mm/kasan/generic.c:348 kvfree_call_rcu+0x74/0x940 kernel/rcu/tree.c:3322 neigh_destroy+0x431/0x630 net/core/neighbour.c:912 neigh_release include/net/neighbour.h:454 [inline] neigh_cleanup_and_release+0x1f8/0x330 net/core/neighbour.c:103 neigh_del net/core/neighbour.c:225 [inline] neigh_remove_one+0x37d/0x460 net/core/neighbour.c:246 neigh_forced_gc net/core/neighbour.c:276 [inline] neigh_alloc net/core/neighbour.c:447 [inline] ___neigh_create+0x18b5/0x29a0 net/core/neighbour.c:642 ip6_finish_output2+0xfb8/0x1520 net/ipv6/ip6_output.c:125 __ip6_finish_output net/ipv6/ip6_output.c:195 [inline] ip6_finish_output+0x690/0x1160 net/ipv6/ip6_output.c:206 NF_HOOK_COND include/linux/netfilter.h:296 [inline] ip6_output+0x1ed/0x540 net/ipv6/ip6_output.c:227 dst_output include/net/dst.h:451 [inline] NF_HOOK include/linux/netfilter.h:307 [inline] NF_HOOK include/linux/netfilter.h:301 [inline] mld_sendpack+0xa09/0xe70 net/ipv6/mcast.c:1820 mld_send_cr net/ipv6/mcast.c:2121 [inline] mld_ifc_work+0x71c/0xdc0 net/ipv6/mcast.c:2653 process_one_work+0x991/0x1610 kernel/workqueue.c:2289 worker_thread+0x665/0x1080 kernel/workqueue.c:2436 kthread+0x2e4/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 The buggy address belongs to the object at ffff88802065e000
which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 56 bytes inside of 1024-byte region [ffff88802065e000, ffff88802065e400)
The buggy address belongs to the physical page: page:ffffea0000819600 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x20658 head:ffffea0000819600 order:3 compound_mapcount:0 compound_pincount:0 flags: 0xfff00000010200(slab|head|node=0|zone=1|lastcpupid=0x7ff) raw: 00fff00000010200 0000000000000000 dead000000000001 ffff888011841dc0 raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Unmovable, gfp_mask 0xd20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC), pid 3523, tgid 3523 (sshd), ts 41495190986, free_ts 41417713212 prep_new_page mm/page_alloc.c:2532 [inline] get_page_from_freelist+0x109b/0x2ce0 mm/page_alloc.c:4283 __alloc_pages+0x1c7/0x510 mm/page_alloc.c:5515 alloc_pages+0x1a6/0x270 mm/mempolicy.c:2270 alloc_slab_page mm/slub.c:1824 [inline] allocate_slab+0x27e/0x3d0 mm/slub.c:1969 new_slab mm/slub.c:2029 [inline] ___slab_alloc+0x7f1/0xe10 mm/slub.c:3031 __slab_alloc.constprop.0+0x4d/0xa0 mm/slub.c:3118 slab_alloc_node mm/slub.c:3209 [inline] __kmalloc_node_track_caller+0x2f2/0x380 mm/slub.c:4955 kmalloc_reserve net/core/skbuff.c:358 [inline] __alloc_skb+0xd9/0x2f0 net/core/skbuff.c:430 alloc_skb_fclone include/linux/skbuff.h:1307 [inline] tcp_stream_alloc_skb+0x38/0x580 net/ipv4/tcp.c:861 tcp_sendmsg_locked+0xc36/0x2f80 net/ipv4/tcp.c:1325 tcp_sendmsg+0x2b/0x40 net/ipv4/tcp.c:1483 inet_sendmsg+0x99/0xe0 net/ipv4/af_inet.c:819 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 sock_write_iter+0x291/0x3d0 net/socket.c:1108 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x9e9/0xdd0 fs/read_write.c:578 ksys_write+0x1e8/0x250 fs/read_write.c:631 page last free stack trace: reset_page_owner include/linux/page_owner.h:24 [inline] free_pages_prepare mm/page_alloc.c:1449 [inline] free_pcp_prepare+0x5e4/0xd20 mm/page_alloc.c:1499 free_unref_page_prepare mm/page_alloc.c:3380 [inline] free_unref_page+0x19/0x4d0 mm/page_alloc.c:3476 __unfreeze_partials+0x17c/0x1a0 mm/slub.c:2548 qlink_free mm/kasan/quarantine.c:168 [inline] qlist_free_all+0x6a/0x170 mm/kasan/quarantine.c:187 kasan_quarantine_reduce+0x180/0x200 mm/kasan/quarantine.c:294 __kasan_slab_alloc+0xa2/0xc0 mm/kasan/common.c:447 kasan_slab_alloc include/linux/kasan.h:224 [inline] slab_post_alloc_hook mm/slab.h:727 [inline] slab_alloc_node mm/slub.c:3243 [inline] slab_alloc mm/slub.c:3251 [inline] __kmem_cache_alloc_lru mm/slub.c:3258 [inline] kmem_cache_alloc+0x267/0x3b0 mm/slub.c:3268 kmem_cache_zalloc include/linux/slab.h:723 [inline] alloc_buffer_head+0x20/0x140 fs/buffer.c:2974 alloc_page_buffers+0x280/0x790 fs/buffer.c:829 create_empty_buffers+0x2c/0xee0 fs/buffer.c:1558 ext4_block_write_begin+0x1004/0x1530 fs/ext4/inode.c:1074 ext4_da_write_begin+0x422/0xae0 fs/ext4/inode.c:2996 generic_perform_write+0x246/0x560 mm/filemap.c:3738 ext4_buffered_write_iter+0x15b/0x460 fs/ext4/file.c:270 ext4_file_write_iter+0x44a/0x1660 fs/ext4/file.c:679 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x9e9/0xdd0 fs/read_write.c:578
--- net/sched/sch_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/sch_api.c +3 -2
@@ -1081,12 +1081,13 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, skip:if (!ingress) { -notify_and_destroy (net, skb, n, classid, -rtnl_dereference (dev->qdisc), new); + old =rtnl_dereference (dev->qdisc);if (new && !new->ops->attach)qdisc_refcount_inc (new);rcu_assign_pointer (dev->qdisc, new ? : &noop_qdisc); +notify_and_destroy (net, skb, n, classid, old, new); +if (new && new->ops->attach) new->ops->attach (new); }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/94 net: phy: dp83822: disable MDI crossover status change interrupt
In reply to Greg Kroah-HartmanFrom: Felix Riemann <[email protected]>
[ Upstream commit 7f378c03aa4952507521174fb0da7b24a9ad0be6 ]
If the cable is disconnected the PHY seems to toggle between MDI and MDI-X modes. With the MDI crossover status interrupt active this causes roughly 10 interrupts per second.
As the crossover status isn't checked by the driver, the interrupt can be disabled to reduce the interrupt load.
--- drivers/net/phy/dp83822.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/phy/dp83822.c +1 -2
@@ -254,8 +254,7 @@ static int dp83822_config_intr(struct phy_device *phydev) DP83822_EEE_ERROR_CHANGE_INT_EN);if (!dp83822->fx_enabled) - misr_status |=DP83822_MDI_XOVER_INT_EN | -DP83822_ANEG_ERR_INT_EN | + misr_status |=DP83822_ANEG_ERR_INT_EN |DP83822_WOL_PKT_INT_EN ; err =phy_write (phydev,MII_DP83822_MISR2 , misr_status);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/94 drbd: only clone bio if we have a backing device
In reply to Greg Kroah-HartmanFrom: Christoph Böhmwalder <[email protected]>
[ Upstream commit 6d42ddf7f27b6723549ee6d4c8b1b418b59bf6b5 ]
Commit c347a787e34cb (drbd: set ->bi_bdev in drbd_req_new) moved a bio_set_dev call (which has since been removed) to "earlier", from drbd_request_prepare to drbd_req_new.
The problem is that this accesses device->ldev->backing_bdev, which is not NULL-checked at this point. When we don't have an ldev (i.e. when the DRBD device is diskless), this leads to a null pointer deref.
So, only allocate the private_bio if we actually have a disk. This is also a small optimization, since we don't clone the bio to only to immediately free it again in the diskless case.
--- drivers/block/drbd/drbd_req.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/block/drbd/drbd_req.c +6 -8
@@ -30,11 +30,6 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, struct bioreturn NULL ;memset (req,0 ,sizeof (*req)); - req->private_bio =bio_alloc_clone (device->ldev->backing_bdev, bio_src, -GFP_NOIO , &drbd_io_bio_set); - req->private_bio->bi_private = req; - req->private_bio->bi_end_io = drbd_request_endio; - req->rq_state = (bio_data_dir (bio_src) ==WRITE ?RQ_WRITE :0 ) | (bio_op (bio_src) ==REQ_OP_WRITE_ZEROES ?RQ_ZEROES :0 ) | (bio_op (bio_src) ==REQ_OP_DISCARD ?RQ_UNMAP :0 );
@@ -1219,9 +1214,12 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio)/* Update disk stats */ req->start_jif =bio_start_io_acct (req->master_bio); -if (!get_ldev (device)) { -bio_put (req->private_bio); - req->private_bio =NULL ; +if (get_ldev (device)) { + req->private_bio =bio_alloc_clone (device->ldev->backing_bdev, + bio,GFP_NOIO , + &drbd_io_bio_set); + req->private_bio->bi_private = req; + req->private_bio->bi_end_io = drbd_request_endio; }/* process discards always from our submitter thread */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/94 rv/dot2c: Make automaton definition static
In reply to Greg Kroah-HartmanFrom: Daniel Bristot de Oliveira <[email protected]>
[ Upstream commit 21a1994b6492b12e55dbf39d15271430ef6839f0 ]
Monitor's automata definition is only used locally, so make dot2c generate a static definition.
--- tools/verification/dot2/dot2c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/verification/dot2/dot2c.py +1 -1
@@ -111,7 +111,7 @@ class Dot2c(Automata): def format_aut_init_header(self): buff = [] - buff.append("struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) + buff.append("static struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) return buff def __get_string_vector_per_line_content(self, buff):
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/94 iommu/vt-d: Allow NVS regions in arch_rmrr_sanity_check()
In reply to Greg Kroah-HartmanFrom: Charlotte Tan <[email protected]>
[ Upstream commit 5566e68d829f5d87670d5984c1c2ccb4c518405f ]
arch_rmrr_sanity_check() warns if the RMRR is not covered by an ACPI Reserved region, but it seems like it should accept an NVS region as well. The ACPI spec
https://uefi.org/specs/ACPI/6.5/15_System_Address_Map_Interfaces.html
uses similar wording for "Reserved" and "NVS" region types; for NVS regions it says "This range of addresses is in use or reserved by the system and must not be used by the operating system."
There is an old comment on this mailing list that also suggests NVS regions should pass the arch_rmrr_sanity_check() test:
The warnings come from arch_rmrr_sanity_check() since it checks whether the region is E820_TYPE_RESERVED. However, if the purpose of the check is to detect RMRR has regions that may be used by OS as free memory, isn't E820_TYPE_NVS safe, too?
This patch overlaps with another proposed patch that would add the region type to the log since sometimes the bug reporter sees this log on the console but doesn't know to include the kernel log:
https://lore.kernel.org/lkml/[email protected]/
Here's an example of the "Firmware Bug" apparent false positive (wrapped for line length):
DMAR: [Firmware Bug]: No firmware reserved region can cover this RMRR
[0x000000006f760000-0x000000006f762fff], contact BIOS vendor for
fixes
DMAR: [Firmware Bug]: Your BIOS is broken; bad RMRR
[0x000000006f760000-0x000000006f762fff]This is the snippet from the e820 table:
BIOS-e820: [mem 0x0000000068bff000-0x000000006ebfefff] reserved
BIOS-e820: [mem 0x000000006ebff000-0x000000006f9fefff] ACPI NVS
BIOS-e820: [mem 0x000000006f9ff000-0x000000006fffefff] ACPI data
--- arch/x86/include/asm/iommu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/include/asm/iommu.h +3 -1
@@ -25,8 +25,10 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) {u64 start = rmrr->base_address;u64 end = rmrr->end_address +1 ; +int entry_type; -if (e820__mapped_all (start, end,E820_TYPE_RESERVED )) + entry_type =e820__get_entry_type (start, end); +if (entry_type ==E820_TYPE_RESERVED || entry_type ==E820_TYPE_NVS )return 0 ; pr_err(FW_BUG "No firmware reserved region can cover this RMRR [%#018Lx-%#018Lx], contact BIOS vendor for fixes\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/94 iommu/vt-d: Clean up si_domain in the init_dmars() error path
In reply to Greg Kroah-HartmanFrom: Jerry Snitselaar <[email protected]>
[ Upstream commit 620bf9f981365c18cc2766c53d92bf8131c63f32 ]
A splat from kmem_cache_destroy() was seen with a kernel prior to commit ee2653bbe89d ("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure in init_dmars(), because the iommu_domain cache still had objects. While the mempool code is now gone, there still is a leak of the si_domain memory if init_dmars() fails. So clean up si_domain in the init_dmars() error path.
--- drivers/iommu/intel/iommu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/iommu/intel/iommu.c +5 -0
@@ -2400,6 +2400,7 @@ static int __init si_domain_init(int hw)if (md_domain_init (si_domain,DEFAULT_DOMAIN_ADDRESS_WIDTH )) {domain_exit (si_domain); + si_domain =NULL ;return -EFAULT ; }
@@ -3042,6 +3043,10 @@ static int __init init_dmars(void)disable_dmar_iommu (iommu);free_dmar_iommu (iommu); } +if (si_domain) { +domain_exit (si_domain); + si_domain =NULL ; + }return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/94 wifi: mt76: mt7921e: fix random fw download fail
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit 29e247ece5d3edfa71495768a9ab5fc7bba76bd4 ]
In case of PCIe interoperability problem shows up, the firmware payload may be corrupted in download stage. Turn off L0s to keep fw download process accurately.
[ 1093.528363] mt7921e 0000:3b:00.0: Message 00000007 (seq 7) timeout [ 1093.528414] mt7921e 0000:3b:00.0: Failed to start patch [ 1096.600156] mt7921e 0000:3b:00.0: Message 00000010 (seq 8) timeout [ 1096.600207] mt7921e 0000:3b:00.0: Failed to release patch semaphore [ 1097.699031] mt7921e 0000:3b:00.0: Timeout for driver own [ 1098.758427] mt7921e 0000:3b:00.0: Timeout for driver own [ 1099.834408] mt7921e 0000:3b:00.0: Timeout for driver own [ 1100.915264] mt7921e 0000:3b:00.0: Timeout for driver own [ 1101.990625] mt7921e 0000:3b:00.0: Timeout for driver own [ 1103.077587] mt7921e 0000:3b:00.0: Timeout for driver own [ 1104.173258] mt7921e 0000:3b:00.0: Timeout for driver own [ 1105.248466] mt7921e 0000:3b:00.0: Timeout for driver own [ 1106.336969] mt7921e 0000:3b:00.0: Timeout for driver own [ 1106.397542] mt7921e 0000:3b:00.0: hardware init failed
--- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 1 + drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 ++ 3 files changed, 5 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +1 -0
@@ -152,6 +152,7 @@ static u32 __mt7921_reg_addr(struct mt79 { 0x820c8000, 0x0c000, 0x2000 }, /* WF_UMAC_TOP (PSE) */ { 0x820cc000, 0x0e000, 0x1000 }, /* WF_UMAC_TOP (PP) */ { 0x820cd000, 0x0f000, 0x1000 }, /* WF_MDP_TOP */ + { 0x74030000, 0x10000, 0x10000 }, /* PCIE_MAC_IREG */ { 0x820ce000, 0x21c00, 0x0200 }, /* WF_LMAC_TOP (WF_SEC) */ { 0x820cf000, 0x22000, 0x1000 }, /* WF_LMAC_TOP (WF_PF) */ { 0x820e0000, 0x20000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */
drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c +2 -0
@@ -59,6 +59,8 @@ int mt7921e_mcu_init(struct mt7921_dev *if (err)return err; +mt76_rmw_field (dev,MT_PCIE_MAC_PM ,MT_PCIE_MAC_PM_L0S_DIS ,1 ); + err =mt7921_run_firmware (dev);mt76_queue_tx_cleanup (dev, dev->mt76.q_mcu[MT_MCUQ_FWDL ], false);
drivers/net/wireless/mediatek/mt76/mt7921/regs.h +2 -0
@@ -440,6 +440,8 @@#define MT_PCIE_MAC_BASE 0x10000#define MT_PCIE_MAC (ofs) (MT_PCIE_MAC_BASE + (ofs))#define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188) +#define MT_PCIE_MAC_PM MT_PCIE_MAC(0x194) +#define MT_PCIE_MAC_PM_L0S_DIS BIT(8)#define MT_DMA_SHDL (ofs) (0x7c026000 + (ofs))#define MT_DMASHDL_SW_CONTROL MT_DMA_SHDL(0x004)
Greg Kroah-Hartman
maintainerPATCH 89/94 io_uring: dont gate task_work run on TIF_NOTIFY_SIGNAL
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 46a525e199e4037516f7e498c18f065b09df32ac ]
This isn't a reliable mechanism to tell if we have task_work pending, we really should be looking at whether we have any items queued. This is problematic if forward progress is gated on running said task_work. One such example is reading from a pipe, where the write side has been closed right before the read is started. The fput() of the file queues TWA_RESUME task_work, and we need that task_work to be run before ->release() is called for the pipe. If ->release() isn't called, then the read will sit forever waiting on data that will never arise.
Fix this by io_run_task_work() so it checks if we have task_work pending rather than rely on TIF_NOTIFY_SIGNAL for that. The latter obviously doesn't work for task_work that is queued without TWA_SIGNAL.
--- io_uring/io_uring.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
io_uring/io_uring.h +5 -5
@@ -229,12 +229,12 @@ static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx)static inline bool io_run_task_work (void ) { -if (test_thread_flag (TIF_NOTIFY_SIGNAL )) { +if (task_work_pending (current)) { +if (test_thread_flag (TIF_NOTIFY_SIGNAL )) +clear_notify_signal ();__set_current_state (TASK_RUNNING ); -clear_notify_signal (); -if (task_work_pending (current)) -task_work_run (); -return true; +task_work_run (); +return 1 ; }return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/94 ext4: introduce EXT4_FC_TAG_BASE_LEN helper
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit fdc2a3c75dd8345c5b48718af90bad1a7811bedb ]
Introduce EXT4_FC_TAG_BASE_LEN helper for calculate length of struct ext4_fc_tl.
Stable-dep-of: 1b45cc5c7b92 ("ext4: fix potential out of bound read in ext4_fc_replay_scan()")
--- fs/ext4/fast_commit.c | 54 ++++++++++++++++++++++--------------------- fs/ext4/fast_commit.h | 3 +++ 2 files changed, 31 insertions(+), 26 deletions(-)
fs/ext4/fast_commit.c +28 -26
@@ -710,10 +710,10 @@ static u8 *ext4_fc_reserve_space(struct super_block *sb, int len, u32 *crc)* After allocating len, we should have space at least for a 0 byte * padding. */ -if (len +sizeof (struct ext4_fc_tl ) > bsize) +if (len +EXT4_FC_TAG_BASE_LEN > bsize)return NULL ; -if (bsize - off -1 > len +sizeof (struct ext4_fc_tl )) { +if (bsize - off -1 > len +EXT4_FC_TAG_BASE_LEN ) {/* * Only allocate from current buffer if we have enough space for * this request AND we have space to add a zero byte padding.
@@ -730,10 +730,10 @@ static u8 *ext4_fc_reserve_space(struct super_block *sb, int len, u32 *crc)/* Need to add PAD tag */ tl = (struct ext4_fc_tl *)(sbi->s_fc_bh->b_data + off); tl->fc_tag =cpu_to_le16 (EXT4_FC_TAG_PAD ); - pad_len = bsize - off -1 -sizeof (struct ext4_fc_tl ); + pad_len = bsize - off -1 -EXT4_FC_TAG_BASE_LEN ; tl->fc_len =cpu_to_le16 (pad_len);if (crc) - *crc =ext4_chksum (sbi, *crc, tl,sizeof (*tl)); + *crc =ext4_chksum (sbi, *crc, tl,EXT4_FC_TAG_BASE_LEN );if (pad_len >0 )ext4_fc_memzero (sb, tl +1 , pad_len, crc);ext4_fc_submit_bh (sb, false);
@@ -775,7 +775,7 @@ static int ext4_fc_write_tail(struct super_block *sb, u32 crc)* ext4_fc_reserve_space takes care of allocating an extra block if * there's no enough space on this block for accommodating this tail. */ - dst =ext4_fc_reserve_space (sb,sizeof (tl) +sizeof (tail), &crc); + dst =ext4_fc_reserve_space (sb,EXT4_FC_TAG_BASE_LEN +sizeof (tail), &crc);if (!dst)return -ENOSPC ;
@@ -785,8 +785,8 @@ static int ext4_fc_write_tail(struct super_block *sb, u32 crc) tl.fc_len =cpu_to_le16 (bsize - off -1 +sizeof (struct ext4_fc_tail )); sbi->s_fc_bytes =round_up (sbi->s_fc_bytes, bsize); -ext4_fc_memcpy (sb, dst, &tl,sizeof (tl), &crc); - dst +=sizeof (tl); +ext4_fc_memcpy (sb, dst, &tl,EXT4_FC_TAG_BASE_LEN , &crc); + dst +=EXT4_FC_TAG_BASE_LEN ; tail.fc_tid =cpu_to_le32 (sbi->s_journal->j_running_transaction->t_tid);ext4_fc_memcpy (sb, dst, &tail.fc_tid,sizeof (tail.fc_tid), &crc); dst +=sizeof (tail.fc_tid);
@@ -808,15 +808,15 @@ static bool ext4_fc_add_tlv(struct super_block *sb, u16 tag, u16 len, u8 *val,struct ext4_fc_tl tl;u8 *dst; - dst =ext4_fc_reserve_space (sb,sizeof (tl) + len, crc); + dst =ext4_fc_reserve_space (sb,EXT4_FC_TAG_BASE_LEN + len, crc);if (!dst)return false; tl.fc_tag =cpu_to_le16 (tag); tl.fc_len =cpu_to_le16 (len); -ext4_fc_memcpy (sb, dst, &tl,sizeof (tl), crc); -ext4_fc_memcpy (sb, dst +sizeof (tl), val, len, crc); +ext4_fc_memcpy (sb, dst, &tl,EXT4_FC_TAG_BASE_LEN , crc); +ext4_fc_memcpy (sb, dst +EXT4_FC_TAG_BASE_LEN , val, len, crc);return true; }
@@ -828,8 +828,8 @@ static bool ext4_fc_add_dentry_tlv(struct super_block *sb, u32 *crc,struct ext4_fc_dentry_info fcd;struct ext4_fc_tl tl;int dlen = fc_dentry->fcd_name.len; -u8 *dst =ext4_fc_reserve_space (sb,sizeof (tl) +sizeof (fcd) + dlen, - crc); +u8 *dst =ext4_fc_reserve_space (sb, +EXT4_FC_TAG_BASE_LEN +sizeof (fcd) + dlen, crc);if (!dst)return false;
@@ -838,8 +838,8 @@ static bool ext4_fc_add_dentry_tlv(struct super_block *sb, u32 *crc, fcd.fc_ino =cpu_to_le32 (fc_dentry->fcd_ino); tl.fc_tag =cpu_to_le16 (fc_dentry->fcd_op); tl.fc_len =cpu_to_le16 (sizeof (fcd) + dlen); -ext4_fc_memcpy (sb, dst, &tl,sizeof (tl), crc); - dst +=sizeof (tl); +ext4_fc_memcpy (sb, dst, &tl,EXT4_FC_TAG_BASE_LEN , crc); + dst +=EXT4_FC_TAG_BASE_LEN ;ext4_fc_memcpy (sb, dst, &fcd,sizeof (fcd), crc); dst +=sizeof (fcd);ext4_fc_memcpy (sb, dst, fc_dentry->fcd_name.name, dlen, crc);
@@ -876,13 +876,13 @@ static int ext4_fc_write_inode(struct inode *inode, u32 *crc) ret = -ECANCELED ; dst =ext4_fc_reserve_space (inode->i_sb, -sizeof (tl) + inode_len +sizeof (fc_inode.fc_ino), crc); +EXT4_FC_TAG_BASE_LEN + inode_len +sizeof (fc_inode.fc_ino), crc);if (!dst) goto err; -if (!ext4_fc_memcpy (inode->i_sb, dst, &tl,sizeof (tl), crc)) +if (!ext4_fc_memcpy (inode->i_sb, dst, &tl,EXT4_FC_TAG_BASE_LEN , crc)) goto err; - dst +=sizeof (tl); + dst +=EXT4_FC_TAG_BASE_LEN ;if (!ext4_fc_memcpy (inode->i_sb, dst, &fc_inode,sizeof (fc_inode), crc)) goto err; dst +=sizeof (fc_inode);
@@ -2036,9 +2036,10 @@ static int ext4_fc_replay_scan(journal_t *journal, } state->fc_replay_expected_off++; -for (cur = start; cur < end; cur = cur +sizeof (tl) +le16_to_cpu (tl.fc_len)) { -memcpy (&tl, cur,sizeof (tl)); - val = cur +sizeof (tl); +for (cur = start; cur < end; + cur = cur +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)) { +memcpy (&tl, cur,EXT4_FC_TAG_BASE_LEN ); + val = cur +EXT4_FC_TAG_BASE_LEN ;ext4_debug ("Scan phase, tag:%s, blk %lld\n" ,tag2str (le16_to_cpu (tl.fc_tag)), bh->b_blocknr);switch (le16_to_cpu (tl.fc_tag)) {
@@ -2061,13 +2062,13 @@ static int ext4_fc_replay_scan(journal_t *journal,case EXT4_FC_TAG_PAD : state->fc_cur_tag++; state->fc_crc =ext4_chksum (sbi, state->fc_crc, cur, -sizeof (tl) +le16_to_cpu (tl.fc_len)); +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len));break ;case EXT4_FC_TAG_TAIL : state->fc_cur_tag++;memcpy (&tail, val,sizeof (tail)); state->fc_crc =ext4_chksum (sbi, state->fc_crc, cur, -sizeof (tl) + +EXT4_FC_TAG_BASE_LEN + offsetof(struct ext4_fc_tail , fc_crc)); if (le32_to_cpu(tail.fc_tid) == expected_tid &&
@@ -2094,7 +2095,7 @@ static int ext4_fc_replay_scan(journal_t *journal, } state->fc_cur_tag++; state->fc_crc =ext4_chksum (sbi, state->fc_crc, cur, -sizeof (tl) +le16_to_cpu (tl.fc_len)); +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len));break ;default : ret = state->fc_replay_num_tags ?
@@ -2149,9 +2150,10 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, start = (u8 *)bh->b_data; end = (__u8 *)bh->b_data + journal->j_blocksize -1 ; -for (cur = start; cur < end; cur = cur +sizeof (tl) +le16_to_cpu (tl.fc_len)) { -memcpy (&tl, cur,sizeof (tl)); - val = cur +sizeof (tl); +for (cur = start; cur < end; + cur = cur +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)) { +memcpy (&tl, cur,EXT4_FC_TAG_BASE_LEN ); + val = cur +EXT4_FC_TAG_BASE_LEN ;if (state->fc_replay_num_tags ==0 ) { ret =JBD2_FC_REPLAY_STOP ;
fs/ext4/fast_commit.h +3 -0
@@ -70,6 +70,9 @@ struct ext4_fc_tail {__le32 fc_crc; }; +/* Tag base length */ +#define EXT4_FC_TAG_BASE_LEN (sizeof(struct ext4_fc_tl)) +/* * Fast commit status codes */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/94 ext4: factor out ext4_fc_get_tl()
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit dcc5827484d6e53ccda12334f8bbfafcc593ceda ]
Factor out ext4_fc_get_tl() to fill 'tl' with host byte order.
Stable-dep-of: 1b45cc5c7b92 ("ext4: fix potential out of bound read in ext4_fc_replay_scan()")
--- fs/ext4/fast_commit.c | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
fs/ext4/fast_commit.c +25 -21
@@ -1346,7 +1346,7 @@ struct dentry_info_args { };static inline void tl_to_darg (struct dentry_info_args *darg, -struct ext4_fc_tl *tl,u8 *val) +struct ext4_fc_tl *tl,u8 *val) {struct ext4_fc_dentry_info fcd;
@@ -1355,8 +1355,14 @@ static inline void tl_to_darg(struct dentry_info_args *darg, darg->parent_ino =le32_to_cpu (fcd.fc_parent_ino); darg->ino =le32_to_cpu (fcd.fc_ino); darg->dname = val + offsetof(struct ext4_fc_dentry_info , fc_dname); - darg->dname_len =le16_to_cpu (tl->fc_len) - -sizeof (struct ext4_fc_dentry_info ); + darg->dname_len = tl->fc_len -sizeof (struct ext4_fc_dentry_info ); +} + +static inline void ext4_fc_get_tl (struct ext4_fc_tl *tl,u8 *val) +{ +memcpy (tl, val,EXT4_FC_TAG_BASE_LEN ); + tl->fc_len =le16_to_cpu (tl->fc_len); + tl->fc_tag =le16_to_cpu (tl->fc_tag); }/* Unlink replay function */
@@ -1521,7 +1527,7 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl,struct ext4_inode *raw_fc_inode;struct inode *inode =NULL ;struct ext4_iloc iloc; -int inode_len, ino, ret, tag =le16_to_cpu (tl->fc_tag); +int inode_len, ino, ret, tag = tl->fc_tag;struct ext4_extent_header *eh;memcpy (&fc_inode, val,sizeof (fc_inode));
@@ -1546,7 +1552,7 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl,if (ret) goto out; - inode_len =le16_to_cpu (tl->fc_len) -sizeof (struct ext4_fc_inode ); + inode_len = tl->fc_len -sizeof (struct ext4_fc_inode ); raw_inode =ext4_raw_inode (&iloc);memcpy (raw_inode, raw_fc_inode, offsetof(struct ext4_inode , i_block));
@@ -2037,12 +2043,12 @@ static int ext4_fc_replay_scan(journal_t *journal, state->fc_replay_expected_off++;for (cur = start; cur < end; - cur = cur +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)) { -memcpy (&tl, cur,EXT4_FC_TAG_BASE_LEN ); + cur = cur +EXT4_FC_TAG_BASE_LEN + tl.fc_len) { +ext4_fc_get_tl (&tl, cur); val = cur +EXT4_FC_TAG_BASE_LEN ;ext4_debug ("Scan phase, tag:%s, blk %lld\n" , -tag2str (le16_to_cpu (tl.fc_tag)), bh->b_blocknr); -switch (le16_to_cpu (tl.fc_tag)) { +tag2str (tl.fc_tag), bh->b_blocknr); +switch (tl.fc_tag) {case EXT4_FC_TAG_ADD_RANGE :memcpy (&ext, val,sizeof (ext)); ex = (struct ext4_extent *)&ext.fc_ex;
@@ -2062,7 +2068,7 @@ static int ext4_fc_replay_scan(journal_t *journal,case EXT4_FC_TAG_PAD : state->fc_cur_tag++; state->fc_crc =ext4_chksum (sbi, state->fc_crc, cur, -EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)); +EXT4_FC_TAG_BASE_LEN + tl.fc_len);break ;case EXT4_FC_TAG_TAIL : state->fc_cur_tag++;
@@ -2095,7 +2101,7 @@ static int ext4_fc_replay_scan(journal_t *journal, } state->fc_cur_tag++; state->fc_crc =ext4_chksum (sbi, state->fc_crc, cur, -EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)); +EXT4_FC_TAG_BASE_LEN + tl.fc_len);break ;default : ret = state->fc_replay_num_tags ?
@@ -2151,8 +2157,8 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, end = (__u8 *)bh->b_data + journal->j_blocksize -1 ;for (cur = start; cur < end; - cur = cur +EXT4_FC_TAG_BASE_LEN +le16_to_cpu (tl.fc_len)) { -memcpy (&tl, cur,EXT4_FC_TAG_BASE_LEN ); + cur = cur +EXT4_FC_TAG_BASE_LEN + tl.fc_len) { +ext4_fc_get_tl (&tl, cur); val = cur +EXT4_FC_TAG_BASE_LEN ;if (state->fc_replay_num_tags ==0 ) {
@@ -2160,10 +2166,9 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh,ext4_fc_set_bitmaps_and_counters (sb);break ; } -ext4_debug ("Replay phase, tag:%s\n" , -tag2str (le16_to_cpu (tl.fc_tag))); +ext4_debug ("Replay phase, tag:%s\n" ,tag2str (tl.fc_tag)); state->fc_replay_num_tags--; -switch (le16_to_cpu (tl.fc_tag)) { +switch (tl.fc_tag) {case EXT4_FC_TAG_LINK : ret =ext4_fc_replay_link (sb, &tl, val);break ;
@@ -2184,19 +2189,18 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh,break ;case EXT4_FC_TAG_PAD :trace_ext4_fc_replay (sb,EXT4_FC_TAG_PAD ,0 , -le16_to_cpu (tl.fc_len),0 ); + tl.fc_len,0 );break ;case EXT4_FC_TAG_TAIL : -trace_ext4_fc_replay (sb,EXT4_FC_TAG_TAIL ,0 , -le16_to_cpu (tl.fc_len),0 ); +trace_ext4_fc_replay (sb,EXT4_FC_TAG_TAIL , +0 , tl.fc_len,0 );memcpy (&tail, val,sizeof (tail));WARN_ON (le32_to_cpu (tail.fc_tid) != expected_tid);break ;case EXT4_FC_TAG_HEAD :break ;default : -trace_ext4_fc_replay (sb,le16_to_cpu (tl.fc_tag),0 , -le16_to_cpu (tl.fc_len),0 ); +trace_ext4_fc_replay (sb, tl.fc_tag,0 , tl.fc_len,0 ); ret = -ECANCELED ;break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH v3 93/94 ACPI: video: Force backlight native for more TongFang devices
In reply to Greg Kroah-HartmanFrom: Werner Sembach <[email protected]>
commit 3dbc80a3e4c55c4a5b89ef207bed7b7de36157b4 upstream.
This commit is very different from the upstream commit! It fixes the same issue by adding more quirks, rather then the general fix from the 6.1 kernel, because the general fix from the 6.1 kernel is part of a larger refactoring of the backlight code which is not suitable for the stable series.
As described in "ACPI: video: Drop NL5x?U, PF4NU1F and PF5?U?? acpi_backlight=native quirks" (10212754a0d2) the upstream commit "ACPI:
video: Make backlight class device registration a separate step (v2)" (3dbc80a3e4c5) makes these quirks unnecessary. However as mentioned in this bugtracker ticket https://bugzilla.kernel.org/show_bug.cgi?id=215683#c17
the upstream fix is part of a larger patchset that is overall too complex for stable.
The TongFang GKxNRxx, GMxNGxx, GMxZGxx, and GMxRGxx / TUXEDO Stellaris/Polaris Gen 1-4, have the same problem as the Clevo NL5xRU and NL5xNU / TUXEDO Aura 15 Gen1 and Gen2:
They have a working native and video interface for screen backlight. However the default detection mechanism first registers the video interface before unregistering it again and switching to the native interface during boot. This results in a dangling SBIOS request for backlight change for some reason, causing the backlight to switch to ~2% once per boot on the first power cord connect or disconnect event. Setting the native interface explicitly circumvents this buggy behaviour by avoiding the unregistering process.
--- drivers/acpi/video_detect.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
drivers/acpi/video_detect.c +64 -0
@@ -515,6 +515,70 @@ static const struct dmi_system_id video_ }, },/* +* More Tongfang devices with the same issue as the Clevo NL5xRU and +* NL5xNU/TUXEDO Aura 15 Gen1 and Gen2. See the description above. +*/ + { + .callback = video_detect_force_native, + .ident = "TongFang GKxNRxx", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GKxNRxx"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GKxNRxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_MATCH(DMI_BOARD_NAME, "POLARIS1501A1650TI"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GKxNRxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_MATCH(DMI_BOARD_NAME, "POLARIS1501A2060"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GKxNRxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_MATCH(DMI_BOARD_NAME, "POLARIS1701A1650TI"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GKxNRxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_MATCH(DMI_BOARD_NAME, "POLARIS1701A2060"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GMxNGxx", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxNGxx"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GMxZGxx", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxZGxx"), + }, + }, + { + .callback = video_detect_force_native, + .ident = "TongFang GMxRGxx", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"), + }, + }, + /* * Desktops which falsely report a backlight and which our heuristics * for this do not catch. */
Greg Kroah-Hartman
maintainerPATCH 92/94 ext4: fix potential out of bound read in ext4_fc_replay_scan()
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit 1b45cc5c7b920fd8bf72e5a888ec7abeadf41e09 ]
For scan loop must ensure that at least EXT4_FC_TAG_BASE_LEN space. If remain space less than EXT4_FC_TAG_BASE_LEN which will lead to out of bound read when mounting corrupt file system image.
ADD_RANGE/HEAD/TAIL is needed to add extra check when do journal scan, as this three tags will read data during scan, tag length couldn't less than data length which will read.
--- fs/ext4/fast_commit.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
fs/ext4/fast_commit.c +36 -2
@@ -1986,6 +1986,34 @@ void ext4_fc_replay_cleanup(struct super_block *sb)kfree (sbi->s_fc_replay_state.fc_modified_inodes); } +static inline bool ext4_fc_tag_len_isvalid (struct ext4_fc_tl *tl, +u8 *val,u8 *end) +{ +if (val + tl->fc_len > end) +return false; + +/* Here only check ADD_RANGE/TAIL/HEAD which will read data when do +* journal rescan before do CRC check. Other tags length check will +* rely on CRC check. +*/ +switch (tl->fc_tag) { +case EXT4_FC_TAG_ADD_RANGE : +return (sizeof (struct ext4_fc_add_range ) == tl->fc_len); +case EXT4_FC_TAG_TAIL : +return (sizeof (struct ext4_fc_tail ) <= tl->fc_len); +case EXT4_FC_TAG_HEAD : +return (sizeof (struct ext4_fc_head ) == tl->fc_len); +case EXT4_FC_TAG_DEL_RANGE : +case EXT4_FC_TAG_LINK : +case EXT4_FC_TAG_UNLINK : +case EXT4_FC_TAG_CREAT : +case EXT4_FC_TAG_INODE : +case EXT4_FC_TAG_PAD : +default : +return true; + } +} +/* * Recovery Scan phase handler *
@@ -2042,10 +2070,15 @@ static int ext4_fc_replay_scan(journal_t *journal, } state->fc_replay_expected_off++; -for (cur = start; cur < end; +for (cur = start; cur < end -EXT4_FC_TAG_BASE_LEN ; cur = cur +EXT4_FC_TAG_BASE_LEN + tl.fc_len) {ext4_fc_get_tl (&tl, cur); val = cur +EXT4_FC_TAG_BASE_LEN ; +if (!ext4_fc_tag_len_isvalid (&tl, val, end)) { + ret = state->fc_replay_num_tags ? +JBD2_FC_REPLAY_STOP : -ECANCELED ; + goto out_err; + }ext4_debug ("Scan phase, tag:%s, blk %lld\n" ,tag2str (tl.fc_tag), bh->b_blocknr);switch (tl.fc_tag) {
@@ -2156,7 +2189,7 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, start = (u8 *)bh->b_data; end = (__u8 *)bh->b_data + journal->j_blocksize -1 ; -for (cur = start; cur < end; +for (cur = start; cur < end -EXT4_FC_TAG_BASE_LEN ; cur = cur +EXT4_FC_TAG_BASE_LEN + tl.fc_len) {ext4_fc_get_tl (&tl, cur); val = cur +EXT4_FC_TAG_BASE_LEN ;
@@ -2166,6 +2199,7 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh,ext4_fc_set_bitmaps_and_counters (sb);break ; } +ext4_debug ("Replay phase, tag:%s\n" ,tag2str (tl.fc_tag)); state->fc_replay_num_tags--;switch (tl.fc_tag) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/94 mm: /proc/pid/smaps_rollup: fix no vmas null-deref
In reply to Greg Kroah-HartmanFrom: Seth Jenkins <[email protected]>
Commit 258f669e7e88 ("mm: /proc/pid/smaps_rollup: convert to single value seq_file") introduced a null-deref if there are no vma's in the task in show_smaps_rollup.
--- fs/proc/task_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/proc/task_mmu.c +1 -1
@@ -969,7 +969,7 @@ static int show_smaps_rollup(struct seq_ vma = vma->vm_next; } -show_vma_header_prefix (m, priv->mm->mmap->vm_start, +show_vma_header_prefix (m, priv->mm->mmap ? priv->mm->mmap->vm_start :0 , last_vma_end,0 ,0 ,0 ,0 );seq_pad (m,' ' );seq_puts (m,"[rollup]\n" );
Greg Kroah-Hartman
maintainerQuoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Sat, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.
A process change for those who care.
Previously, all of the -rc patches have been sent to [email protected]. That turns out to be a lovely way to stress-test email servers both on the sending, and receiving side.
The vger postmasters have done a valiant job in fixing up all sorts of crazy issues that this has caused over the years, moving jobs to different machines, moving some reciever domains to separate queues or machines, and trying to debug loony gmail server issues. They have, and continue to, do a wonderful job at all of this.
But the stable patch bombs were causing problems, no matter what. To help try to aliviate the overally mail load on the main linux-kernel list, I am now NOT sending all of the patches to lkml, only the -rc announcements.
If you want to see all of the patches, they will all be cc:ed to the [email protected] list, and they should all show up almost instantly on lore.kernel.org as they are getting sent also to the patches@lists address as well.
So this should provide a bit of breathing room on the main linux-kernel mailqueue for a while. And if you do want to see the full set of patches, either use lore and the assorted tools that can easily get emails out of it, or subscribe to the stable@vger mailing list.
thanks,
greg "I had a spam assassin rule named after me" k-h
Works on my Arch Linux Server with Intel(R) Core(TM) i5-6400 CPU @ 2.70GHz
Tested by: Luna Jernberg <[email protected]>
Quoted 443 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.0.6-rc1Seth Jenkins <[email protected]>
mm:/proc/pid/smaps_rollup: fix no vma's null-derefWerner Sembach <[email protected]>
ACPI: video: Force backlight native for more TongFang devicesYe Bin <[email protected]>
ext4: fix potential out of bound read inext4_fc_replay_scan()Ye Bin <[email protected]>
ext4: factor outext4_fc_get_tl()Ye Bin <[email protected]>
ext4: introduceEXT4_FC_TAG_BASE_LENhelperJens Axboe <[email protected]>
io_uring: don't gatetask_workrun onTIF_NOTIFY_SIGNALDeren Wu <[email protected]>
wifi: mt76: mt7921e: fix random fw download failJerry Snitselaar <[email protected]>
iommu/vt-d: Clean upsi_domainin theinit_dmars()error pathCharlotte Tan <[email protected]>
iommu/vt-d: Allow NVS regions inarch_rmrr_sanity_check()Daniel Bristot de Oliveira <[email protected]>
rv/dot2c: Make automaton definition staticChristoph Böhmwalder <[email protected]>
drbd: only clone bio if we have a backing deviceFelix Riemann <[email protected]>
net: phy: dp83822: disable MDI crossover status change interruptEric Dumazet <[email protected]>
net: sched: fix race condition inqdisc_graft()Yang Yingliang <[email protected]>
net: hns: fix possible memory leak inhnae_ae_register()Yang Yingliang <[email protected]>
wwan_hwsim: fix possible memory leak inwwan_hwsim_dev_new()Pieter Jansen van Vuuren <[email protected]>
sfc: includevport_idin filter spec hash andequal()Harshit Mogalapalli <[email protected]>
io_uring/msg_ring: Fix NULL pointer dereference inio_msg_send_fd()Paul Blakey <[email protected]>
net: Fix return value of qdisc ingress handling on successZhengchao Shao <[email protected]>
net: sched: sfb: fix null pointer access issue whensfb_init()failsZhengchao Shao <[email protected]>
net: sched: delete duplicate cleanup of backlog and qlenZhengchao Shao <[email protected]>
net: sched: cake: fix null pointer access issue whencake_init()failsSagi Grimberg <[email protected]>
nvmet: fix workqueueMEM_RECLAIMflushing dependencySerge Semin <[email protected]>
nvme-hwmon: kmalloc the NVME SMART log bufferChristoph Hellwig <[email protected]>
nvme-hwmon: consistently ignore errors fromnvme_hwmon_initPablo Neira Ayuso <[email protected]>
netfilter:nf_tables: relaxNFTA_SET_ELEM_KEY_ENDset flags requirementsGuillaume Nault <[email protected]>
netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.Phil Sutter <[email protected]>
netfilter: rpfilter/fib: Populateflowic_l3mdevfieldBrett Creeley <[email protected]>
ionic: catch NULL pointer issue on reconfigEric Dumazet <[email protected]>
net: hsr: avoid possible NULL deref inskb_clone()Vikas Gupta <[email protected]>
bnxt_en: fix memory leak inbnxt_nvm_test()Guenter Roeck <[email protected]>
drm/amd/display: Increase frame size limit for display_mode_vba_util_32.oGenjian Zhang <[email protected]>
dm: remove unnecessary assignment statement inalloc_dev()Zhang Xiaoxu <[email protected]>
cifs: Fix memory leak when build ntlmssp negotiate blob failedZhang Xiaoxu <[email protected]>
cifs: Fix xid leak incifs_ses_add_channel()Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak incifs_flock()Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak incifs_copy_file_range()Zhang Xiaoxu <[email protected]>
cifs: Fix xid leak incifs_create()Zhengchao Shao <[email protected]>
ip6mr: fix UAF issue inip6mr_sk_done()whenaddrconf_init_net()failedKuniyuki Iwashima <[email protected]>
udp: Update reuse->has_conns under reuseport_lock.Rafael Mendonca <[email protected]>
scsi: lpfc: Fix memory leak inlpfc_create_port()Yang Yingliang <[email protected]>
net: ethernet:mtk_eth_wed: add missingof_node_put()Yang Yingliang <[email protected]>
net: ethernet:mtk_eth_wed: add missingput_device()inmtk_wed_add_hw()Yang Yingliang <[email protected]>
net: ethernet:mtk_eth_soc: fix possible memory leak inmtk_probe()Jens Axboe <[email protected]>
io_uring/rw: remove leftover debug statementYu Kuai <[email protected]>
blk-mq: fix null pointer dereference inblk_mq_clear_rq_mapping()Gao Xiang <[email protected]>
erofs: shouldn't churn the mapping page for duplicated copiesEric Dumazet <[email protected]>
skmsg: pass gfp argument toalloc_sk_msg()Shenwei Wang <[email protected]>
net: stmmac: Enablemac_managed_pmphylink configShenwei Wang <[email protected]>
net: phylink: addmac_managed_pminphylink_configstructureDan Carpenter <[email protected]>
net/smc: Fix an error code insmc_lgr_create()Harini Katakam <[email protected]>
net: phy: dp83867: Extend RX strap quirk for SGMII modeXiaobo Liu <[email protected]>
net/atm: fixproc_mpc_writeincorrect return valueJonathan Cooper <[email protected]>
sfc: Change VF mac via PF as first preference if available.José Expósito <[email protected]>
HID: magicmouse: Do not setBTN_MOUSEon double reportJakub Kicinski <[email protected]>
tls: strp: make sure the TCP skbs do not have overlapping dataJan Sokolowski <[email protected]>
i40e: Fix DMA mappings leakChristian Marangi <[email protected]>
net: dsa: qca8k: fix ethtool autocast mib for big-endian systemsChristian Marangi <[email protected]>
net: dsa: qca8k: fix inband mgmt for big-endian systemsAlexander Potapenko <[email protected]>
tipc: fix an information leak intipc_topsrv_kern_subscrMark Tomlinson <[email protected]>
tipc: Fix recognition of trial periodTony Luck <[email protected]>
ACPI: extlog: Handle multiple recordsMaxime Ripard <[email protected]>
drm/vc4: hdmi: Enforce the minimum rate atruntime_resumeMaxime Ripard <[email protected]>
drm/vc4: Add module dependency on hdmi-codecFilipe Manana <[email protected]>
btrfs: fix processing of delayed tree block refs during backref walkingFilipe Manana <[email protected]>
btrfs: fix processing of delayed data refs during backref walkingMikulas Patocka <[email protected]>
dm bufio: use the acquire memory barrier when testing forB_READINGMario Limonciello <[email protected]>
platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systemsZhang Rui <[email protected]>
x86/topology: Fix duplicated core ID within a packageZhang Rui <[email protected]>
x86/topology: Fix multiple packages shown on a single-package systemNathan Chancellor <[email protected]>
x86/Kconfig: Drop check for -mabi=ms forCONFIG_EFI_STUBBryan O'Donoghue <[email protected]>
media: venus: Fix NV12 decoder buffer discovery onHFI_VERSION_1XXBryan O'Donoghue <[email protected]>
media: venus: dec: Handle the case wherefind_formatfailsSean Young <[email protected]>
media: mceusb: set timeout to at least timeout providedSakari Ailus <[email protected]>
media: ipu3-imgu: Fix NULL pointer dereference in active selection accessEric Ren <[email protected]>
KVM: arm64: vgic: Fix exit condition inscan_its_table()Alexander Graf <[email protected]>
KVM: x86: Add compat handler forKVM_X86_SET_MSR_FILTERAlexander Graf <[email protected]>
KVM: x86: Copy filter arg outsidekvm_vm_ioctl_set_msr_filter()Alexander Graf <[email protected]>
kvm: Add support for arch compat vm ioctlsRik van Riel <[email protected]>
mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pagesAlex Deucher <[email protected]>
drm/amdgpu: fix sdma doorbell init ordering on APUsFabien Parent <[email protected]>
cpufreq: qcom: fix memory leak in error pathBabu Moger <[email protected]>
x86/resctrl: Fixmin_cbm_bitsfor AMDKai-Heng Feng <[email protected]>
ata: ahci: MatchEM_MAX_SLOTSwithSATA_PMP_MAX_PORTSAlexander Stein <[email protected]>
ata: ahci-imx: FixMODULE_ALIASZhang Rui <[email protected]>
hwmon/coretemp: Handle large core ID valueBorislav Petkov <[email protected]>
x86/microcode/AMD: Apply the patch early on every logical threadJon Hunter <[email protected]>
cpufreq: tegra194: Fix module loadingBryan O'Donoghue <[email protected]>
i2c: qcom-cci: Fix ordering ofpm_runtime_xxandi2c_add_adapterFabien Parent <[email protected]>
cpufreq: qcom: fix writes in read-only memory regionGONG, Ruiqi <[email protected]>
selinux: enable use of bothGFP_KERNELandGFP_ATOMICinconvert_context()Steve French <[email protected]>
smb3: interface count displayed incorrectlyJoseph Qi <[email protected]>
ocfs2: fix BUG when iput afterocfs2_mknodfailsJoseph Qi <[email protected]>
ocfs2: clear dinode links count in case of errorThomas Zimmermann <[email protected]>
video/aperture: Callsysfb_disable()before removing PCI devices-------------
Diffstat:
Makefile | 4 +- arch/arm64/kvm/vgic/vgic-its.c | 5 +- arch/x86/Kconfig | 1 - arch/x86/include/asm/iommu.h | 4 +- arch/x86/kernel/cpu/microcode/amd.c | 16 ++- arch/x86/kernel/cpu/resctrl/core.c | 8 +- arch/x86/kernel/cpu/topology.c | 16 ++- arch/x86/kvm/x86.c | 87 ++++++++++++--- block/blk-mq.c | 7 +- drivers/acpi/acpi_extlog.c | 33 +++--- drivers/acpi/video_detect.c | 64 +++++++++++ drivers/ata/ahci.h | 2 +- drivers/ata/ahci_imx.c | 2 +- drivers/block/drbd/drbd_req.c | 14 +-- drivers/cpufreq/qcom-cpufreq-nvmem.c | 10 +- drivers/cpufreq/tegra194-cpufreq.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 - drivers/gpu/drm/amd/amdgpu/soc15.c | 21 ++++ drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++ drivers/hid/hid-magicmouse.c | 2 +- drivers/hwmon/coretemp.c | 56 +++++++--- drivers/i2c/busses/i2c-qcom-cci.c | 13 ++- drivers/iommu/intel/iommu.c | 5 + drivers/md/dm-bufio.c | 13 ++- drivers/md/dm.c | 1 - drivers/media/platform/qcom/venus/helpers.c | 13 ++- drivers/media/platform/qcom/venus/vdec.c | 2 + drivers/media/rc/mceusb.c | 2 +- drivers/net/dsa/qca/qca8k-8xxx.c | 83 +++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 - drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 +++++++++-- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++- drivers/net/ethernet/mediatek/mtk_wed.c | 15 ++- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +- drivers/net/ethernet/sfc/ef10.c | 58 ++++------ drivers/net/ethernet/sfc/filter.h | 4 +- drivers/net/ethernet/sfc/rx_common.c | 10 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + drivers/net/phy/dp83822.c | 3 +- drivers/net/phy/dp83867.c | 8 ++ drivers/net/phy/phylink.c | 3 + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 1 + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 2 + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 + drivers/net/wwan/wwan_hwsim.c | 2 +- drivers/nvme/host/core.c | 6 +- drivers/nvme/host/hwmon.c | 32 ++++-- drivers/nvme/target/core.c | 2 +- drivers/platform/x86/amd/pmc.c | 7 ++ drivers/scsi/lpfc/lpfc_init.c | 7 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 31 +++--- drivers/video/aperture.c | 11 ++ fs/btrfs/backref.c | 46 +++++--- fs/cifs/cifsfs.c | 7 +- fs/cifs/dir.c | 6 +- fs/cifs/file.c | 11 +- fs/cifs/sess.c | 1 + fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 2 +- fs/erofs/zdata.c | 8 +- fs/erofs/zdata.h | 6 +- fs/ext4/fast_commit.c | 122 ++++++++++++++------- fs/ext4/fast_commit.h | 3 + fs/ocfs2/namei.c | 23 ++-- fs/proc/task_mmu.c | 2 +- include/linux/dsa/tag_qca.h | 8 +- include/linux/kvm_host.h | 2 + include/linux/phylink.h | 2 + include/net/sch_generic.h | 1 - include/net/sock_reuseport.h | 11 +- io_uring/io_uring.h | 10 +- io_uring/msg_ring.c | 3 + io_uring/rw.c | 2 - mm/hugetlb.c | 2 +- net/atm/mpoa_proc.c | 3 +- net/core/dev.c | 4 + net/core/skmsg.c | 8 +- net/core/sock_reuseport.c | 16 +++ net/hsr/hsr_forward.c | 12 +- net/ipv4/datagram.c | 2 +- net/ipv4/netfilter/ipt_rpfilter.c | 3 +- net/ipv4/netfilter/nft_fib_ipv4.c | 3 +- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 2 + net/ipv6/datagram.c | 2 +- net/ipv6/netfilter/ip6t_rpfilter.c | 10 +- net/ipv6/netfilter/nft_fib_ipv6.c | 7 +- net/ipv6/udp.c | 2 +- net/netfilter/nf_tables_api.c | 5 +- net/sched/sch_api.c | 5 +- net/sched/sch_atm.c | 1 - net/sched/sch_cake.c | 4 + net/sched/sch_cbq.c | 1 - net/sched/sch_choke.c | 2 - net/sched/sch_drr.c | 2 - net/sched/sch_dsmark.c | 2 - net/sched/sch_etf.c | 3 - net/sched/sch_ets.c | 2 - net/sched/sch_fq_codel.c | 2 - net/sched/sch_fq_pie.c | 3 - net/sched/sch_hfsc.c | 2 - net/sched/sch_htb.c | 2 - net/sched/sch_multiq.c | 1 - net/sched/sch_prio.c | 2 - net/sched/sch_qfq.c | 2 - net/sched/sch_red.c | 2 - net/sched/sch_sfb.c | 5 +- net/sched/sch_skbprio.c | 3 - net/sched/sch_taprio.c | 2 - net/sched/sch_tbf.c | 2 - net/sched/sch_teql.c | 1 - net/smc/smc_core.c | 3 +- net/tipc/discover.c | 2 +- net/tipc/topsrv.c | 2 +- net/tls/tls_strp.c | 32 +++++- security/selinux/ss/services.c | 5 +- security/selinux/ss/sidtab.c | 4 +- security/selinux/ss/sidtab.h | 2 +- tools/verification/dot2/dot2c.py | 2 +- virt/kvm/kvm_main.c | 11 ++ 128 files changed, 888 insertions(+), 441 deletions(-)
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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.
Looking good on various x86-64 machines (desktop, server) and my Zen2 Thinkpad. Btrfs still works, too. :)
cheers,
Holger
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, armv7, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.1.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.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.
## Build
* kernel: 6.0.6-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.0.y
* git commit: 3df0520c3ce6fb59d1574a59eae038e2759cedb1
* git describe: v6.0.5-95-g3df0520c3ce6
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.5-95-g3df0520c3ce6
## No Test Regressions (compared to v6.0.3-22-gd4150c7b49be)
## No Metric Regressions (compared to v6.0.3-22-gd4150c7b49be)
## No Test Fixes (compared to v6.0.3-22-gd4150c7b49be)
## No Metric Fixes (compared to v6.0.3-22-gd4150c7b49be)
## Test result summary
total: 154977, pass: 131532, fail: 4887, skip: 18064, xfail: 494
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 148 total, 145 passed, 3 failed
* arm64: 47 total, 47 passed, 0 failed
* i386: 37 total, 36 passed, 1 failed
* mips: 27 total, 26 passed, 1 failed
* parisc: 6 total, 6 passed, 0 failed
* powerpc: 34 total, 30 passed, 4 failed
* riscv: 12 total, 12 passed, 0 failed
* s390: 12 total, 12 passed, 0 failed
* sh: 12 total, 12 passed, 0 failed
* sparc: 6 total, 6 passed, 0 failed
* x86_64: 40 total, 40 passed, 0 failed
## Test suites summary
* fwts
* kselftest-android
* kselftest-arm64
* kselftest-arm64/arm64.btitest.bti_c_func
* kselftest-arm64/arm64.btitest.bti_j_func
* kselftest-arm64/arm64.btitest.bti_jc_func
* kselftest-arm64/arm64.btitest.bti_none_func
* kselftest-arm64/arm64.btitest.nohint_func
* kselftest-arm64/arm64.btitest.paciasp_func
* kselftest-arm64/arm64.nobtitest.bti_c_func
* kselftest-arm64/arm64.nobtitest.bti_j_func
* kselftest-arm64/arm64.nobtitest.bti_jc_func
* kselftest-arm64/arm64.nobtitest.bti_none_func
* kselftest-arm64/arm64.nobtitest.nohint_func
* kselftest-arm64/arm64.nobtitest.paciasp_func
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-at
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-math++
* ltp-mm
* ltp-nptl
* ltp-nptl++
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracin[
* ltp-tracing
* network-basic-tests
* packetdrill
* perf
* perf/Zstd-perf.data-compression
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. Anything received after that time might be too late.
Hi Greg,
6.0.6-rc1 tested.
Run tested on:
- Intel Alder Lake x86_64 (nuc12 i7-1260P)
In addition - build tested for:
- Allwinner A64
- Allwinner H3
- Allwinner H5
- Allwinner H6
- NXP iMX6
- NXP iMX8
- Qualcomm Dragonboard
- Rockchip RK3288
- Rockchip RK3328
- Rockchip RK3399pro
- Samsung Exynos5422
--
Rudi
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. Anything received after that time might be too late.
Build test (gcc version 12.2.1 20221016):
mips: 52 configs -> no failure
arm: 100 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure alpha allmodconfig -> no failure csky allmodconfig -> no failure powerpc allmodconfig -> no failure riscv allmodconfig -> no failure s390 allmodconfig -> no failure xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
[1]. https://openqa.qa.codethink.co.uk/tests/2049
[2]. https://openqa.qa.codethink.co.uk/tests/2056
Signature · 2 lines
Regards Sudip
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
No new regressions for Tegra ...
Test results for stable-v6.0:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
130 tests: 129 pass, 1 failLinux version: 6.0.6-rc1-g3df0520c3ce6
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000: boot.py
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. 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/v6.x/stable-review/patch-6.0.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.6 release. There are 94 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, 29 Oct 2022 16:50:35 +0000. Anything received after that time might be too late.
Build results:
total: 152 pass: 152 fail: 0 Qemu test results: total: 500 pass: 500 fail: 0
Guenter