January 2024 - Linux-stable-mirror

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.71 kernel. All users of the 6.1 kernel series must upgrade. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/am33xx.dtsi | 1 drivers/base/property.c | 11 drivers/iio/imu/adis16475.c | 117 ++-- drivers/spi/spi-atmel.c | 82 ++- drivers/spi/spi.c | 92 ++- drivers/usb/host/fotg210-hcd.c | 3 fs/namei.c | 125 +++- fs/nfsd/nfsctl.c | 9 fs/nfsd/nfsd.h | 8 fs/nfsd/nfssvc.c | 57 -- fs/smb/common/smb2pdu.h | 1 fs/smb/server/Kconfig | 10 fs/smb/server/asn1.c | 27 fs/smb/server/auth.c | 11 fs/smb/server/connection.c | 74 -- fs/smb/server/connection.h | 2 fs/smb/server/ksmbd_netlink.h | 4 fs/smb/server/ksmbd_work.c | 100 +++ fs/smb/server/ksmbd_work.h | 36 - fs/smb/server/mgmt/share_config.h | 29 - fs/smb/server/mgmt/tree_connect.c | 53 + fs/smb/server/mgmt/tree_connect.h | 14 fs/smb/server/mgmt/user_config.h | 1 fs/smb/server/mgmt/user_session.c | 38 - fs/smb/server/mgmt/user_session.h | 3 fs/smb/server/oplock.c | 147 ++++- fs/smb/server/oplock.h | 8 fs/smb/server/server.c | 36 - fs/smb/server/smb2misc.c | 19 fs/smb/server/smb2ops.c | 19 fs/smb/server/smb2pdu.c | 1033 ++++++++++++++++---------------------- fs/smb/server/smb2pdu.h | 3 fs/smb/server/smb_common.c | 19 fs/smb/server/smb_common.h | 14 fs/smb/server/smbacl.c | 20 fs/smb/server/smbacl.h | 2 fs/smb/server/transport_ipc.c | 4 fs/smb/server/transport_rdma.c | 44 + fs/smb/server/unicode.c | 193 ++++--- fs/smb/server/vfs.c | 608 +++++++++++----------- fs/smb/server/vfs.h | 52 - fs/smb/server/vfs_cache.c | 63 +- fs/smb/server/vfs_cache.h | 18 include/linux/blkdev.h | 2 include/linux/export-internal.h | 1 include/linux/module.h | 9 include/linux/namei.h | 7 include/linux/property.h | 7 include/linux/spi/spi.h | 23 kernel/module/kallsyms.c | 2 kernel/trace/ring_buffer.c | 140 +---- kernel/trace/trace.c | 20 kernel/trace/trace_kprobe.c | 25 mm/filemap.c | 9 mm/memory-failure.c | 8 mm/migrate.c | 9 net/netfilter/nf_tables_api.c | 2 58 files changed, 1981 insertions(+), 1495 deletions(-) Al Viro (1): fs: introduce lock_rename_child() helper Amit Kumar Mahapatra (1): spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod Andrii Nakryiko (1): tracing/kprobes: Fix symbol counting logic by looking at modules as well Andy Shevchenko (2): spi: Introduce spi_get_device_match_data() helper device property: Allow const parameter to dev_fwnode() Atte Heikkilä (1): ksmbd: fix `force create mode' and `force directory mode' Baokun Li (1): mm/filemap: avoid buffered read/write race to read inconsistent data Charan Teja Kalla (1): mm: migrate high-order folios in swap cache correctly Cheng-Han Wu (1): ksmbd: Remove unused field in ksmbd_user struct Christoph Hellwig (1): block: renumber QUEUE_FLAG_HW_WC Colin Ian King (1): ksmbd: Fix spelling mistake "excceed" -> "exceeded" Dan Carpenter (1): usb: fotg210-hcd: delete an incorrect bounds test David Disseldorp (3): ksmbd: set NegotiateContextCount once instead of every inc ksmbd: avoid duplicate negotiate ctx offset increments ksmbd: remove unused compression negotiate ctx packing Dawei Li (3): ksmbd: Implements sess->rpc_handle_list as xarray ksmbd: fix typo, syncronous->synchronous ksmbd: Remove duplicated codes Geert Uytterhoeven (1): spi: Constify spi parameters of chip select APIs Greg Kroah-Hartman (1): Linux 6.1.71 Gustavo A. R. Silva (3): ksmbd: replace one-element arrays with flexible-array members ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() ksmbd: Replace one-element array with flexible-array member Helge Deller (1): linux/export: Ensure natural alignment of kcrctab array Jeff Layton (1): ksmbd: use F_SETLK when unlocking a file Jiapeng Chong (1): ksmbd: Fix parameter name and comment mismatch Jiri Olsa (1): kallsyms: Make module_kallsyms_on_each_symbol generally available Kangjing Huang (1): ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev() Louis Chauvet (1): spi: atmel: Fix clock issue when using devices with different polarities Lu Hongfei (2): ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void ksmbd: Replace the ternary conditional operator with min() Marios Makassikis (2): ksmbd: Fix resource leak in smb2_lock() ksmbd: fix recursive locking in vfs helpers Matthew Wilcox (Oracle) (2): mm/memory-failure: cast index to loff_t before shifting it mm/memory-failure: check the mapcount of the precise page Namjae Jeon (46): ksmbd: set SMB2_SESSION_FLAG_ENCRYPT_DATA when enforcing data encryption for this share ksmbd: delete asynchronous work from list ksmbd: fix racy issue from using ->d_parent and ->d_name ksmbd: fix uninitialized pointer read in ksmbd_vfs_rename() ksmbd: fix uninitialized pointer read in smb2_create_link() ksmbd: call putname after using the last component ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR() ksmbd: add mnt_want_write to ksmbd vfs functions ksmbd: remove unused ksmbd_tree_conn_share function ksmbd: use kzalloc() instead of __GFP_ZERO ksmbd: return a literal instead of 'err' in ksmbd_vfs_kern_path_locked() ksmbd: use kvzalloc instead of kvmalloc ksmbd: check if a mount point is crossed during path lookup ksmbd: add support for read compound ksmbd: fix wrong interim response on compound ksmbd: add missing calling smb2_set_err_rsp() on error ksmbd: remove unneeded mark_inode_dirty in set_info_sec() ksmbd: fix passing freed memory 'aux_payload_buf' ksmbd: return invalid parameter error response if smb2 request is invalid ksmbd: check iov vector index in ksmbd_conn_write() ksmbd: fix race condition with fp ksmbd: fix race condition from parallel smb2 logoff requests ksmbd: fix race condition from parallel smb2 lock requests ksmbd: fix race condition between tree conn lookup and disconnect ksmbd: fix wrong error response status by using set_smb2_rsp_status() ksmbd: fix Null pointer dereferences in ksmbd_update_fstate() ksmbd: fix potential double free on smb2_read_pipe() error path ksmbd: reorganize ksmbd_iov_pin_rsp() ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr() ksmbd: add support for surrogate pair conversion ksmbd: no need to wait for binded connection termination at logoff ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked() ksmbd: fix possible deadlock in smb2_open ksmbd: separately allocate ci per dentry ksmbd: move oplock handling after unlock parent dir ksmbd: release interim response after sending status pending response ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error ksmbd: set epoch in create context v2 lease ksmbd: set v2 lease capability ksmbd: downgrade RWH lease caching state to RH for directory ksmbd: send v2 lease break notification for directory ksmbd: lazy v2 lease break on smb2_write() ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() ksmbd: fix wrong allocation size update in smb2_open() ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() NeilBrown (3): nfsd: separate nfsd_last_thread() from nfsd_put() nfsd: call nfsd_last_thread() before final nfsd_put() NFSD: fix possible oops when nfsd/pool_stats is closed. Nuno Sa (1): iio: imu: adis16475: add spi_device_id table Pablo Neira Ayuso (1): netfilter: nf_tables: skip set commit for deleted/destroyed sets Shin'ichiro Kawasaki (2): platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe" Steve French (2): ksmbd: update Kconfig to note Kerberos support and fix indentation ksmbd: remove experimental warning Steven Rostedt (Google) (4): ring-buffer: Fix wake ups when buffer_percent is set to 100 tracing: Fix blocked reader of snapshot buffer ring-buffer: Remove useless update to write_stamp in rb_try_to_discard() ring-buffer: Fix slowpath of interrupted event Tom Rix (1): ksmbd: remove unused is_char_allowed function Tony Lindgren (1): ARM: dts: Fix occasional boot hang for am3 usb Tudor Ambarus (1): spi: Reintroduce spi_set_cs_timing() Wang Ming (1): ksmbd: Fix unsigned expression compared with zero Yang Li (1): ksmbd: Fix one kernel-doc comment Yang Yingliang (1): ksmbd: switch to use kmemdup_nul() helper Zongmin Zhou (1): ksmbd: prevent memory leak on error return ye xingchen (1): ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs

1 year, 11 months

1
1
0 0

Linux 5.15.146

by Greg Kroah-Hartman

I'm announcing the release of the 5.15.146 kernel. All users of the 5.15 kernel series must upgrade. The updated 5.15.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml | 10 Makefile | 2 arch/arm/boot/dts/am33xx.dtsi | 1 arch/arm/boot/dts/dra7.dtsi | 2 arch/arm/mach-omap2/id.c | 5 arch/arm64/kvm/arm.c | 2 arch/arm64/kvm/vgic/vgic-init.c | 5 arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 arch/arm64/kvm/vgic/vgic.h | 1 arch/s390/include/asm/fpu/api.h | 2 arch/x86/kernel/alternative.c | 2 arch/x86/net/bpf_jit_comp.c | 46 + drivers/base/property.c | 13 drivers/bus/ti-sysc.c | 18 drivers/gpio/gpio-dwapb.c | 12 drivers/gpio/gpiolib-cdev.c | 16 drivers/gpu/drm/i915/display/intel_atomic.c | 193 ------- drivers/gpu/drm/i915/display/intel_atomic.h | 4 drivers/gpu/drm/i915/display/skl_scaler.c | 257 ++++++++++ drivers/gpu/drm/i915/display/skl_scaler.h | 10 drivers/i2c/busses/i2c-aspeed.c | 48 + drivers/iio/adc/ti_am335x_adc.c | 4 drivers/iio/buffer/industrialio-triggered-buffer.c | 10 drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 drivers/iio/imu/adis16475.c | 117 ++-- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 drivers/input/keyboard/ipaq-micro-keys.c | 3 drivers/input/misc/soc_button_array.c | 5 drivers/interconnect/core.c | 3 drivers/md/dm-integrity.c | 11 drivers/net/ethernet/actions/owl-emac.c | 2 drivers/net/ethernet/adaptec/starfire.c | 10 drivers/net/ethernet/alacritech/slicoss.c | 2 drivers/net/ethernet/alteon/acenic.c | 4 drivers/net/ethernet/altera/altera_tse_main.c | 2 drivers/net/ethernet/amd/nmclan_cs.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 2 drivers/net/ethernet/amd/xgbe/xgbe.h | 2 drivers/net/ethernet/apm/xgene-v2/mac.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 2 drivers/net/ethernet/apple/bmac.c | 8 drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 6 drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 2 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 2 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 drivers/net/ethernet/broadcom/b44.c | 6 drivers/net/ethernet/broadcom/bcmsysport.c | 2 drivers/net/ethernet/broadcom/bgmac.c | 2 drivers/net/ethernet/broadcom/bnx2.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 drivers/net/ethernet/calxeda/xgmac.c | 2 drivers/net/ethernet/chelsio/cxgb/gmac.h | 2 drivers/net/ethernet/chelsio/cxgb/pm3393.c | 2 drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 drivers/net/ethernet/chelsio/cxgb3/common.h | 2 drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 2 drivers/net/ethernet/cisco/enic/enic_pp.c | 2 drivers/net/ethernet/dlink/dl2k.c | 2 drivers/net/ethernet/dnet.c | 6 drivers/net/ethernet/emulex/benet/be_cmds.c | 2 drivers/net/ethernet/emulex/benet/be_cmds.h | 2 drivers/net/ethernet/emulex/benet/be_main.c | 2 drivers/net/ethernet/ethoc.c | 2 drivers/net/ethernet/fealnx.c | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 drivers/net/ethernet/freescale/fman/fman_dtsec.h | 2 drivers/net/ethernet/freescale/fman/fman_memac.c | 8 drivers/net/ethernet/freescale/fman/fman_memac.h | 2 drivers/net/ethernet/freescale/fman/fman_tgec.c | 8 drivers/net/ethernet/freescale/fman/fman_tgec.h | 2 drivers/net/ethernet/freescale/fman/mac.h | 2 drivers/net/ethernet/hisilicon/hisi_femac.c | 2 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 5 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 drivers/net/ethernet/i825xx/sun3_82586.c | 2 drivers/net/ethernet/intel/i40e/i40e.h | 2 drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 2 drivers/net/ethernet/marvell/mv643xx_eth.c | 2 drivers/net/ethernet/marvell/mvneta.c | 4 drivers/net/ethernet/marvell/pxa168_eth.c | 6 drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c | 1 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 30 - drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 drivers/net/ethernet/micrel/ks8842.c | 2 drivers/net/ethernet/micrel/ks8851.h | 3 drivers/net/ethernet/micrel/ks8851_common.c | 20 drivers/net/ethernet/micrel/ks8851_spi.c | 42 + drivers/net/ethernet/micrel/ksz884x.c | 4 drivers/net/ethernet/microsoft/Kconfig | 1 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 drivers/net/ethernet/neterion/s2io.c | 2 drivers/net/ethernet/neterion/s2io.h | 2 drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 6 drivers/net/ethernet/nxp/lpc_eth.c | 2 drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 2 drivers/net/ethernet/qlogic/qed/qed_l2.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.h | 2 drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 drivers/net/ethernet/qlogic/qed/qed_vf.c | 2 drivers/net/ethernet/qlogic/qed/qed_vf.h | 4 drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 drivers/net/ethernet/rdc/r6040.c | 12 drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 3 drivers/net/ethernet/sfc/ef10.c | 4 drivers/net/ethernet/sfc/ef10_sriov.c | 2 drivers/net/ethernet/sfc/ef10_sriov.h | 6 drivers/net/ethernet/sfc/net_driver.h | 2 drivers/net/ethernet/sfc/siena_sriov.c | 2 drivers/net/ethernet/sfc/siena_sriov.h | 2 drivers/net/ethernet/sis/sis900.c | 2 drivers/net/ethernet/smsc/smsc911x.c | 2 drivers/net/ethernet/smsc/smsc9420.c | 2 drivers/net/ethernet/stmicro/stmmac/common.h | 4 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 2 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 3 drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 drivers/net/ethernet/sun/sunbmac.c | 2 drivers/net/ethernet/sun/sunqe.c | 2 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 2 drivers/net/ethernet/synopsys/dwc-xlgmac.h | 2 drivers/net/ethernet/ti/tlan.c | 4 drivers/net/ethernet/toshiba/tc35815.c | 3 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 7 drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 drivers/net/phy/mscc/mscc_main.c | 2 drivers/net/usb/aqc111.c | 2 drivers/net/usb/ax88179_178a.c | 224 ++++---- drivers/net/usb/catc.c | 2 drivers/net/usb/dm9601.c | 3 drivers/net/usb/mcs7830.c | 3 drivers/net/usb/sr9700.c | 3 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 drivers/pinctrl/pinctrl-at91-pio4.c | 8 drivers/reset/core.c | 8 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 drivers/scsi/scsi_error.c | 2 drivers/spi/spi.c | 12 drivers/usb/host/fotg210-hcd.c | 3 drivers/usb/serial/ftdi_sio.c | 6 drivers/usb/serial/ftdi_sio_ids.h | 6 drivers/usb/serial/option.c | 5 fs/Kconfig | 4 fs/afs/cell.c | 67 +- fs/afs/cmservice.c | 2 fs/afs/dynroot.c | 31 - fs/afs/internal.h | 18 fs/afs/proc.c | 6 fs/afs/rxrpc.c | 26 - fs/afs/server.c | 40 - fs/afs/vl_list.c | 19 fs/afs/volume.c | 47 + fs/cifs/misc.c | 4 fs/cifs/smb2misc.c | 26 - fs/cifs/smb2ops.c | 26 - fs/cifs/smb2pdu.c | 29 - fs/cifs/smb2pdu.h | 2 fs/fuse/fuse_i.h | 15 fs/fuse/inode.c | 75 ++ fs/ksmbd/oplock.c | 115 ++++ fs/ksmbd/oplock.h | 8 fs/ksmbd/smb2misc.c | 15 fs/ksmbd/smb2ops.c | 9 fs/ksmbd/smb2pdu.c | 61 +- fs/ksmbd/smb2pdu.h | 1 fs/ksmbd/vfs.c | 3 fs/ksmbd/vfs_cache.c | 13 fs/ksmbd/vfs_cache.h | 3 include/linux/bpf.h | 3 include/linux/key-type.h | 1 include/linux/property.h | 9 include/linux/qed/qed_eth_if.h | 2 include/linux/qed/qed_if.h | 2 include/linux/qed/qed_rdma_if.h | 3 include/linux/spi/spi.h | 3 include/net/bluetooth/hci_core.h | 5 include/trace/events/afs.h | 26 - kernel/bpf/arraymap.c | 58 -- kernel/trace/ring_buffer.c | 136 +---- kernel/trace/synth_event_gen_test.c | 11 kernel/trace/trace.c | 20 lib/vsprintf.c | 11 mm/filemap.c | 9 net/8021q/vlan_core.c | 9 net/9p/protocol.c | 17 net/bluetooth/af_bluetooth.c | 7 net/bluetooth/hci_event.c | 3 net/bluetooth/l2cap_core.c | 21 net/bluetooth/mgmt.c | 25 net/bluetooth/smp.c | 7 net/core/dev.c | 3 net/dns_resolver/dns_key.c | 10 net/ife/ife.c | 1 net/mac80211/mesh_plink.c | 10 net/netfilter/nf_tables_api.c | 2 net/rfkill/rfkill-gpio.c | 8 net/rose/af_rose.c | 39 + net/wireless/certs/wens.hex | 87 +++ security/keys/gc.c | 31 - security/keys/internal.h | 11 security/keys/key.c | 15 security/keys/proc.c | 2 sound/soc/codecs/hdmi-codec.c | 12 sound/usb/quirks.c | 4 243 files changed, 1795 insertions(+), 1078 deletions(-) Alexander Atanasov (1): scsi: core: Always send batch on reset or error handling command Alexis Lothoré (1): pinctrl: at91-pio4: use dedicated lock class for IRQ Alper Ak (1): USB: serial: option: add Quectel EG912Y module support Andrew Davis (1): ARM: dts: dra7: Fix DRA7 L3 NoC node register size Andy Shevchenko (3): device property: Add const qualifier to device_get_match_data() parameter spi: Introduce spi_get_device_match_data() helper device property: Allow const parameter to dev_fwnode() Baokun Li (1): mm/filemap: avoid buffered read/write race to read inconsistent data Chen-Yu Tsai (1): wifi: cfg80211: Add my certificate Christoffer Sandberg (1): Input: soc_button_array - add mapping for airplane mode button Dan Carpenter (1): usb: fotg210-hcd: delete an incorrect bounds test David Howells (6): afs: Fix the dynamic root's d_delete to always delete unused dentries afs: Fix dynamic root lookup DNS check keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry afs: Fix overwriting of result of DNS query afs: Use refcount_t rather than atomic_t afs: Fix use-after-free due to get/remove race in volume tree David Lechner (1): iio: triggered-buffer: prevent possible freeing of wrong buffer Dinghao Liu (1): net/mlx5e: fix a potential double-free in fs_udp_create_groups Eric Dumazet (3): net: sched: ife: fix potential use-after-free net/rose: fix races in rose_kill_by_device() net: check dev->gso_max_size in gso_features_check() Fabio Estevam (1): dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp Fedor Pchelkin (1): net: 9p: avoid freeing uninit memory in p9pdu_vreadf Frédéric Danis (1): Bluetooth: L2CAP: Send reject on command corrupted request Geert Uytterhoeven (1): reset: Fix crash when freeing non-existent optional resets Greg Kroah-Hartman (1): Linux 5.15.146 Haoran Liu (1): Input: ipaq-micro-keys - add error handling for devm_kmemdup Heiko Carstens (1): s390/vx: fix save/restore of fpu kernel context Herve Codina (1): lib/vsprintf: Fix %pfwf when current node refcount == 0 Hyunwoo Kim (1): Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg Jakub Kicinski (1): ethernet: constify references to netdev->dev_addr in drivers Javier Carrasco (1): iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table Jeremie Knuesel (1): ALSA: usb-audio: Increase delay in MOTU M quirk Jerome Brunet (1): ASoC: hdmi-codec: fix missing report for jack initial status Jiri Olsa (1): bpf: Fix prog_array_map_poke_run map poke update Johannes Berg (3): wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock wifi: mac80211: mesh_plink: fix matches_local logic wifi: cfg80211: fix certs build to not depend on file order Jose Ignacio Tornos Martinez (1): net: usb: ax88179_178a: avoid failed operations when device is disconnected Justin Chen (2): net: usb: ax88179_178a: clean up pm calls net: usb: ax88179_178a: wol optimizations Kent Gibson (1): gpiolib: cdev: add gpio_device locking wrapper around gpio_ioctl() Krister Johansen (1): fuse: share lookup state between submount and its parent Kunwu Chan (1): ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init Liu Jian (1): net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() Luca Coelho (1): drm/i915/mtl: limit second scaler vertical scaling in ver >= 14 Luiz Augusto von Dentz (1): Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent Marc Zyngier (1): KVM: arm64: vgic: Force vcpu vgic teardown on vcpu destroy Mark Glover (1): USB: serial: ftdi_sio: update Actisense PIDs constant names Mike Tipton (1): interconnect: Treat xlate() returning NULL node as an error Mikulas Patocka (1): dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata() Moshe Shemesh (1): net/mlx5: Fix fw tracer first block check Namjae Jeon (10): ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE ksmbd: have a dependency on cifs ARC4 ksmbd: set epoch in create context v2 lease ksmbd: set v2 lease capability ksmbd: downgrade RWH lease caching state to RH for directory ksmbd: send v2 lease break notification for directory ksmbd: lazy v2 lease break on smb2_write() ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() ksmbd: fix wrong allocation size update in smb2_open() ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() Nuno Sa (1): iio: imu: adis16475: add spi_device_id table Pablo Neira Ayuso (1): netfilter: nf_tables: skip set commit for deleted/destroyed sets Paulo Alcantara (4): smb: client: fix NULL deref in asn1_ber_decoder() smb: client: fix OOB in smb2_query_reparse_point() smb: client: fix OOB in SMB2_query_info_init() smb: client: fix OOB in smbCalcSize() Quan Nguyen (1): i2c: aspeed: Handle the coalesced stop conditions with the start conditions. Rahul Rameshbabu (1): net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors Reinhard Speyerer (1): USB: serial: option: add Quectel RM500Q R13 firmware support Ronald Wahl (1): net: ks8851: Fix TX stall caused by TX buffer overrun Rouven Czerwinski (1): net: rfkill: gpio: set GPIO direction Shifeng Li (1): net/mlx5e: Fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list() Slark Xiao (1): USB: serial: option: add Foxconn T99W265 with new baseline Steven Rostedt (Google) (5): tracing / synthetic: Disable events after testing in synth_event_gen_test_init() ring-buffer: Fix wake ups when buffer_percent is set to 100 tracing: Fix blocked reader of snapshot buffer ring-buffer: Remove useless update to write_stamp in rb_try_to_discard() ring-buffer: Fix slowpath of interrupted event Su Hui (1): iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw Thomas Gleixner (1): x86/alternatives: Sync core before enabling interrupts Tony Lindgren (2): bus: ti-sysc: Flush posted write only after srst_udelay ARM: dts: Fix occasional boot hang for am3 usb Ville Syrjälä (2): drm/i915: Relocate intel_atomic_setup_scalers() drm/i915: Fix intel_atomic_setup_scalers() plane_state handling Vlad Buslov (2): Revert "net/mlx5e: fix double free of encap_header in update funcs" Revert "net/mlx5e: fix double free of encap_header" Wadim Egorov (1): iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() Wei Yongjun (1): scsi: bnx2fc: Fix skb double free in bnx2fc_rcv() Xiao Yao (1): Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE Yury Norov (1): net: mana: select PAGE_POOL Zhipeng Lu (1): ethernet: atheros: fix a memleak in atl1e_setup_ring_resources xiongxin (1): gpio: dwapb: mask/unmask IRQ when disable/enale it

1 year, 11 months

1
1
0 0

[PATCH v2] PM / devfreq: Fix buffer overflow in trans_stat_show

by Christian Marangi

Fix buffer overflow in trans_stat_show(). Convert simple snprintf to the more secure sysfs_emit. Add condition checking if we are exceeding PAGE_SIZE and exit early from loop. Also add at the end a warning that we exceeded PAGE_SIZE and that stats is disabled. Return -EFBIG in the case where we don't have enough space to write the full transition table. Also document in the ABI that this function can return -EFBIG error. Cc: stable(a)vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218041 Fixes: e552bbaf5b98 ("PM / devfreq: Add sysfs node for representing frequency transition information.") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> --- Changes v2: - Squash and use directly sysfs_emit - Fix typo for df->freq_table[2] - Reduce check of PAGE_SIZE to only at the start of for loops Documentation/ABI/testing/sysfs-class-devfreq | 3 ++ drivers/devfreq/devfreq.c | 47 ++++++++++++------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-devfreq b/Documentation/ABI/testing/sysfs-class-devfreq index 5e6b74f30406..1e7e0bb4c14e 100644 --- a/Documentation/ABI/testing/sysfs-class-devfreq +++ b/Documentation/ABI/testing/sysfs-class-devfreq @@ -52,6 +52,9 @@ Description: echo 0 > /sys/class/devfreq/.../trans_stat + If the transition table is bigger than PAGE_SIZE, reading + this will return an -EFBIG error. + What: /sys/class/devfreq/.../available_frequencies Date: October 2012 Contact: Nishanth Menon <nm(a)ti.com> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 63347a5ae599..3b8019ab523d 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1688,7 +1688,7 @@ static ssize_t trans_stat_show(struct device *dev, struct device_attribute *attr, char *buf) { struct devfreq *df = to_devfreq(dev); - ssize_t len; + ssize_t len = 0; int i, j; unsigned int max_state; @@ -1697,7 +1697,7 @@ static ssize_t trans_stat_show(struct device *dev, max_state = df->max_state; if (max_state == 0) - return sprintf(buf, "Not Supported.\n"); + return sysfs_emit(buf, "Not Supported.\n"); mutex_lock(&df->lock); if (!df->stop_polling && @@ -1707,31 +1707,44 @@ static ssize_t trans_stat_show(struct device *dev, } mutex_unlock(&df->lock); - len = sprintf(buf, " From : To\n"); - len += sprintf(buf + len, " :"); - for (i = 0; i < max_state; i++) - len += sprintf(buf + len, "%10lu", - df->freq_table[i]); + len += sysfs_emit_at(buf, len, " From : To\n"); + len += sysfs_emit_at(buf, len, " :"); + for (i = 0; i < max_state; i++) { + if (len >= PAGE_SIZE - 1) + break; + len += sysfs_emit_at(buf, len, "%10lu", + df->freq_table[i]); + } - len += sprintf(buf + len, " time(ms)\n"); + len += sysfs_emit_at(buf, len, " time(ms)\n"); for (i = 0; i < max_state; i++) { + if (len >= PAGE_SIZE - 1) + break; if (df->freq_table[i] == df->previous_freq) - len += sprintf(buf + len, "*"); + len += sysfs_emit_at(buf, len, "*"); else - len += sprintf(buf + len, " "); + len += sysfs_emit_at(buf, len, " "); - len += sprintf(buf + len, "%10lu:", df->freq_table[i]); - for (j = 0; j < max_state; j++) - len += sprintf(buf + len, "%10u", + len += sysfs_emit_at(buf, len, "%10lu:", df->freq_table[i]); + for (j = 0; j < max_state; j++) { + if (len >= PAGE_SIZE - 1) + break; + len += sysfs_emit_at(buf, len, "%10u", df->stats.trans_table[(i * max_state) + j]); + } + + len += sysfs_emit_at(buf, len, "%10llu\n", (u64) + jiffies64_to_msecs(df->stats.time_in_state[i])); + } - len += sprintf(buf + len, "%10llu\n", (u64) - jiffies64_to_msecs(df->stats.time_in_state[i])); + len += sysfs_emit_at(buf, len, "Total transition : %u\n", + df->stats.total_trans); + if (len >= PAGE_SIZE - 1) { + pr_warn_once("devfreq transition table exceeds PAGE_SIZE. Disabling\n"); + return -EFBIG; } - len += sprintf(buf + len, "Total transition : %u\n", - df->stats.total_trans); return len; } -- 2.43.0

1 year, 11 months

1
0
0 0

FAILED: patch "[PATCH] block: Don't invalidate pagecache for invalid falloc modes" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-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-4.14.y git checkout FETCH_HEAD git cherry-pick -x 1364a3c391aedfeb32aa025303ead3d7c91cdf9d # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101517-patriarch-reuse-cc1c@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 1364a3c391ae ("block: Don't invalidate pagecache for invalid falloc modes") 05bdb9965305 ("block: replace fmode_t with a block-specific type for block open flags") 5e4ea834676e ("block: remove unused fmode_t arguments from ioctl handlers") cfb425761c79 ("block: move a few internal definitions out of blkdev.h") 99b07780814e ("rnbd-srv: replace sess->open_flags with a "bool readonly"") 658afed19cee ("mtd: block: use a simple bool to track open for write") 7d9d7d59d44b ("nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool") 2e80089c1824 ("scsi: replace the fmode_t argument to scsi_ioctl with a simple bool") 5f4eb9d5413f ("scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool") 81b1fb7d17c0 ("fs: remove sb->s_mode") 3f0b3e785e8b ("block: add a sb_open_mode helper") 2736e8eeb0cc ("block: use the holder as indication for exclusive opens") 2ef789288afd ("btrfs: don't pass a holder for non-exclusive blkdev_get_by_path") 29499ab060fe ("bcache: don't pass a stack address to blkdev_get_by_path") c889d0793d9d ("swsusp: don't pass a stack address to blkdev_get_by_path") ae220766d87c ("block: remove the unused mode argument to ->release") d32e2bf83791 ("block: pass a gendisk to ->open") 444aa2c58cb3 ("block: pass a gendisk on bdev_check_media_change") 7ae24fcee992 ("cdrom: remove the unused mode argument to cdrom_release") 473399b50de1 ("cdrom: remove the unused mode argument to cdrom_ioctl") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1364a3c391aedfeb32aa025303ead3d7c91cdf9d Mon Sep 17 00:00:00 2001 From: Sarthak Kukreti <sarthakkukreti(a)chromium.org> Date: Wed, 11 Oct 2023 13:12:30 -0700 Subject: [PATCH] block: Don't invalidate pagecache for invalid falloc modes Only call truncate_bdev_range() if the fallocate mode is supported. This fixes a bug where data in the pagecache could be invalidated if the fallocate() was called on the block device with an invalid mode. Fixes: 25f4c41415e5 ("block: implement (some of) fallocate for block devices") Cc: stable(a)vger.kernel.org Reported-by: "Darrick J. Wong" <djwong(a)kernel.org> Signed-off-by: Sarthak Kukreti <sarthakkukreti(a)chromium.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: "Darrick J. Wong" <djwong(a)kernel.org> Signed-off-by: Mike Snitzer <snitzer(a)kernel.org> Fixes: line? I've never seen those wrapped. Link: https://lore.kernel.org/r/20231011201230.750105-1-sarthakkukreti@chromium.o… Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/block/fops.c b/block/fops.c index acff3d5d22d4..73e42742543f 100644 --- a/block/fops.c +++ b/block/fops.c @@ -772,24 +772,35 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, filemap_invalidate_lock(inode->i_mapping); - /* Invalidate the page cache, including dirty pages. */ - error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); - if (error) - goto fail; - + /* + * Invalidate the page cache, including dirty pages, for valid + * de-allocate mode calls to fallocate(). + */ switch (mode) { case FALLOC_FL_ZERO_RANGE: case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOUNMAP); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL); break;

1 year, 11 months

3
2
0 0

[PATCH v8 7/7] serial: 8250_exar: Set missing rs485_supported flag

by Lino Sanfilippo

The UART supports an auto-RTS mode in which the RTS pin is automatically activated during transmission. So mark this mode as being supported even if RTS is not controlled by the driver but the UART. Also the serial core expects now at least one of both modes rts-on-send or rts-after-send to be supported. This is since during sanitization unsupported flags are deleted from a RS485 configuration set by userspace. However if the configuration ends up with both flags unset, the core prints a warning since it considers such a configuration invalid (see uart_sanitize_serial_rs485()). Cc: stable(a)vger.kernel.org Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/8250/8250_exar.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 6085d356ad86..23366f868ae3 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -480,7 +480,7 @@ static int sealevel_rs485_config(struct uart_port *port, struct ktermios *termio } static const struct serial_rs485 generic_rs485_supported = { - .flags = SER_RS485_ENABLED, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND, }; static const struct exar8250_platform exar8250_default_platform = { @@ -524,7 +524,8 @@ static int iot2040_rs485_config(struct uart_port *port, struct ktermios *termios } static const struct serial_rs485 iot2040_rs485_supported = { - .flags = SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | + SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, }; static const struct property_entry iot2040_gpio_properties[] = { -- 2.43.0

1 year, 11 months

1
0
0 0

[PATCH v8 6/7] serial: omap: do not override settings for RS485 support

by Lino Sanfilippo

The drivers RS485 support is deactivated if there is no RTS GPIO available. This is done by nullifying the ports rs485_supported struct. After that however the settings in serial_omap_rs485_supported are assigned to the same structure unconditionally, which results in an unintended reactivation of RS485 support. Fix this by moving the assignment to the beginning of serial_omap_probe_rs485() and thus before the check for the RTS GPIO. Also relocate the assignment of serial_omap_config_rs485() to have the complete RS485 setup in one function. Fixes: e2752ae3cfc9 ("serial: omap: Disallow RS-485 if rts-gpio is not specified") Cc: stable(a)vger.kernel.org Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/omap-serial.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index ad4c1c5d0a7f..f4c6ff806465 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1483,6 +1483,13 @@ static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev) return omap_up_info; } +static const struct serial_rs485 serial_omap_rs485_supported = { + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND | + SER_RS485_RX_DURING_TX, + .delay_rts_before_send = 1, + .delay_rts_after_send = 1, +}; + static int serial_omap_probe_rs485(struct uart_omap_port *up, struct device *dev) { @@ -1497,6 +1504,9 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up, if (!np) return 0; + up->port.rs485_config = serial_omap_config_rs485; + up->port.rs485_supported = serial_omap_rs485_supported; + ret = uart_get_rs485_mode(&up->port); if (ret) return ret; @@ -1531,13 +1541,6 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up, return 0; } -static const struct serial_rs485 serial_omap_rs485_supported = { - .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND | - SER_RS485_RX_DURING_TX, - .delay_rts_before_send = 1, - .delay_rts_after_send = 1, -}; - static int serial_omap_probe(struct platform_device *pdev) { struct omap_uart_port_info *omap_up_info = dev_get_platdata(&pdev->dev); @@ -1604,17 +1607,11 @@ static int serial_omap_probe(struct platform_device *pdev) dev_info(up->port.dev, "no wakeirq for uart%d\n", up->port.line); - ret = serial_omap_probe_rs485(up, &pdev->dev); - if (ret < 0) - goto err_rs485; - sprintf(up->name, "OMAP UART%d", up->port.line); up->port.mapbase = mem->start; up->port.membase = base; up->port.flags = omap_up_info->flags; up->port.uartclk = omap_up_info->uartclk; - up->port.rs485_config = serial_omap_config_rs485; - up->port.rs485_supported = serial_omap_rs485_supported; if (!up->port.uartclk) { up->port.uartclk = DEFAULT_CLK_SPEED; dev_warn(&pdev->dev, @@ -1622,6 +1619,10 @@ static int serial_omap_probe(struct platform_device *pdev) DEFAULT_CLK_SPEED); } + ret = serial_omap_probe_rs485(up, &pdev->dev); + if (ret < 0) + goto err_rs485; + up->latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; up->calc_latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; cpu_latency_qos_add_request(&up->pm_qos_request, up->latency); -- 2.43.0

1 year, 11 months

1
0
0 0

[PATCH v8 5/7] serial: core, imx: do not set RS485 enabled if it is not supported

by Lino Sanfilippo

If the imx driver cannot support RS485 it nullifies the ports rs485_supported structure. But it still calls uart_get_rs485_mode() which may set the RS485_ENABLED flag nevertheless. This may lead to an attempt to configure RS485 even if it is not supported when the flag is evaluated in uart_configure_port() at port startup. Avoid this by bailing out of uart_get_rs485_mode() if the RS485_ENABLED flag is not supported by the caller. With this fix a check for RTS availability is now obsolete in the imx driver, since it can not evaluate to true any more. So remove this check. Furthermore the explicit nullifcation of rs485_supported is not needed, since the memory has already been set to zeros at allocation. So remove this, too. Fixes: 00d7a00e2a6f ("serial: imx: Fill in rs485_supported") Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: stable(a)vger.kernel.org Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Suggested-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/imx.c | 7 ------- drivers/tty/serial/serial_core.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 9cffeb23112b..198ce7e7bc8b 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2206,7 +2206,6 @@ static enum hrtimer_restart imx_trigger_stop_tx(struct hrtimer *t) return HRTIMER_NORESTART; } -static const struct serial_rs485 imx_no_rs485 = {}; /* No RS485 if no RTS */ static const struct serial_rs485 imx_rs485_supported = { .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX, @@ -2290,8 +2289,6 @@ static int imx_uart_probe(struct platform_device *pdev) /* RTS is required to control the RS485 transmitter */ if (sport->have_rtscts || sport->have_rtsgpio) sport->port.rs485_supported = imx_rs485_supported; - else - sport->port.rs485_supported = imx_no_rs485; sport->port.flags = UPF_BOOT_AUTOCONF; timer_setup(&sport->timer, imx_uart_timeout, 0); @@ -2328,10 +2325,6 @@ static int imx_uart_probe(struct platform_device *pdev) return ret; } - if (sport->port.rs485.flags & SER_RS485_ENABLED && - (!sport->have_rtscts && !sport->have_rtsgpio)) - dev_err(&pdev->dev, "no RTS control, disabling rs485\n"); - /* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B) * signal cannot be set low during transmission in case the diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 28bcbc686c67..93e4e1693601 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3600,6 +3600,9 @@ int uart_get_rs485_mode(struct uart_port *port) u32 rs485_delay[2]; int ret; + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return 0; + ret = device_property_read_u32_array(dev, "rs485-rts-delay", rs485_delay, 2); if (!ret) { -- 2.43.0

1 year, 11 months

1
0
0 0

[PATCH v8 4/7] serial: core: make sure RS485 cannot be enabled when it is not supported

by Lino Sanfilippo

Some uart drivers specify a rs485_config() function and then decide later to disable RS485 support for some reason (e.g. imx and ar933). In these cases userspace may be able to activate RS485 via TIOCSRS485 nevertheless, since in uart_set_rs485_config() an existing rs485_config() function indicates that RS485 is supported. Make sure that this is not longer possible by checking the uarts rs485_supported.flags instead and bailing out if SER_RS485_ENABLED is not set. Furthermore instead of returning an empty structure return -ENOTTY if the RS485 configuration is requested via TIOCGRS485 but RS485 is not supported. This has a small impact on userspace visibility but it is consistent with the -ENOTTY error for TIOCGRS485. Fixes: e849145e1fdd ("serial: ar933x: Fill in rs485_supported") Fixes: 55e18c6b6d42 ("serial: imx: Remove serial_rs485 sanitization") Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: stable(a)vger.kernel.org Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/serial_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index f67fb6a04983..28bcbc686c67 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1469,7 +1469,7 @@ static int uart_set_rs485_config(struct tty_struct *tty, struct uart_port *port, int ret; unsigned long flags; - if (!port->rs485_config) + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) return -ENOTTY; if (copy_from_user(&rs485, rs485_user, sizeof(*rs485_user))) -- 2.43.0

1 year, 11 months

1
0
0 0

[PATCH v8 3/7] serial: core: fix sanitizing check for RTS settings

by Lino Sanfilippo

Among other things uart_sanitize_serial_rs485() tests the sanity of the RTS settings in a RS485 configuration that has been passed by userspace. If RTS-on-send and RTS-after-send are both set or unset the configuration is adjusted and RTS-after-send is disabled and RTS-on-send enabled. This however makes only sense if both RTS modes are actually supported by the driver. With commit be2e2cb1d281 ("serial: Sanitize rs485_struct") the code does take the driver support into account but only checks if one of both RTS modes are supported. This may lead to the errorneous result of RTS-on-send being set even if only RTS-after-send is supported. Fix this by changing the implemented logic: First clear all unsupported flags in the RS485 configuration, then adjust an invalid RTS setting by taking into account which RTS mode is supported. Cc: stable(a)vger.kernel.org Fixes: be2e2cb1d281 ("serial: Sanitize rs485_struct") Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/serial_core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 1204102d7162..f67fb6a04983 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1371,19 +1371,27 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4 return; } + rs485->flags &= supported_flags; + /* Pick sane settings if the user hasn't */ - if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) && - !(rs485->flags & SER_RS485_RTS_ON_SEND) == + if (!(rs485->flags & SER_RS485_RTS_ON_SEND) == !(rs485->flags & SER_RS485_RTS_AFTER_SEND)) { - dev_warn_ratelimited(port->dev, - "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", - port->name, port->line); - rs485->flags |= SER_RS485_RTS_ON_SEND; - rs485->flags &= ~SER_RS485_RTS_AFTER_SEND; - supported_flags |= SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND; - } + if (supported_flags & SER_RS485_RTS_ON_SEND) { + rs485->flags |= SER_RS485_RTS_ON_SEND; + rs485->flags &= ~SER_RS485_RTS_AFTER_SEND; - rs485->flags &= supported_flags; + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", + port->name, port->line); + } else { + rs485->flags |= SER_RS485_RTS_AFTER_SEND; + rs485->flags &= ~SER_RS485_RTS_ON_SEND; + + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_AFTER_SEND instead\n", + port->name, port->line); + } + } uart_sanitize_serial_rs485_delays(port, rs485); -- 2.43.0

1 year, 11 months

1
0
0 0

[PATCH v8 2/7] serial: core: set missing supported flag for RX during TX GPIO

by Lino Sanfilippo

If the RS485 feature RX-during-TX is supported by means of a GPIO set the according supported flag. Otherwise setting this feature from userspace may not be possible, since in uart_sanitize_serial_rs485() the passed RS485 configuration is matched against the supported features and unsupported settings are thereby removed and thus take no effect. Cc: stable(a)vger.kernel.org Fixes: 163f080eb717 ("serial: core: Add option to output RS485 RX_DURING_TX state via GPIO") Reviewed-by: Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/serial_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index d155131f221d..1204102d7162 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3642,6 +3642,8 @@ int uart_get_rs485_mode(struct uart_port *port) if (IS_ERR(desc)) return dev_err_probe(dev, PTR_ERR(desc), "Cannot get rs485-rx-during-tx-gpios\n"); port->rs485_rx_during_tx_gpio = desc; + if (port->rs485_rx_during_tx_gpio) + port->rs485_supported.flags |= SER_RS485_RX_DURING_TX; return 0; } -- 2.43.0

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2024