August 2023 - Linux-stable-mirror

[PATCH v2] vhost: Allow null msg.size on VHOST_IOTLB_INVALIDATE

by Eric Auger

Commit e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries") Forbade vhost iotlb msg with null size to prevent entries with size = start = 0 and last = ULONG_MAX to end up in the iotlb. Then commit 95932ab2ea07 ("vhost: allow batching hint without size") only applied the check for VHOST_IOTLB_UPDATE and VHOST_IOTLB_INVALIDATE message types to fix a regression observed with batching hit. Still, the introduction of that check introduced a regression for some users attempting to invalidate the whole ULONG_MAX range by setting the size to 0. This is the case with qemu/smmuv3/vhost integration which does not work anymore. It Looks safe to partially revert the original commit and allow VHOST_IOTLB_INVALIDATE messages with null size. vhost_iotlb_del_range() will compute a correct end iova. Same for vhost_vdpa_iotlb_unmap(). Signed-off-by: Eric Auger <eric.auger(a)redhat.com> Fixes: e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries") Cc: stable(a)vger.kernel.org # v5.17+ Acked-by: Jason Wang <jasowang(a)redhat.com> --- v1 -> v2: - Added Cc stable and Jason's Acked-by --- drivers/vhost/vhost.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c71d573f1c94..e0c181ad17e3 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1458,9 +1458,7 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev, goto done; } - if ((msg.type == VHOST_IOTLB_UPDATE || - msg.type == VHOST_IOTLB_INVALIDATE) && - msg.size == 0) { + if (msg.type == VHOST_IOTLB_UPDATE && msg.size == 0) { ret = -EINVAL; goto done; } -- 2.41.0

8 months, 1 week

1
1
0 0

[PATCH v2 1/2] maple_tree: Disable mas_wr_append() when other readers are possible

by Liam R. Howlett

The current implementation of append may cause duplicate data and/or incorrect ranges to be returned to a reader during an update. Although this has not been reported or seen, disable the append write operation while the tree is in rcu mode out of an abundance of caution. During the analysis of the mas_next_slot() the following was artificially created by separating the writer and reader code: Writer: reader: mas_wr_append set end pivot updates end metata Detects write to last slot last slot write is to start of slot store current contents in slot overwrite old end pivot mas_next_slot(): read end metadata read old end pivot return with incorrect range store new value Alternatively: Writer: reader: mas_wr_append set end pivot updates end metata Detects write to last slot last lost write to end of slot store value mas_next_slot(): read end metadata read old end pivot read new end pivot return with incorrect range set old end pivot There may be other accesses that are not safe since we are now updating both metadata and pointers, so disabling append if there could be rcu readers is the safest action. Fixes: 54a611b60590 ("Maple Tree: add new data structure") Cc: stable(a)vger.kernel.org Signed-off-by: Liam R. Howlett <Liam.Howlett(a)oracle.com> --- lib/maple_tree.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index ffb9d15bd815..05d5db255c39 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4107,6 +4107,10 @@ static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas) * mas_wr_append: Attempt to append * @wr_mas: the maple write state * + * This is currently unsafe in rcu mode since the end of the node may be cached + * by readers while the node contents may be updated which could result in + * inaccurate information. + * * Return: True if appended, false otherwise */ static inline bool mas_wr_append(struct ma_wr_state *wr_mas, @@ -4116,6 +4120,9 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas, struct ma_state *mas = wr_mas->mas; unsigned char node_pivots = mt_pivots[wr_mas->type]; + if (mt_in_rcu(mas->tree)) + return false; + if (mas->offset != wr_mas->node_end) return false; -- 2.39.2

8 months, 1 week

10
42
0 0

[PATCH 5.15 000/107] 5.15.118-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.118 release. There are 107 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 21 Jun 2023 10:21:12 +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/v5.x/stable-review/patch-5.15.118-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.118-rc1 Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: reject devices with insufficient block count Christian Loehle <CLoehle(a)hyperstone.com> mmc: block: ensure error propagation for non-blk Frank Rowand <frank.rowand(a)sony.com> of: overlay: add entry to of_overlay_action_name[] Leon Romanovsky <leon(a)kernel.org> neighbour: delete neigh_lookup_nodev as not used Guillaume Nault <gnault(a)redhat.com> net: Remove DECnet leftovers from flow.h. Gaosheng Cui <cuigaosheng1(a)huawei.com> net: Remove unused inline function dst_hold_and_use() Gaosheng Cui <cuigaosheng1(a)huawei.com> neighbour: Remove unused inline function neigh_key_eq16() Ziwei Dai <ziwei.dai(a)unisoc.com> rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period John Sperbeck <jsperbeck(a)google.com> cgroup: always put cset in cgroup_css_set_put_fork David Howells <dhowells(a)redhat.com> afs: Fix vlserver probe RTT handling Alex Maftei <alex.maftei(a)amd.com> selftests/ptp: Fix timestamp printf format for PTP_SYS_OFFSET Lin Ma <linma(a)zju.edu.cn> net: tipc: resize nlattr array to correct size Li Lingfeng <lilingfeng3(a)huawei.com> dm: don't lock fs when the map is NULL during suspend or resume Eric Dumazet <edumazet(a)google.com> net: lapbether: only support ethernet devices Vlad Buslov <vladbu(a)nvidia.com> net/sched: cls_api: Fix lockup on flushing explicitly created chain Fabio M. De Francesco <fmdefrancesco(a)gmail.com> ext4: drop the call to ext4_error() from ext4_get_group_info() Steve French <stfrench(a)microsoft.com> cifs: fix lease break oops in xfstest generic/098 Natalia Petrova <n.petrova(a)fintech.ru> drm/nouveau: add nv_encoder pointer check for NULL Natalia Petrova <n.petrova(a)fintech.ru> drm/nouveau/dp: check for NULL nv_connector->native_mode Ratchanan Srirattanamet <peathot(a)hotmail.com> drm/nouveau: don't detect DSM for non-NVIDIA device Aleksandr Loktionov <aleksandr.loktionov(a)intel.com> igb: fix nvm.ops.read() error handling Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli(a)intel.com> igc: Clean the TX buffer and TX descriptor ring Dan Carpenter <dan.carpenter(a)linaro.org> sctp: fix an error code in sctp_sf_eat_auth() Hangbin Liu <liuhangbin(a)gmail.com> ipvlan: fix bound dev checking for IPv6 l3s mode Jakub Kicinski <kuba(a)kernel.org> net: ethtool: correct MAX attribute value for stats Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> IB/isert: Fix incorrect release of isert connection Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> IB/isert: Fix possible list corruption in CMA handler Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> IB/isert: Fix dead lock in ib_isert Yishai Hadas <yishaih(a)nvidia.com> IB/uverbs: Fix to consider event queue closing also upon non-blocking mode Mark Zhang <markzhang(a)nvidia.com> RDMA/cma: Always set static rate to 0 for RoCE Maher Sanalla <msanalla(a)nvidia.com> RDMA/mlx5: Initiate dropless RQ for RAW Ethernet functions Nithin Dabilpuram <ndabilpuram(a)marvell.com> octeontx2-af: fix lbk link credits on cn10k Satha Rao <skoteshwar(a)marvell.com> octeontx2-af: fixed resource availability check Ahmed Zaki <ahmed.zaki(a)intel.com> iavf: remove mask from iavf_irq_enable_queues() Zhu Yanjun <yanjun.zhu(a)linux.dev> RDMA/rxe: Fix the use-before-initialization error of resp_pkts Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Removed unused name from rxe_task struct Zhu Yanjun <yanjun.zhu(a)linux.dev> RDMA/rxe: Remove the unused variable obj Lee Jones <lee(a)kernel.org> net/sched: cls_u32: Fix reference counter leak leading to overflow Max Tottenham <mtottenh(a)akamai.com> net/sched: act_pedit: Parse L3 Header for L4 offset Pedro Tammela <pctammela(a)mojatatu.com> net/sched: act_pedit: remove extra check for key type Pedro Tammela <pctammela(a)mojatatu.com> net/sched: simplify tcf_pedit_act Guillaume Nault <gnault(a)redhat.com> ping6: Fix send to link-local addresses with VRF. Wei Fang <wei.fang(a)nxp.com> net: enetc: correct the indexes of highest and 2nd highest TCs Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: integrate pipapo into commit protocol Vladimir Oltean <vladimir.oltean(a)nxp.com> spi: fsl-dspi: avoid SCK glitches with continuous transfers Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Fix packet length checks Li Zhijian <lizhijian(a)fujitsu.com> RDMA/rtrs: Fix rxe_dealloc_pd warning Li Zhijian <lizhijian(a)fujitsu.com> RDMA/rtrs: Fix the last iu->buf leak in err path Elson Roy Serrao <quic_eserrao(a)quicinc.com> usb: dwc3: gadget: Reset num TRBs before giving back the request Bernhard Seibold <mail(a)bernhard-seibold.de> serial: lantiq: add missing interrupt ack Jerry Meng <jerry-meng(a)foxmail.com> USB: serial: option: add Quectel EM061KGL series Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Mask ring interrupt on Intel hardware as well Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: dma_test: Use correct value for absent rings when creating paths Stephen Hemminger <stephen(a)networkplumber.org> Remove DECnet support from kernel Edson Juliano Drosdeck <edson.drosdeck(a)gmail.com> ALSA: hda/realtek: Add a quirk for Compaq N14JP6 Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: add missing radeon secondary PCI ID Hersen Wu <hersenxs.wu(a)amd.com> drm/amd/display: edp do not add non-edid timings Wes Huang <wes.huang(a)moxa.com> net: usb: qmi_wwan: add support for Compal RXM-G1 Edward Srouji <edwards(a)nvidia.com> RDMA/uverbs: Restrict usage of privileged QKEYs Dave Airlie <airlied(a)redhat.com> nouveau: fix client work fence deletion race Li Lingfeng <lilingfeng3(a)huawei.com> dm thin metadata: check fail_io before using data_sm Lukasz Tyl <ltyl(a)hem-e.com> ALSA: usb-audio: Add quirk flag for HEM devices to enable native DSD playback Ricardo Ribalda <ribalda(a)chromium.org> powerpc/purgatory: remove PGO flags Ricardo Ribalda <ribalda(a)chromium.org> x86/purgatory: remove PGO flags Ricardo Ribalda <ribalda(a)chromium.org> kexec: support purgatories with .text.hot sections Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix possible out-of-bounds segment allocation in resize ioctl Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key() Janne Grunau <j(a)jannau.net> nios2: dts: Fix tse_mac "max-frame-size" property Luís Henriques <ocfs2-devel(a)oss.oracle.com> ocfs2: check new file size on fallocate call Luís Henriques <ocfs2-devel(a)oss.oracle.com> ocfs2: fix use-after-free when unmounting read-only filesystem Benjamin Segall <bsegall(a)google.com> epoll: ep_autoremove_wake_function should use list_del_init_careful Dan Carpenter <dan.carpenter(a)linaro.org> wifi: cfg80211: fix double lock bug in reg_wdev_chan_valid() Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: fix locking in regulatory disconnect Jens Axboe <axboe(a)kernel.dk> io_uring: hold uring mutex around poll removal Marc Zyngier <maz(a)kernel.org> irqchip/gic: Correctly validate OF quirk descriptors Tatsuki Sugiura <sugi(a)nemui.org> NVMe: Add MAXIO 1602 to bogus nid list. Sukrut Bellary <sukrut.bellary(a)linux.com> drm:amd:amdgpu: Fix missing buffer object unlock in failure path Ross Lagerwall <ross.lagerwall(a)citrix.com> xen/blkfront: Only check REQ_FUA for writes Maxim Kochetkov <fido_max(a)inbox.ru> ASoC: dwc: move DMA init to snd_soc_dai_driver probe() Liviu Dudau <liviu(a)dudau.co.uk> mips: Move initrd_start check after initrd address sanitisation. Manuel Lauss <manuel.lauss(a)gmail.com> MIPS: Alchemy: fix dbdma2 Manuel Lauss <manuel.lauss(a)gmail.com> MIPS: unhide PATA_PLATFORM Helge Deller <deller(a)gmx.de> parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory() Helge Deller <deller(a)gmx.de> parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu() Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: soc-pcm: test if a BE can be prepared Johannes Thumshirn <johannes.thumshirn(a)wdc.com> btrfs: handle memory allocation failure in btrfs_csum_one_bio Qu Wenruo <wqu(a)suse.com> btrfs: scrub: try harder to mark RAID56 block groups read-only Mario Limonciello <mario.limonciello(a)amd.com> power: supply: Fix logic checking if system is running from battery Douglas Anderson <dianders(a)chromium.org> irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues Osama Muhammad <osmtendev(a)gmail.com> regulator: Fix error checking for debugfs_create_dir Alexandru Sorodoc <ealex95(a)gmail.com> platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0 Marek Vasut <marex(a)denx.de> power: supply: Ratelimit no data debug output Milo Spadacini <milo.spadacini(a)gmail.com> tools: gpio: fix debounce_period_us output of lsgpio Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: vexpress: add missing cache properties Hans de Goede <hdegoede(a)redhat.com> power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule() Hans de Goede <hdegoede(a)redhat.com> power: supply: sc27xx: Fix external_power_changed race Hans de Goede <hdegoede(a)redhat.com> power: supply: ab8500: Fix external_power_changed race Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset() Frank Rowand <frank.rowand(a)sony.com> of: overlay: rework overlay apply and remove kfree()s Frank Rowand <frank.rowand(a)sony.com> of: overlay: rename variables to be consistent Horatio Zhang <Hongkun.Zhang(a)amd.com> drm/amdgpu: fix Null pointer dereference error in amdgpu_device_recover_vram Kuan-Ting Chen <h3xrabbit(a)gmail.com> ksmbd: fix slab-out-of-bounds read in smb2_handle_negotiate Mirsad Goran Todorovac <mirsad.todorovac(a)alu.unizg.hr> test_firmware: fix a memory leak with reqs buffer Mirsad Goran Todorovac <mirsad.todorovac(a)alu.unizg.hr> test_firmware: prevent race conditions by a correct implementation of locking Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> test_firmware: Use kstrtobool() instead of strtobool() ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 4 - Documentation/admin-guide/sysctl/net.rst | 15 +- Documentation/devicetree/overlay-notes.rst | 30 +- Documentation/networking/decnet.rst | 243 -- Documentation/networking/index.rst | 1 - Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - MAINTAINERS | 7 - Makefile | 4 +- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 1 + arch/mips/Kconfig | 1 + arch/mips/alchemy/common/dbdma.c | 27 +- arch/mips/configs/decstation_64_defconfig | 2 - arch/mips/configs/decstation_defconfig | 2 - arch/mips/configs/decstation_r4k_defconfig | 2 - arch/mips/configs/gpr_defconfig | 2 - arch/mips/configs/mtx1_defconfig | 2 - arch/mips/configs/nlm_xlp_defconfig | 2 - arch/mips/configs/nlm_xlr_defconfig | 2 - arch/mips/configs/rm200_defconfig | 2 - arch/mips/kernel/setup.c | 9 +- arch/nios2/boot/dts/10m50_devboard.dts | 2 +- arch/nios2/boot/dts/3c120_devboard.dts | 2 +- arch/parisc/kernel/pci-dma.c | 18 +- arch/powerpc/configs/ppc6xx_defconfig | 2 - arch/powerpc/purgatory/Makefile | 5 + arch/x86/purgatory/Makefile | 5 + drivers/block/xen-blkfront.c | 3 +- drivers/char/agp/parisc-agp.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 + drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +- drivers/infiniband/core/cma.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 7 +- drivers/infiniband/core/uverbs_main.c | 12 +- drivers/infiniband/hw/mlx5/main.c | 3 + drivers/infiniband/sw/rxe/rxe_net.c | 6 + drivers/infiniband/sw/rxe/rxe_qp.c | 16 +- drivers/infiniband/sw/rxe/rxe_task.c | 5 +- drivers/infiniband/sw/rxe/rxe_task.h | 5 +- drivers/infiniband/ulp/isert/ib_isert.c | 16 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 55 +- drivers/infiniband/ulp/rtrs/rtrs.c | 4 +- drivers/irqchip/irq-gic-common.c | 10 +- drivers/irqchip/irq-gic-common.h | 1 + drivers/irqchip/irq-gic-v3.c | 20 + drivers/md/dm-ioctl.c | 5 +- drivers/md/dm-thin-metadata.c | 20 +- drivers/md/dm.c | 4 + drivers/mmc/core/block.c | 5 + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 +- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 15 +- drivers/net/ethernet/intel/iavf/iavf_register.h | 2 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 + drivers/net/ethernet/intel/igc/igc_main.c | 9 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 7 +- drivers/net/ipvlan/ipvlan_l3s.c | 4 + drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wan/lapbether.c | 3 + drivers/nvme/host/pci.c | 2 + drivers/of/overlay.c | 311 ++- drivers/platform/x86/asus-nb-wmi.c | 2 + drivers/power/supply/ab8500_btemp.c | 6 +- drivers/power/supply/ab8500_fg.c | 6 +- drivers/power/supply/bq27xxx_battery.c | 6 +- drivers/power/supply/power_supply_core.c | 8 +- drivers/power/supply/power_supply_sysfs.c | 3 +- drivers/power/supply/sc27xx_fuel_gauge.c | 9 +- drivers/regulator/core.c | 4 +- drivers/spi/spi-fsl-dspi.c | 15 + drivers/thunderbolt/dma_test.c | 8 +- drivers/thunderbolt/nhi.c | 11 +- drivers/tty/serial/lantiq.c | 1 + drivers/usb/dwc3/gadget.c | 1 + drivers/usb/serial/option.c | 16 + fs/afs/vl_probe.c | 4 +- fs/btrfs/block-group.c | 14 +- fs/btrfs/file-item.c | 4 +- fs/btrfs/scrub.c | 9 +- fs/cifs/file.c | 8 +- fs/eventpoll.c | 6 +- fs/ext4/balloc.c | 20 +- fs/ksmbd/smb2pdu.c | 10 +- fs/nilfs2/btnode.c | 12 +- fs/nilfs2/sufile.c | 9 + fs/nilfs2/the_nilfs.c | 44 +- fs/ocfs2/file.c | 8 +- fs/ocfs2/super.c | 6 +- include/linux/netdevice.h | 4 - include/linux/netfilter.h | 5 - include/linux/netfilter_defs.h | 8 - include/linux/of.h | 16 +- include/net/dn.h | 231 -- include/net/dn_dev.h | 199 -- include/net/dn_fib.h | 167 -- include/net/dn_neigh.h | 30 - include/net/dn_nsp.h | 195 -- include/net/dn_route.h | 115 - include/net/dst.h | 6 - include/net/flow.h | 26 - include/net/neighbour.h | 7 - include/net/netfilter/nf_tables.h | 4 +- include/net/netns/netfilter.h | 3 - include/rdma/ib_addr.h | 23 - include/sound/soc-dpcm.h | 4 + include/uapi/linux/dn.h | 149 -- include/uapi/linux/ethtool_netlink.h | 2 +- include/uapi/linux/netfilter_decnet.h | 72 - include/uapi/linux/netlink.h | 2 +- io_uring/io_uring.c | 3 + kernel/cgroup/cgroup.c | 17 +- kernel/kexec_file.c | 14 +- kernel/rcu/tree.c | 39 +- lib/test_firmware.c | 65 +- net/Kconfig | 2 - net/Makefile | 1 - net/core/dev.c | 4 +- net/core/neighbour.c | 34 - net/decnet/Kconfig | 43 - net/decnet/Makefile | 10 - net/decnet/README | 8 - net/decnet/af_decnet.c | 2400 -------------------- net/decnet/dn_dev.c | 1433 ------------ net/decnet/dn_fib.c | 798 ------- net/decnet/dn_neigh.c | 605 ----- net/decnet/dn_nsp_in.c | 906 -------- net/decnet/dn_nsp_out.c | 695 ------ net/decnet/dn_route.c | 1922 ---------------- net/decnet/dn_rules.c | 258 --- net/decnet/dn_table.c | 929 -------- net/decnet/dn_timer.c | 104 - net/decnet/netfilter/Kconfig | 17 - net/decnet/netfilter/Makefile | 6 - net/decnet/netfilter/dn_rtmsg.c | 158 -- net/decnet/sysctl_net_decnet.c | 362 --- net/ipv6/ping.c | 3 +- net/netfilter/core.c | 10 - net/netfilter/nf_tables_api.c | 59 +- net/netfilter/nfnetlink.c | 3 +- net/netfilter/nfnetlink_hook.c | 7 - net/netfilter/nft_set_pipapo.c | 55 +- net/sched/act_pedit.c | 176 +- net/sched/cls_api.c | 12 +- net/sched/cls_u32.c | 18 +- net/sctp/sm_statefuns.c | 2 +- net/tipc/bearer.c | 4 +- net/wireless/reg.c | 6 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/dwc/dwc-i2s.c | 41 +- sound/soc/soc-pcm.c | 20 + sound/usb/quirks.c | 2 + tools/gpio/lsgpio.c | 2 +- tools/testing/selftests/ptp/testptp.c | 6 +- 159 files changed, 1004 insertions(+), 12795 deletions(-)

8 months, 1 week

13
126
0 0

[PATCH 5.15 000/139] 5.15.128-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.128 release. There are 139 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, 26 Aug 2023 14:49:55 +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/v5.x/stable-review/patch-5.15.128-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.128-rc1 Borislav Petkov (AMD) <bp(a)alien8.de> x86/srso: Correct the mitigation status when SMT is disabled Peter Zijlstra <peterz(a)infradead.org> objtool/x86: Fixup frame-pointer vs rethunk Petr Pavlu <petr.pavlu(a)suse.com> x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG Borislav Petkov (AMD) <bp(a)alien8.de> x86/srso: Disable the mitigation on unaffected configurations Borislav Petkov (AMD) <bp(a)alien8.de> x86/CPU/AMD: Fix the DIV(0) initial fix attempt Sean Christopherson <seanjc(a)google.com> x86/retpoline: Don't clobber RFLAGS during srso_safe_ret() Peter Zijlstra <peterz(a)infradead.org> x86/static_call: Fix __static_call_fixup() Borislav Petkov (AMD) <bp(a)alien8.de> x86/srso: Explain the untraining sequences a bit more Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Cleanup the untrain mess Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Rename srso_(.*)_alias to srso_alias_\1 Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Rename original retbleed methods Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Clean up SRSO return thunk mess Peter Zijlstra <peterz(a)infradead.org> x86/ibt: Add ANNOTATE_NOENDBR Josh Poimboeuf <jpoimboe(a)redhat.com> objtool: Add frame-pointer-specific function ignore Peter Zijlstra <peterz(a)infradead.org> x86/alternative: Make custom return thunk unconditional Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk() Peter Zijlstra <peterz(a)infradead.org> x86/cpu: Fix __x86_return_thunk symbol type Yangtao Li <frank.li(a)vivo.com> mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove Jason Xing <kernelxing(a)tencent.com> net: fix the RTO timer retransmitting skb every 1ms if linear option is enabled Jason Wang <jasowang(a)redhat.com> virtio-net: set queues after driver_ok Kuniyuki Iwashima <kuniyu(a)amazon.com> af_unix: Fix null-ptr-deref in unix_stream_sendpage(). Christopher Obbard <chris.obbard(a)collabora.com> arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4 Namjae Jeon <linkinjeon(a)kernel.org> exfat: check if filename entries exceeds max filename length Xin Long <lucien.xin(a)gmail.com> netfilter: set default timeout to 3 secs for sctp shutdown send and recv state Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: flush any delayed gfxoff on suspend entry Wander Lairson Costa <wander(a)redhat.com> drm/qxl: fix UAF on handle creation Yibin Ding <yibin.ding(a)unisoc.com> mmc: block: Fix in_flight[issue_type] value error Yang Yingliang <yangyingliang(a)huawei.com> mmc: wbsd: fix double mmc_free_host() in wbsd_init() Russell Harmon via samba-technical <samba-technical(a)lists.samba.org> cifs: Release folio lock on fscache read hit. dengxiang <dengxiang(a)nfschina.com> ALSA: usb-audio: Add support for Mythware XA001AU capture and playback interfaces. Tony Lindgren <tony(a)atomide.com> serial: 8250: Fix oops for port->pm on uart_change_pm() Alexandre Ghiti <alexghiti(a)rivosinc.com> riscv: uaccess: Return the number of bytes effectively not copied Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Remodified 3k pull low procedure Jiasheng Jiang <jiasheng(a)iscas.ac.cn> soc: aspeed: socinfo: Add kfree for kstrdup Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: axg-tdm-formatter: fix channel slot allocation Zhang Shurong <zhang_shurong(a)foxmail.com> ASoC: rt5665: add missed regulator_bulk_disable Xiaolei Wang <xiaolei.wang(a)windriver.com> ARM: dts: imx: Set default tuning step for imx6sx usdhc Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: qrb5165-rb5: fix thermal zone conflict Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Flush posted write on enable before reset Eric Dumazet <edumazet(a)google.com> net: do not allow gso_size to be set to GSO_BY_FRAGS Abel Wu <wuyun.abel(a)bytedance.com> sock: Fix misuse of sk_under_memory_pressure() Alfred Lee <l00g33k(a)gmail.com> net: dsa: mv88e6xxx: Wait for EEPROM done before HW reset Andrii Staikov <andrii.staikov(a)intel.com> i40e: fix misleading debug logs Piotr Gardocki <piotrx.gardocki(a)intel.com> iavf: fix FDIR rule fields masks validation Ziyang Xuan <william.xuanziyang(a)huawei.com> team: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves Justin Chen <justin.chen(a)broadcom.com> net: phy: broadcom: stub c45 read/write for 54810 Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_dynset: disallow object maps Sishuai Gong <sishuai.system(a)gmail.com> ipvs: fix racy memcpy in proc_do_sync_threshold Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: deactivate catchall elements in next generation Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix false-positive lockdep splat Luca Ceresoli <luca.ceresoli(a)bootlin.com> drm/panel: simple: Fix AUO G121EAN01 panel timings according to the docs Petr Machata <petrm(a)nvidia.com> selftests: mirror_gre_changes: Tighten up the TTL test match Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> net: phy: fix IRQ-based wake-on-lan over hibernate / power off Lin Ma <linma(a)zju.edu.cn> xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH Lin Ma <linma(a)zju.edu.cn> xfrm: add NULL check in xfrm_update_ae_params Zhengchao Shao <shaozhengchao(a)huawei.com> ip_vti: fix potential slab-use-after-free in decode_session6 Zhengchao Shao <shaozhengchao(a)huawei.com> ip6_vti: fix slab-use-after-free in decode_session6 Zhengchao Shao <shaozhengchao(a)huawei.com> xfrm: fix slab-use-after-free in decode_session6 Lin Ma <linma(a)zju.edu.cn> net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure Lin Ma <linma(a)zju.edu.cn> net: af_key: fix sadb_x_filter validation Lin Ma <linma(a)zju.edu.cn> net: xfrm: Fix xfrm_address_filter OOB read Tam Nguyen <tamnguyenchi(a)os.amperecomputing.com> i2c: designware: Handle invalid SMBus block data response length value Quan Nguyen <quan(a)os.amperecomputing.com> i2c: designware: Correct length byte validation logic xiaoshoukui <xiaoshoukui(a)gmail.com> btrfs: fix BUG_ON condition in btrfs_cancel_balance Sherry Sun <sherry.sun(a)nxp.com> tty: serial: fsl_lpuart: Clear the error flags by writing 1 for lpuart32 platforms Yi Yang <yiyang13(a)huawei.com> tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/rtas_flash: allow user copy to flash block cache objects Yuanjun Gong <ruc_gongyuanjun(a)163.com> fbdev: mmp: fix value check in mmphw_probe() Yicong Yang <yangyicong(a)hisilicon.com> i2c: hisi: Only handle the interrupt of the driver's transfer Chengfeng Ye <dg573847474(a)gmail.com> i2c: bcm-iproc: Fix bcm_iproc_i2c_isr deadlock issue Steve French <stfrench(a)microsoft.com> cifs: fix potential oops in cifs_oplock_break Maxime Coquelin <maxime.coquelin(a)redhat.com> vduse: Use proper spinlock for IRQ injection Wolfram Sang <wsa+renesas(a)sang-engineering.com> virtio-mmio: don't break lifecycle of vm_dev Naohiro Aota <naota(a)elisp.net> btrfs: move out now unused BG from the reclaim list Xu Yang <xu.yang_2(a)nxp.com> ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node Andreas Kemnade <andreas(a)kemnade.info> ARM: dts: imx6sll: fixup of operating points Ivan Mikhaylov <fr0st61te(a)gmail.com> net/ncsi: change from ndo_set_mac_address to dev_set_mac_address Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: sunxi: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: bcm2835: fix deferred probing Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: fix use-after-free on core driver unbind Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: qcom: fix NULL-deref on suspend Robert Hodaszi <robert.hodaszi(a)digi.com> tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A Sherry Sun <sherry.sun(a)nxp.com> tty: serial: fsl_lpuart: make rx_watermark configurable for different platforms Jesse Taube <mr.bossman075(a)gmail.com> tty: serial: fsl_lpuart: Add i.MXRT1050 support Roger Quadros <rogerq(a)kernel.org> usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume() Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: gadget: drop dead hibernation code Kushagra Verma <kushagra765(a)outlook.com> usb: dwc3: Fix typos in gadget.c Wesley Cheng <quic_wcheng(a)quicinc.com> usb: dwc3: Remove DWC3 locking during gadget suspend/resume Wesley Cheng <quic_wcheng(a)quicinc.com> usb: dwc3: gadget: Synchronize IRQ between soft connect/disconnect Hersen Wu <hersenxs.wu(a)amd.com> drm/amd/display: fix access hdcp_workqueue assert hersen wu <hersenxs.wu(a)amd.com> drm/amd/display: phase3 mst hdcp for multiple displays hersen wu <hersenxs.wu(a)amd.com> drm/amd/display: save restore hdcp state when display is unplugged from mst hub Zev Weiss <zev(a)bewilderbeest.net> ARM: dts: aspeed: asrock: Correct firmware flash SPI clocks Song Yoong Siang <yoong.siang.song(a)intel.com> igc: read before write to SRRCTL register William Breathitt Gray <william.gray(a)linaro.org> iio: addac: stx104: Fix race condition when converting analog-to-digital William Breathitt Gray <william.gray(a)linaro.org> iio: addac: stx104: Fix race condition for stx104_write_raw() William Breathitt Gray <william.gray(a)linaro.org> iio: stx104: Move to addac subdirectory William Breathitt Gray <william.gray(a)linaro.org> iio: adc: stx104: Implement and utilize register structures William Breathitt Gray <william.gray(a)linaro.org> iio: adc: stx104: Utilize iomap interface Cosmin Tanislav <demonsingur(a)gmail.com> iio: add addac subdirectory Chen Lin <chen.lin5(a)zte.com.cn> ring-buffer: Do not swap cpu_buffer during resize process Benjamin Gray <bgray(a)linux.ibm.com> powerpc/kasan: Disable KCOV in KASAN code Tuo Li <islituo(a)gmail.com> ALSA: hda: fix a possible null-pointer dereference due to data race in snd_hdac_regmap_sync() dengxiang <dengxiang(a)nfschina.com> ALSA: hda/realtek: Add quirks for Unis H3C Desktop B760 & Q760 Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com> fs/ntfs3: Mark ntfs dirty when on-disk struct is corrupted Jia-Ju Bai <baijiaju(a)buaa.edu.cn> fs: ntfs3: Fix possible null-pointer dereferences in mi_read() Edward Lo <loyuantsung(a)gmail.com> fs/ntfs3: Enhance sanity check while generating attr_list shanzhulig <shanzhulig(a)gmail.com> drm/amdgpu: Fix potential fence use-after-free v2 Matthew Anderson <ruinairas1992(a)gmail.com> Bluetooth: btusb: Add MT7922 bluetooth ID for the Asus Ally Zhengping Jiang <jiangzp(a)google.com> Bluetooth: L2CAP: Fix use-after-free Yuechao Zhao <yuechao.zhao(a)advantech.com.cn> watchdog: sp5100_tco: support Hygon FCH/SCH (Server Controller Hub) Zhang Shurong <zhang_shurong(a)foxmail.com> firewire: net: fix use after free in fwnet_finish_incoming_packet() Armin Wolf <W_Armin(a)gmx.de> pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db() Tuo Li <islituo(a)gmail.com> gfs2: Fix possible data races in gfs2_show_options() Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: imx: add missing USB PHY DPDM wakeup setting Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: imx: don't request QoS for imx8ulp Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Read retimer NVM authentication status prior tb_retimer_set_inbound_sbtx() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: platform: mediatek: vpu: fix NULL ptr dereference Prashanth K <quic_prashk(a)quicinc.com> usb: gadget: u_serial: Avoid spinlock recursion in __gs_console_push Yunfei Dong <yunfei.dong(a)mediatek.com> media: v4l2-mem2mem: add lock to protect parameter num_rdy Paulo Alcantara <pc(a)manguebit.com> smb: client: fix warning in cifs_smb3_do_mount() Christian Brauner <brauner(a)kernel.org> ovl: check type and offset of struct vfsmount in ovl_entry Patrisious Haddad <phaddad(a)nvidia.com> RDMA/mlx5: Return the firmware result upon destroying QP/RQ Marco Morandini <marco.morandini(a)polimi.it> HID: add quirk for 03f0:464a HP Elite Presenter Mouse Lang Yu <Lang.Yu(a)amd.com> drm/amdgpu: install stub fence into potential unused fence pointers stuarthayhurst <stuart.a.hayhurst(a)gmail.com> HID: logitech-hidpp: Add USB and Bluetooth IDs for the Logitech G915 TKL Keyboard gaoxu <gaoxu2(a)hihonor.com> dma-remap: use kvmalloc_array/kvfree for larger dma memory remap Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: fix SoundWire/HDaudio mutual exclusion Geert Uytterhoeven <geert+renesas(a)glider.be> iopoll: Call cpu_relax() in busy loops Oleksij Rempel <linux(a)rempel-privat.de> ARM: dts: imx6dl: prtrvt, prtvt7, prti6q, prtwd2: fix USB related warnings Sumit Gupta <sumitg(a)nvidia.com> PCI: tegra194: Fix possible array out of bounds access Jakub Kicinski <kuba(a)kernel.org> net: tls: avoid discarding data on record close Tariq Toukan <tariqt(a)nvidia.com> net/tls: Multi-threaded calls to TX tls_dev_del Tariq Toukan <tariqt(a)nvidia.com> net/tls: Perform immediate device ctx cleanup when possible Eric Dumazet <edumazet(a)google.com> macsec: use DEV_STATS_INC() Clayton Yager <Clayton_Yager(a)selinc.com> macsec: Fix traffic counters/statistics Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: tc_actions: Use ncat instead of nc Davide Caratti <dcaratti(a)redhat.com> selftests: forwarding: tc_actions: cleanup temporary files when test is aborted Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> mmc: sdhci-f-sdh30: Replace with sdhci_pltfm ------------- Diffstat: Documentation/admin-guide/hw-vuln/srso.rst | 4 +- MAINTAINERS | 2 +- Makefile | 4 +- arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 2 +- arch/arm/boot/dts/imx6dl-prtrvt.dts | 4 + arch/arm/boot/dts/imx6qdl-prti6q.dtsi | 11 +- arch/arm/boot/dts/imx6sll.dtsi | 24 ++- arch/arm/boot/dts/imx6sx.dtsi | 6 + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 +- arch/powerpc/kernel/rtas_flash.c | 6 +- arch/powerpc/mm/kasan/Makefile | 1 + arch/riscv/lib/uaccess.S | 11 +- arch/x86/include/asm/entry-common.h | 1 + arch/x86/include/asm/nospec-branch.h | 28 +-- arch/x86/kernel/cpu/amd.c | 1 + arch/x86/kernel/cpu/bugs.c | 28 ++- arch/x86/kernel/static_call.c | 13 ++ arch/x86/kernel/traps.c | 2 - arch/x86/kernel/vmlinux.lds.S | 20 +- arch/x86/kvm/svm/svm.c | 2 + arch/x86/lib/retpoline.S | 141 +++++++++----- drivers/bluetooth/btusb.c | 3 + drivers/bus/ti-sysc.c | 2 + drivers/firewire/net.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 211 +++++++++++++++++---- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 14 ++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 30 +++ drivers/gpu/drm/panel/panel-simple.c | 24 +-- drivers/gpu/drm/qxl/qxl_drv.h | 2 +- drivers/gpu/drm/qxl/qxl_dumb.c | 5 +- drivers/gpu/drm/qxl/qxl_gem.c | 25 ++- drivers/gpu/drm/qxl/qxl_ioctl.c | 6 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-hidpp.c | 4 + drivers/hid/hid-quirks.c | 1 + drivers/i2c/busses/i2c-bcm-iproc.c | 11 +- drivers/i2c/busses/i2c-designware-master.c | 16 +- drivers/i2c/busses/i2c-hisi.c | 8 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/adc/Kconfig | 16 -- drivers/iio/adc/Makefile | 1 - drivers/iio/addac/Kconfig | 24 +++ drivers/iio/addac/Makefile | 7 + drivers/iio/{adc => addac}/stx104.c | 98 +++++++--- drivers/infiniband/hw/mlx5/qpc.c | 10 +- drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 +- drivers/mmc/core/block.c | 7 +- drivers/mmc/host/bcm2835.c | 4 +- drivers/mmc/host/sdhci_f_sdh30.c | 66 +++---- drivers/mmc/host/sunxi-mmc.c | 4 +- drivers/mmc/host/wbsd.c | 2 - drivers/net/dsa/mv88e6xxx/chip.c | 8 + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 16 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 + drivers/net/ethernet/intel/iavf/iavf_fdir.c | 77 +++++++- drivers/net/ethernet/intel/iavf/iavf_fdir.h | 2 + drivers/net/ethernet/intel/igc/igc_base.h | 11 +- drivers/net/ethernet/intel/igc/igc_main.c | 7 +- drivers/net/macsec.c | 70 +++++-- drivers/net/phy/broadcom.c | 13 ++ drivers/net/phy/phy_device.c | 13 +- drivers/net/team/team.c | 4 +- drivers/net/virtio_net.c | 4 +- drivers/pci/controller/dwc/pcie-tegra194.c | 13 +- drivers/pcmcia/rsrc_nonstatic.c | 2 + drivers/soc/aspeed/aspeed-socinfo.c | 1 + drivers/thunderbolt/retimer.c | 29 ++- drivers/tty/n_gsm.c | 3 +- drivers/tty/serial/8250/8250_port.c | 1 + drivers/tty/serial/fsl_lpuart.c | 26 ++- drivers/usb/chipidea/ci_hdrc_imx.c | 5 + drivers/usb/chipidea/usbmisc_imx.c | 2 +- drivers/usb/dwc3/core.c | 9 +- drivers/usb/dwc3/dwc3-qcom.c | 11 +- drivers/usb/dwc3/gadget.c | 116 +++++------ drivers/usb/gadget/function/u_serial.c | 3 + drivers/vdpa/vdpa_user/vduse_dev.c | 8 +- drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 4 +- drivers/virtio/virtio_mmio.c | 5 +- drivers/watchdog/sp5100_tco.c | 4 +- fs/btrfs/block-group.c | 5 +- fs/btrfs/volumes.c | 3 +- fs/cifs/cifsfs.c | 28 +-- fs/cifs/file.c | 25 ++- fs/exfat/dir.c | 9 +- fs/gfs2/super.c | 26 +-- fs/ntfs3/frecord.c | 16 +- fs/ntfs3/fsntfs.c | 2 +- fs/ntfs3/index.c | 6 + fs/ntfs3/ntfs_fs.h | 2 + fs/ntfs3/record.c | 10 +- fs/overlayfs/ovl_entry.h | 9 + include/linux/iopoll.h | 2 + include/linux/objtool.h | 28 +++ include/linux/virtio_net.h | 4 + include/media/v4l2-mem2mem.h | 18 +- include/net/sock.h | 6 + include/net/tls.h | 2 + kernel/dma/remap.c | 4 +- kernel/trace/ring_buffer.c | 14 +- kernel/trace/trace.c | 3 +- net/bluetooth/l2cap_core.c | 5 + net/core/sock.c | 2 +- net/ipv4/ip_vti.c | 4 +- net/ipv4/tcp_timer.c | 4 +- net/ipv6/ip6_vti.c | 4 +- net/key/af_key.c | 4 +- net/ncsi/ncsi-rsp.c | 5 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- net/netfilter/nf_tables_api.c | 1 + net/netfilter/nft_dynset.c | 3 + net/netfilter/nft_set_pipapo.c | 13 +- net/tls/tls_device.c | 137 +++++++------ net/unix/af_unix.c | 9 +- net/xfrm/xfrm_compat.c | 2 +- net/xfrm/xfrm_interface_core.c | 4 +- net/xfrm/xfrm_user.c | 14 +- sound/hda/hdac_regmap.c | 7 +- sound/pci/hda/patch_realtek.c | 16 +- sound/soc/codecs/rt5665.c | 2 + sound/soc/meson/axg-tdm-formatter.c | 42 ++-- sound/soc/sof/intel/hda.c | 12 +- sound/usb/quirks-table.h | 29 +++ tools/include/linux/objtool.h | 28 +++ tools/objtool/arch/x86/decode.c | 2 +- tools/objtool/check.c | 21 +- .../selftests/net/forwarding/mirror_gre_changes.sh | 3 +- .../testing/selftests/net/forwarding/tc_actions.sh | 18 +- 135 files changed, 1437 insertions(+), 618 deletions(-)

8 months, 1 week

14
155
0 0

[PATCH v3 0/3] x86/cacheinfo: Set the number of leaves per CPU

by Ricardo Neri

Hi, This is v3 of a patchset to set the number of cache leaves independently for each CPU. v1 and v2 can be found here [1] and here [2]. Changes since v2: * This version uncovered a NULL-pointer dereference in recent changes to cacheinfo[3]. This dereference is observed when the system does not configure cacheinfo early during boot nor makes corrections later during CPU hotplug; as is the case in x86. Patch 1 fixes this issue. Changes since v1: * Dave Hansen suggested to use the existing per-CPU ci_cpu_cacheinfo variable. Now the global variable num_cache_leaves became useless. * While here, I noticed that init_cache_level() also became useless: x86 does not need ci_cpu_cacheinfo::num_levels. [1]. https://lore.kernel.org/lkml/20230314231658.30169-1-ricardo.neri-calderon@l… [2]. https://lore.kernel.org/all/20230424001956.21434-1-ricardo.neri-calderon@li… [3]. https://lore.kernel.org/all/20230412185759.755408-1-rrendec@redhat.com/ Ricardo Neri (3): cacheinfo: Allocate memory for memory if not done from the primary CPU x86/cacheinfo: Delete global num_cache_leaves x86/cacheinfo: Clean out init_cache_level() arch/x86/kernel/cpu/cacheinfo.c | 50 ++++++++++++++++----------------- drivers/base/cacheinfo.c | 6 +++- 2 files changed, 30 insertions(+), 26 deletions(-) -- 2.25.1

8 months, 1 week

4
14
0 0

[PATCH v3] tpm: Enable hwrng only for Pluton on AMD CPUs

by Jarkko Sakkinen

The vendor check introduced by commit 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs") doesn't work properly on a number of Intel fTPMs. On the reported systems the TPM doesn't reply at bootup and returns back the command code. This makes the TPM fail probe. Since only Microsoft Pluton is the only known combination of AMD CPU and fTPM from other vendor, disable hwrng otherwise. In order to make sysadmin aware of this, print also info message to the klog. Cc: stable(a)vger.kernel.org Fixes: 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs") Reported-by: Todd Brandt <todd.e.brandt(a)intel.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217804 Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> --- v3: * Forgot to amend config flags. v2: * CONFIG_X86 * Removed "Reviewed-by: Jarkko Sakkinen <jarkko(a)kernel.org>" * Removed "Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com>" --- drivers/char/tpm/tpm_crb.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 65ff4d2fbe8d..ea085b14ab7c 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -463,28 +463,6 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status) return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE; } -static int crb_check_flags(struct tpm_chip *chip) -{ - u32 val; - int ret; - - ret = crb_request_locality(chip, 0); - if (ret) - return ret; - - ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL); - if (ret) - goto release; - - if (val == 0x414D4400U /* AMD */) - chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; - -release: - crb_relinquish_locality(chip, 0); - - return ret; -} - static const struct tpm_class_ops tpm_crb = { .flags = TPM_OPS_AUTO_STARTUP, .status = crb_status, @@ -827,9 +805,14 @@ static int crb_acpi_add(struct acpi_device *device) if (rc) goto out; - rc = crb_check_flags(chip); - if (rc) - goto out; +#ifdef CONFIG_X86 + /* A quirk for https://www.amd.com/en/support/kb/faq/pa-410 */ + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD && + priv->sm != ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON) { + dev_info(dev, "Disabling hwrng\n"); + chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; + } +#endif /* CONFIG_X86 */ rc = tpm_chip_register(chip); -- 2.39.2

8 months, 1 week

7
21
0 0

[PATCH v7 0/4] kexec: Fix kexec_file_load for llvm16 with PGO

by Ricardo Ribalda

When upreving llvm I realised that kexec stopped working on my test platform. The reason seems to be that due to PGO there are multiple .text sections on the purgatory, and kexec does not supports that. Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v7: - Fix $SUBJECT of riscv patch - Rename PGO as Profile-guided optimization - Link to v6: https://lore.kernel.org/r/20230321-kexec_clang16-v6-0-a2255e81ab45@chromium… Changes in v6: - Replace linker script with Makefile rule. Thanks Nick - Link to v5: https://lore.kernel.org/r/20230321-kexec_clang16-v5-0-5563bf7c4173@chromium… Changes in v5: - Add warning when multiple text sections are found. Thanks Simon! - Add Fixes tag. - Link to v4: https://lore.kernel.org/r/20230321-kexec_clang16-v4-0-1340518f98e9@chromium… Changes in v4: - Add Cc: stable - Add linker script for x86 - Add a warning when the kernel image has overlapping sections. - Link to v3: https://lore.kernel.org/r/20230321-kexec_clang16-v3-0-5f016c8d0e87@chromium… Changes in v3: - Fix initial value. Thanks Ross! - Link to v2: https://lore.kernel.org/r/20230321-kexec_clang16-v2-0-d10e5d517869@chromium… Changes in v2: - Fix if condition. Thanks Steven!. - Update Philipp email. Thanks Baoquan. - Link to v1: https://lore.kernel.org/r/20230321-kexec_clang16-v1-0-a768fc2c7c4d@chromium… --- Ricardo Ribalda (4): kexec: Support purgatories with .text.hot sections x86/purgatory: Remove PGO flags powerpc/purgatory: Remove PGO flags riscv/purgatory: Remove PGO flags arch/powerpc/purgatory/Makefile | 5 +++++ arch/riscv/purgatory/Makefile | 5 +++++ arch/x86/purgatory/Makefile | 5 +++++ kernel/kexec_file.c | 14 +++++++++++++- 4 files changed, 28 insertions(+), 1 deletion(-) --- base-commit: 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f change-id: 20230321-kexec_clang16-4510c23d129c Best regards, -- Ricardo Ribalda Delgado <ribalda(a)chromium.org>

8 months, 2 weeks

3
10
0 0

FAILED: patch "[PATCH] Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y git checkout FETCH_HEAD git cherry-pick -x bd003fb338afee97c76f13c3e9144a7e4ad37179 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023083021-unease-catfish-92ad@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bd003fb338afee97c76f13c3e9144a7e4ad37179 Mon Sep 17 00:00:00 2001 From: Max Chou <max.chou(a)realtek.com> Date: Mon, 7 Aug 2023 19:42:59 +0800 Subject: [PATCH] Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C In this commit, prefer to load FW v2 if available. Fallback to FW v1 otherwise. This behavior is only for RTL8852C. Fixes: 9a24ce5e29b1 ("Bluetooth: btrtl: Firmware format v2 support") Cc: stable(a)vger.kernel.org Suggested-by: Juerg Haefliger <juerg.haefliger(a)canonical.com> Tested-by: Hilda Wu <hildawu(a)realtek.com> Signed-off-by: Max Chou <max.chou(a)realtek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index ddae6524106d..84c2c2e1122f 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -104,7 +104,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8723A, 0xb, 0x6, HCI_USB), .config_needed = false, .has_rom_version = false, - .fw_name = "rtl_bt/rtl8723a_fw.bin", + .fw_name = "rtl_bt/rtl8723a_fw", .cfg_name = NULL, .hw_info = "rtl8723au" }, @@ -112,7 +112,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_UART), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723bs_fw.bin", + .fw_name = "rtl_bt/rtl8723bs_fw", .cfg_name = "rtl_bt/rtl8723bs_config", .hw_info = "rtl8723bs" }, @@ -120,7 +120,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723b_fw.bin", + .fw_name = "rtl_bt/rtl8723b_fw", .cfg_name = "rtl_bt/rtl8723b_config", .hw_info = "rtl8723bu" }, @@ -132,7 +132,7 @@ static const struct id_table ic_id_table[] = { .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_cg_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_cg_fw", .cfg_name = "rtl_bt/rtl8723cs_cg_config", .hw_info = "rtl8723cs-cg" }, @@ -144,7 +144,7 @@ static const struct id_table ic_id_table[] = { .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_vf_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_vf_fw", .cfg_name = "rtl_bt/rtl8723cs_vf_config", .hw_info = "rtl8723cs-vf" }, @@ -156,7 +156,7 @@ static const struct id_table ic_id_table[] = { .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_xx_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_xx_fw", .cfg_name = "rtl_bt/rtl8723cs_xx_config", .hw_info = "rtl8723cs" }, @@ -164,7 +164,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723d_fw.bin", + .fw_name = "rtl_bt/rtl8723d_fw", .cfg_name = "rtl_bt/rtl8723d_config", .hw_info = "rtl8723du" }, @@ -172,7 +172,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723ds_fw.bin", + .fw_name = "rtl_bt/rtl8723ds_fw", .cfg_name = "rtl_bt/rtl8723ds_config", .hw_info = "rtl8723ds" }, @@ -180,7 +180,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8821a_fw.bin", + .fw_name = "rtl_bt/rtl8821a_fw", .cfg_name = "rtl_bt/rtl8821a_config", .hw_info = "rtl8821au" }, @@ -189,7 +189,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8821c_fw.bin", + .fw_name = "rtl_bt/rtl8821c_fw", .cfg_name = "rtl_bt/rtl8821c_config", .hw_info = "rtl8821cu" }, @@ -198,7 +198,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8821cs_fw.bin", + .fw_name = "rtl_bt/rtl8821cs_fw", .cfg_name = "rtl_bt/rtl8821cs_config", .hw_info = "rtl8821cs" }, @@ -206,7 +206,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761a_fw.bin", + .fw_name = "rtl_bt/rtl8761a_fw", .cfg_name = "rtl_bt/rtl8761a_config", .hw_info = "rtl8761au" }, @@ -215,7 +215,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8761b_fw.bin", + .fw_name = "rtl_bt/rtl8761b_fw", .cfg_name = "rtl_bt/rtl8761b_config", .hw_info = "rtl8761btv" }, @@ -223,7 +223,7 @@ static const struct id_table ic_id_table[] = { { IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761bu_fw.bin", + .fw_name = "rtl_bt/rtl8761bu_fw", .cfg_name = "rtl_bt/rtl8761bu_config", .hw_info = "rtl8761bu" }, @@ -232,7 +232,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cs_fw.bin", + .fw_name = "rtl_bt/rtl8822cs_fw", .cfg_name = "rtl_bt/rtl8822cs_config", .hw_info = "rtl8822cs" }, @@ -241,7 +241,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cs_fw.bin", + .fw_name = "rtl_bt/rtl8822cs_fw", .cfg_name = "rtl_bt/rtl8822cs_config", .hw_info = "rtl8822cs" }, @@ -250,7 +250,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cu_fw.bin", + .fw_name = "rtl_bt/rtl8822cu_fw", .cfg_name = "rtl_bt/rtl8822cu_config", .hw_info = "rtl8822cu" }, @@ -259,7 +259,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822b_fw.bin", + .fw_name = "rtl_bt/rtl8822b_fw", .cfg_name = "rtl_bt/rtl8822b_config", .hw_info = "rtl8822bu" }, @@ -268,7 +268,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852au_fw.bin", + .fw_name = "rtl_bt/rtl8852au_fw", .cfg_name = "rtl_bt/rtl8852au_config", .hw_info = "rtl8852au" }, @@ -277,7 +277,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852bs_fw.bin", + .fw_name = "rtl_bt/rtl8852bs_fw", .cfg_name = "rtl_bt/rtl8852bs_config", .hw_info = "rtl8852bs" }, @@ -286,7 +286,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852bu_fw.bin", + .fw_name = "rtl_bt/rtl8852bu_fw", .cfg_name = "rtl_bt/rtl8852bu_config", .hw_info = "rtl8852bu" }, @@ -295,7 +295,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852cu_fw.bin", + .fw_name = "rtl_bt/rtl8852cu_fw", .cfg_name = "rtl_bt/rtl8852cu_config", .hw_info = "rtl8852cu" }, @@ -304,7 +304,7 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = true, .has_msft_ext = false, - .fw_name = "rtl_bt/rtl8851bu_fw.bin", + .fw_name = "rtl_bt/rtl8851bu_fw", .cfg_name = "rtl_bt/rtl8851bu_config", .hw_info = "rtl8851bu" }, }; @@ -1045,6 +1045,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, struct sk_buff *skb; struct hci_rp_read_local_version *resp; struct hci_command_hdr *cmd; + char fw_name[40]; char cfg_name[40]; u16 hci_rev, lmp_subver; u8 hci_ver, lmp_ver, chip_type = 0; @@ -1154,8 +1155,26 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, goto err_free; } - btrtl_dev->fw_len = rtl_load_file(hdev, btrtl_dev->ic_info->fw_name, - &btrtl_dev->fw_data); + if (!btrtl_dev->ic_info->fw_name) { + ret = -ENOMEM; + goto err_free; + } + + btrtl_dev->fw_len = -EIO; + if (lmp_subver == RTL_ROM_LMP_8852A && hci_rev == 0x000c) { + snprintf(fw_name, sizeof(fw_name), "%s_v2.bin", + btrtl_dev->ic_info->fw_name); + btrtl_dev->fw_len = rtl_load_file(hdev, fw_name, + &btrtl_dev->fw_data); + } + + if (btrtl_dev->fw_len < 0) { + snprintf(fw_name, sizeof(fw_name), "%s.bin", + btrtl_dev->ic_info->fw_name); + btrtl_dev->fw_len = rtl_load_file(hdev, fw_name, + &btrtl_dev->fw_data); + } + if (btrtl_dev->fw_len < 0) { rtl_dev_err(hdev, "firmware file %s not found", btrtl_dev->ic_info->fw_name); @@ -1491,4 +1510,5 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bs_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw_v2.bin"); MODULE_FIRMWARE("rtl_bt/rtl8852cu_config.bin");

8 months, 2 weeks

3
3
0 0

[PATCH v2 1/2] nvme: fix memory corruption for passthrough metadata

by Kanchan Joshi

User can specify a smaller meta buffer than what the device is wired to update/access. This may lead to Device doing a larger DMA operation, overwriting unrelated kernel memory. Detect this situation for uring passthrough, and bail out. Fixes: 456cba386e94 ("nvme: wire-up uring-cmd support for io-passthru on char-device") Cc: stable(a)vger.kernel.org Reported-by: Vincent Fu <vincent.fu(a)samsung.com> Signed-off-by: Kanchan Joshi <joshi.k(a)samsung.com> --- drivers/nvme/host/ioctl.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 19a5177bc360..717c7effaf8a 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -320,6 +320,35 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) meta_len, lower_32_bits(io.slba), NULL, 0, 0); } +static bool nvme_validate_passthru_meta(struct nvme_ctrl *ctrl, + struct nvme_ns *ns, + struct nvme_command *c, + __u64 meta, __u32 meta_len) +{ + /* + * User may specify smaller meta-buffer with a larger data-buffer. + * Driver allocated meta buffer will also be small. + * Device can do larger dma into that, overwriting unrelated kernel + * memory. + */ + if (ns && (meta_len || meta)) { + u16 nlb = lower_16_bits(le32_to_cpu(c->common.cdw12)); + u16 control = upper_16_bits(le32_to_cpu(c->common.cdw12)); + + /* meta transfer from/to host is not done */ + if (control & NVME_RW_PRINFO_PRACT && ns->ms == ns->pi_size) + return true; + + if (meta_len != (nlb + 1) * ns->ms) { + dev_err(ctrl->device, + "%s: metadata length does not match!\n", current->comm); + return false; + } + } + + return true; +} + static bool nvme_validate_passthru_nsid(struct nvme_ctrl *ctrl, struct nvme_ns *ns, __u32 nsid) { @@ -593,6 +622,10 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, d.metadata_len = READ_ONCE(cmd->metadata_len); d.timeout_ms = READ_ONCE(cmd->timeout_ms); + if (!nvme_validate_passthru_meta(ctrl, ns, &c, d.metadata, + d.metadata_len)) + return -EINVAL; + if (issue_flags & IO_URING_F_NONBLOCK) { rq_flags |= REQ_NOWAIT; blk_flags = BLK_MQ_REQ_NOWAIT; -- 2.25.1

8 months, 2 weeks

5
8
0 0

[PATCH 1/4] arm64: dts: mediatek: mt8195-demo: fix the memory size to 8GB

by Macpaul Lin

The onboard dram of mt8195-demo board is 8GB. Cc: stable(a)vger.kernel.org # 6.1, 6.4 Fixes: 6147314aeedc ("arm64: dts: mediatek: Add device-tree for MT8195 Demo board") Signed-off-by: Macpaul Lin <macpaul.lin(a)mediatek.com> --- arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts index b2485ddfd33b..ff363ab925e9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts +++ b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts @@ -48,7 +48,7 @@ memory@40000000 { device_type = "memory"; - reg = <0 0x40000000 0 0x80000000>; + reg = <0 0x40000000 0x2 0x00000000>; }; reserved-memory { -- 2.18.0

8 months, 2 weeks

2
9
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2023