5.10.206-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainercover 5.10.206-rc1 review
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +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.10.206-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.206-rc1
Ville Baillie <[email protected]>
spi: atmel: Fix PDC transfer setup bug
Luiz Augusto von Dentz <[email protected]>
Bluetooth: SMP: Fix crash when receiving new connection when debug is enabled
Greg Kroah-Hartman <[email protected]>
Revert "MIPS: Loongson64: Enable DMA noncoherent support"
Francis Laniel <[email protected]>
tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
Mikulas Patocka <[email protected]>
dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata()
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: skip set commit for deleted/destroyed sets
Steven Rostedt (Google) <[email protected]>
tracing: Fix blocked reader of snapshot buffer
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix wake ups when buffer_percent is set to 100
Alexander Atanasov <[email protected]>
scsi: core: Always send batch on reset or error handling command
Bart Van Assche <[email protected]>
scsi: core: Use a structure member to track the SCSI command submitter
Bart Van Assche <[email protected]>
scsi: core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Martin K. Petersen <[email protected]>
scsi: core: Make scsi_get_lba() return the LBA
Bart Van Assche <[email protected]>
scsi: core: Introduce scsi_get_sector()
Martin K. Petersen <[email protected]>
scsi: core: Add scsi_prot_ref_tag() helper
Dan Sneddon <[email protected]>
spi: atmel: Fix CS and initialization bug
Dan Sneddon <[email protected]>
spi: atmel: Switch to transfer_one transfer method
Hyunwoo Kim <[email protected]>
Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg
Paulo Alcantara <[email protected]>
smb: client: fix OOB in smbCalcSize()
Paulo Alcantara <[email protected]>
smb: client: fix OOB in SMB2_query_info_init()
Dan Carpenter <[email protected]>
usb: fotg210-hcd: delete an incorrect bounds test
Xiao Yao <[email protected]>
Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE
Archie Pusaka <[email protected]>
Bluetooth: use inclusive language in SMP
Luiz Augusto von Dentz <[email protected]>
Bluetooth: SMP: Convert BT_ERR/BT_DBG to bt_dev_err/bt_dev_dbg
Tony Lindgren <[email protected]>
ARM: dts: Fix occasional boot hang for am3 usb
Hangyu Hua <[email protected]>
9p/net: fix possible memory leak in p9_check_errors()
Thomas Gleixner <[email protected]>
x86/alternatives: Sync core before enabling interrupts
Herve Codina <[email protected]>
lib/vsprintf: Fix %pfwf when current node refcount == 0
Tony Lindgren <[email protected]>
bus: ti-sysc: Flush posted write only after srst_udelay
Steven Rostedt (Google) <[email protected]>
tracing / synthetic: Disable events after testing in synth_event_gen_test_init()
Fabio Estevam <[email protected]>
dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp
Ronald Wahl <[email protected]>
net: ks8851: Fix TX stall caused by TX buffer overrun
Rouven Czerwinski <[email protected]>
net: rfkill: gpio: set GPIO direction
Fedor Pchelkin <[email protected]>
net: 9p: avoid freeing uninit memory in p9pdu_vreadf
Christoffer Sandberg <[email protected]>
Input: soc_button_array - add mapping for airplane mode button
Frédéric Danis <[email protected]>
Bluetooth: L2CAP: Send reject on command corrupted request
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent
Reinhard Speyerer <[email protected]>
USB: serial: option: add Quectel RM500Q R13 firmware support
Slark Xiao <[email protected]>
USB: serial: option: add Foxconn T99W265 with new baseline
Alper Ak <[email protected]>
USB: serial: option: add Quectel EG912Y module support
Mark Glover <[email protected]>
USB: serial: ftdi_sio: update Actisense PIDs constant names
Johannes Berg <[email protected]>
wifi: cfg80211: fix certs build to not depend on file order
Chen-Yu Tsai <[email protected]>
wifi: cfg80211: Add my certificate
Wadim Egorov <[email protected]>
iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()
Javier Carrasco <[email protected]>
iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table
Wei Yongjun <[email protected]>
scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()
Haoran Liu <[email protected]>
Input: ipaq-micro-keys - add error handling for devm_kmemdup
Konrad Dybcio <[email protected]>
interconnect: qcom: sm8250: Enable sync_state
Su Hui <[email protected]>
iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw
Mike Tipton <[email protected]>
interconnect: Treat xlate() returning NULL node as an error
Josef Bacik <[email protected]>
btrfs: do not allow non subvolume root targets for snapshot
Paulo Alcantara <[email protected]>
smb: client: fix NULL deref in asn1_ber_decoder()
Kai Vehmanen <[email protected]>
ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB
Kai Vehmanen <[email protected]>
ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10
Alexis Lothoré <[email protected]>
pinctrl: at91-pio4: use dedicated lock class for IRQ
Quan Nguyen <[email protected]>
i2c: aspeed: Handle the coalesced stop conditions with the start conditions.
David Howells <[email protected]>
afs: Fix overwriting of result of DNS query
David Howells <[email protected]>
keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry
Eric Dumazet <[email protected]>
net: check dev->gso_max_size in gso_features_check()
Heiner Kallweit <[email protected]>
net: warn if gso_type isn't set for a GSO SKB
David Howells <[email protected]>
afs: Fix dynamic root lookup DNS check
David Howells <[email protected]>
afs: Fix the dynamic root's d_delete to always delete unused dentries
Liu Jian <[email protected]>
net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
Eric Dumazet <[email protected]>
net/rose: fix races in rose_kill_by_device()
Zhipeng Lu <[email protected]>
ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
Eric Dumazet <[email protected]>
net: sched: ife: fix potential use-after-free
Rahul Rameshbabu <[email protected]>
net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors
Moshe Shemesh <[email protected]>
net/mlx5: Fix fw tracer first block check
Shifeng Li <[email protected]>
net/mlx5e: Fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list()
Vlad Buslov <[email protected]>
Revert "net/mlx5e: fix double free of encap_header"
Johannes Berg <[email protected]>
wifi: mac80211: mesh_plink: fix matches_local logic
Heiko Carstens <[email protected]>
s390/vx: fix save/restore of fpu kernel context
Geert Uytterhoeven <[email protected]>
reset: Fix crash when freeing non-existent optional resets
Kunwu Chan <[email protected]>
ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
Paulo Alcantara <[email protected]>
smb: client: fix OOB in smb2_query_reparse_point()
Namjae Jeon <[email protected]>
ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE
-------------
Diffstat:
.../devicetree/bindings/nvmem/mxs-ocotp.yaml | 10 +- Makefile | 4 +- arch/arm/boot/dts/am33xx.dtsi | 1 + arch/arm/mach-omap2/id.c | 5 + arch/mips/Kconfig | 2 - arch/mips/include/asm/mach-loongson64/boot_param.h | 3 +- arch/mips/loongson64/env.c | 10 +- arch/s390/include/asm/fpu/api.h | 2 +- arch/x86/kernel/alternative.c | 2 +- drivers/bus/ti-sysc.c | 18 ++- drivers/i2c/busses/i2c-aspeed.c | 48 ++++-- drivers/iio/adc/ti_am335x_adc.c | 4 +- drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- 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/interconnect/qcom/sm8250.c | 1 + drivers/md/dm-integrity.c | 11 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +- .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +- drivers/net/ethernet/micrel/ks8851.h | 3 + drivers/net/ethernet/micrel/ks8851_common.c | 22 +-- drivers/net/ethernet/micrel/ks8851_spi.c | 42 ++++-- drivers/pinctrl/pinctrl-at91-pio4.c | 8 + drivers/reset/core.c | 3 + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +- drivers/scsi/scsi.c | 2 +- drivers/scsi/scsi_error.c | 34 ++--- drivers/scsi/scsi_lib.c | 38 +++-- drivers/scsi/scsi_logging.c | 18 ++- drivers/scsi/scsi_priv.h | 1 + drivers/spi/spi-atmel.c | 133 +++++------------ 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/afs/cell.c | 6 +- fs/afs/dynroot.c | 31 ++-- fs/btrfs/ioctl.c | 9 ++ 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 +- include/linux/key-type.h | 1 + include/net/bluetooth/hci_core.h | 5 + include/net/bluetooth/mgmt.h | 2 +- include/scsi/scsi_cmnd.h | 29 +++- include/scsi/scsi_device.h | 16 +- kernel/trace/ring_buffer.c | 12 +- kernel/trace/synth_event_gen_test.c | 11 ++ kernel/trace/trace.c | 20 ++- kernel/trace/trace_kprobe.c | 74 ++++++++++ kernel/trace/trace_probe.h | 1 + lib/vsprintf.c | 11 +- net/8021q/vlan_core.c | 9 +- net/9p/client.c | 7 +- 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 | 35 +++-- net/bluetooth/smp.c | 161 +++++++++++---------- net/bluetooth/smp.h | 6 +- net/core/dev.c | 8 + 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 | 41 +++++- 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/pci/hda/patch_hdmi.c | 2 + 81 files changed, 857 insertions(+), 446 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/75 ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 13736654481198e519059d4a2e2e3b20fa9fdb3e ]
MS confirm that "AISi" name of SMB2_CREATE_ALLOCATION_SIZE in MS-SMB2 specification is a typo. cifs/ksmbd have been using this wrong name from MS-SMB2. It should be "AlSi". Also It will cause problem when running smb2.create.open test in smbtorture against ksmbd.
--- fs/cifs/smb2pdu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2pdu.h +1 -1
@@ -755,7 +755,7 @@ struct smb2_tree_disconnect_rsp {#define SMB2_CREATE_SD_BUFFER "SecD"/* security descriptor */ #define SMB2_CREATE_DURABLE_HANDLE_REQUEST "DHnQ"#define SMB2_CREATE_DURABLE_HANDLE_RECONNECT "DHnC" -#define SMB2_CREATE_ALLOCATION_SIZE "AISi" +#define SMB2_CREATE_ALLOCATION_SIZE "AlSi"#define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc"#define SMB2_CREATE_TIMEWARP_REQUEST "TWrp"#define SMB2_CREATE_QUERY_ON_DISK_ID "QFid"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/75 smb: client: fix OOB in smb2_query_reparse_point()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit 3a42709fa909e22b0be4bb1e2795aa04ada732a3 ]
Validate @ioctl_rsp->OutputOffset and @ioctl_rsp->OutputCount so that their sum does not wrap to a number that is smaller than @reparse_buf and we end up with a wild pointer as follows:
BUG: unable to handle page fault for address: ffff88809c5cd45f #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 4a01067 P4D 4a01067 PUD 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 2 PID: 1260 Comm: mount.cifs Not tainted 6.7.0-rc4 #2 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 RIP: 0010:smb2_query_reparse_point+0x3e0/0x4c0 [cifs] Code: ff ff e8 f3 51 fe ff 41 89 c6 58 5a 45 85 f6 0f 85 14 fe ff ff 49 8b 57 48 8b 42 60 44 8b 42 64 42 8d 0c 00 49 39 4f 50 72 40 <8b> 04 02 48 8b 9d f0 fe ff ff 49 8b 57 50 89 03 48 8b 9d e8 fe ff RSP: 0018:ffffc90000347a90 EFLAGS: 00010212 RAX: 000000008000001f RBX: ffff88800ae11000 RCX: 00000000000000ec RDX: ffff88801c5cd440 RSI: 0000000000000000 RDI: ffffffff82004aa4 RBP: ffffc90000347bb0 R08: 00000000800000cd R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000024 R12: ffff8880114d4100 R13: ffff8880114d4198 R14: 0000000000000000 R15: ffff8880114d4000 FS: 00007f02c07babc0(0000) GS:ffff88806ba00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff88809c5cd45f CR3: 0000000011750000 CR4: 0000000000750ef0 PKRU: 55555554 Call Trace: <TASK> ? __die+0x23/0x70 ? page_fault_oops+0x181/0x480 ? search_module_extables+0x19/0x60 ? srso_alias_return_thunk+0x5/0xfbef5 ? exc_page_fault+0x1b6/0x1c0 ? asm_exc_page_fault+0x26/0x30 ? _raw_spin_unlock_irqrestore+0x44/0x60 ? smb2_query_reparse_point+0x3e0/0x4c0 [cifs] cifs_get_fattr+0x16e/0xa50 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? lock_acquire+0xbf/0x2b0 cifs_root_iget+0x163/0x5f0 [cifs] cifs_smb3_do_mount+0x5bd/0x780 [cifs] smb3_get_tree+0xd9/0x290 [cifs] vfs_get_tree+0x2c/0x100 ? capable+0x37/0x70 path_mount+0x2d7/0xb80 ? srso_alias_return_thunk+0x5/0xfbef5 ? _raw_spin_unlock_irqrestore+0x44/0x60 __x64_sys_mount+0x11a/0x150 do_syscall_64+0x47/0xf0 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7f02c08d5b1e
--- fs/cifs/smb2ops.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
fs/cifs/smb2ops.c +16 -10
@@ -3099,7 +3099,7 @@ smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon,struct kvec close_iov[1 ];struct smb2_ioctl_rsp *ioctl_rsp;struct reparse_data_buffer *reparse_buf; -u32 plen; +u32 off, count, len;cifs_dbg (FYI ,"%s: path: %s\n" , __func__, full_path);
@@ -3178,16 +3178,22 @@ smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon,*/ if (rc ==0 ) {/* See MS-FSCC 2.3.23 */ + off =le32_to_cpu (ioctl_rsp->OutputOffset); + count =le32_to_cpu (ioctl_rsp->OutputCount); +if (check_add_overflow (off, count, &len) || + len > rsp_iov[1 ].iov_len) { +cifs_tcon_dbg (VFS ,"%s: invalid ioctl: off=%d count=%d\n" , + __func__, off, count); + rc = -EIO ; + goto query_rp_exit; + } - reparse_buf = (struct reparse_data_buffer *) - ((char *)ioctl_rsp + -le32_to_cpu (ioctl_rsp->OutputOffset)); - plen =le32_to_cpu (ioctl_rsp->OutputCount); - -if (plen +le32_to_cpu (ioctl_rsp->OutputOffset) > - rsp_iov[1 ].iov_len) { -cifs_tcon_dbg (FYI ,"srv returned invalid ioctl len: %d\n" , - plen); + reparse_buf = (void *)((u8 *)ioctl_rsp + off); + len =sizeof (*reparse_buf); +if (count < len || + count <le16_to_cpu (reparse_buf->ReparseDataLength) + len) { +cifs_tcon_dbg (VFS ,"%s: invalid ioctl: off=%d count=%d\n" , + __func__, off, count); rc = -EIO ; goto query_rp_exit; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 3/75 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit c72b9c33ef9695ad7ce7a6eb39a9df8a01b70796 ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. When 'soc_dev_attr->family' is NULL,it'll trigger the null pointer dereference issue, such as in 'soc_info_show'.
And when 'soc_device_register' fails, it's necessary to release 'soc_dev_attr->family' to avoid memory leaks.
Message-ID: <[email protected]>
--- arch/arm/mach-omap2/id.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mach-omap2/id.c +5 -0
@@ -793,11 +793,16 @@ void __init omap_soc_device_init(void) soc_dev_attr->machine = soc_name; soc_dev_attr->family =omap_get_family (); +if (!soc_dev_attr->family) { +kfree (soc_dev_attr); +return ; + } soc_dev_attr->revision = soc_rev; soc_dev_attr->custom_attr_group = omap_soc_groups[0 ]; soc_dev =soc_device_register (soc_dev_attr);if (IS_ERR (soc_dev)) { +kfree (soc_dev_attr->family);kfree (soc_dev_attr);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 4/75 reset: Fix crash when freeing non-existent optional resets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4a6756f56bcf8e64c87144a626ce53aea4899c0e ]
When obtaining one or more optional resets, non-existent resets are stored as NULL pointers, and all related error and cleanup paths need to take this into account.
Currently only reset_control_put() and reset_control_bulk_put() get this right. All of __reset_control_bulk_get(), of_reset_control_array_get(), and reset_control_array_put() lack the proper checking, causing NULL pointer dereferences on failure or release.
Fix this by moving the existing check from reset_control_bulk_put() to __reset_control_put_internal(), so it applies to all callers. The double check in reset_control_put() doesn't hurt.
--- drivers/reset/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/reset/core.c +3 -0
@@ -599,6 +599,9 @@ static void __reset_control_put_internal(struct reset_control *rstc) {lockdep_assert_held (&reset_list_mutex); +if (IS_ERR_OR_NULL (rstc)) +return ; +kref_put (&rstc->refcnt, __reset_control_release); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/75 s390/vx: fix save/restore of fpu kernel context
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
[ Upstream commit e6b2dab41888332bf83f592131e7ea07756770a4 ]
The KERNEL_FPR mask only contains a flag for the first eight vector registers. However floating point registers overlay parts of the first sixteen vector registers.
This could lead to vector register corruption if a kernel fpu context uses any of the vector registers 8 to 15 and is interrupted or calls a KERNEL_FPR context. If that context uses also vector registers 8 to 15, their contents will be corrupted on return.
Luckily this is currently not a real bug, since the kernel has only one KERNEL_FPR user with s390_adjust_jiffies() and it is only using floating point registers 0 to 2.
Fix this by using the correct bits for KERNEL_FPR.
--- arch/s390/include/asm/fpu/api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/include/asm/fpu/api.h +1 -1
@@ -76,7 +76,7 @@ static inline int test_fp_ctl(u32 fpc)#define KERNEL_VXR_HIGH (KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)#define KERNEL_VXR (KERNEL_VXR_LOW|KERNEL_VXR_HIGH) -#define KERNEL_FPR (KERNEL_FPC|KERNEL_VXR_V0V7) +#define KERNEL_FPR (KERNEL_FPC|KERNEL_VXR_LOW)struct kernel_fpu ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/75 wifi: mac80211: mesh_plink: fix matches_local logic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 8c386b166e2517cf3a123018e77941ec22625d0f ]
During refactoring the "else" here got lost, add it back.
--- net/mac80211/mesh_plink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/mac80211/mesh_plink.c +5 -5
@@ -1050,8 +1050,8 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,case WLAN_SP_MESH_PEERING_OPEN :if (!matches_local) event =OPN_RJCT ; -if (!mesh_plink_free_count (sdata) || - (sta->mesh->plid && sta->mesh->plid != plid)) +else if (!mesh_plink_free_count (sdata) || + (sta->mesh->plid && sta->mesh->plid != plid)) event =OPN_IGNR ;else event =OPN_ACPT ;
@@ -1059,9 +1059,9 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,case WLAN_SP_MESH_PEERING_CONFIRM :if (!matches_local) event =CNF_RJCT ; -if (!mesh_plink_free_count (sdata) || - sta->mesh->llid != llid || - (sta->mesh->plid && sta->mesh->plid != plid)) +else if (!mesh_plink_free_count (sdata) || + sta->mesh->llid != llid || + (sta->mesh->plid && sta->mesh->plid != plid)) event =CNF_IGNR ;else event =CNF_ACPT ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/75 Revert "net/mlx5e: fix double free of encap_header"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Buslov <[email protected]>
[ Upstream commit 5d089684dc434a31e08d32f0530066d0025c52e4 ]
This reverts commit 6f9b1a0731662648949a1c0587f6acb3b7f8acf1.
This patch is causing a null ptr issue, the proper fix is in the next patch.
--- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +6 -4
@@ -267,6 +267,9 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,if (err) goto destroy_neigh_entry; + e->encap_size = ipv4_encap_size; + e->encap_header = encap_header; +if (!(nud_state &NUD_VALID )) {neigh_event_send (n,NULL );/* the encap entry will be made valid on neigh update event
@@ -283,8 +286,6 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, goto destroy_neigh_entry; } - e->encap_size = ipv4_encap_size; - e->encap_header = encap_header; e->flags |=MLX5_ENCAP_ENTRY_VALID ;mlx5e_rep_queue_neigh_stats_work (netdev_priv (out_dev));mlx5e_route_lookup_ipv4_put (route_dev, n);
@@ -430,6 +431,9 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,if (err) goto destroy_neigh_entry; + e->encap_size = ipv6_encap_size; + e->encap_header = encap_header; +if (!(nud_state &NUD_VALID )) {neigh_event_send (n,NULL );/* the encap entry will be made valid on neigh update event
@@ -447,8 +451,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, goto destroy_neigh_entry; } - e->encap_size = ipv6_encap_size; - e->encap_header = encap_header; e->flags |=MLX5_ENCAP_ENTRY_VALID ;mlx5e_rep_queue_neigh_stats_work (netdev_priv (out_dev));mlx5e_route_lookup_ipv6_put (route_dev, n);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/75 net/mlx5e: Fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shifeng Li <[email protected]>
[ Upstream commit ddb38ddff9c71026bad481b791a94d446ee37603 ]
Out_sz that the size of out buffer is calculated using query_nic_vport _context_in structure when driver query the MAC list. However query_nic _vport_context_in structure is smaller than query_nic_vport_context_out. When allowed_list_size is greater than 96, calling ether_addr_copy() will trigger an slab-out-of-bounds.
[ 1170.055866] BUG: KASAN: slab-out-of-bounds in mlx5_query_nic_vport_mac_list+0x481/0x4d0 [mlx5_core] [ 1170.055869] Read of size 4 at addr ffff88bdbc57d912 by task kworker/u128:1/461 [ 1170.055870] [ 1170.055932] Workqueue: mlx5_esw_wq esw_vport_change_handler [mlx5_core] [ 1170.055936] Call Trace: [ 1170.055949] dump_stack+0x8b/0xbb [ 1170.055958] print_address_description+0x6a/0x270 [ 1170.055961] kasan_report+0x179/0x2c0 [ 1170.056061] mlx5_query_nic_vport_mac_list+0x481/0x4d0 [mlx5_core] [ 1170.056162] esw_update_vport_addr_list+0x2c5/0xcd0 [mlx5_core] [ 1170.056257] esw_vport_change_handle_locked+0xd08/0x1a20 [mlx5_core] [ 1170.056377] esw_vport_change_handler+0x6b/0x90 [mlx5_core] [ 1170.056381] process_one_work+0x65f/0x12d0 [ 1170.056383] worker_thread+0x87/0xb50 [ 1170.056390] kthread+0x2e9/0x3a0 [ 1170.056394] ret_from_fork+0x1f/0x40
--- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/vport.c +1 -1
@@ -276,7 +276,7 @@ int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev, req_list_size = max_list_size; } - out_sz =MLX5_ST_SZ_BYTES (query_nic_vport_context_in) + + out_sz =MLX5_ST_SZ_BYTES (query_nic_vport_context_out) + req_list_size *MLX5_ST_SZ_BYTES (mac_address_layout); out =kzalloc (out_sz,GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/75 net/mlx5: Fix fw tracer first block check
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moshe Shemesh <[email protected]>
[ Upstream commit 4261edf11cb7c9224af713a102e5616329306932 ]
While handling new traces, to verify it is not the first block being written, last_timestamp is checked. But instead of checking it is non zero it is verified to be zero. Fix to verify last_timestamp is not zero.
--- drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c +1 -1
@@ -691,7 +691,7 @@ static void mlx5_fw_tracer_handle_traces(struct work_struct *work)while (block_timestamp > tracer->last_timestamp) {/* Check block override if it's not the first block */ -if (!tracer->last_timestamp) { +if (tracer->last_timestamp) {u64 *ts_event;/* To avoid block override be the HW in case of buffer * wraparound, the time stamp of the previous block
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/75 net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Rameshbabu <[email protected]>
[ Upstream commit b13559b76157de9d74f04d3ca0e49d69de3b5675 ]
snprintf returns the length of the formatted string, excluding the trailing null, without accounting for truncation. This means that is the return value is greater than or equal to the size parameter, the fw_version string was truncated.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +1 -1
@@ -68,7 +68,7 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev, count =snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version),"%d.%d.%04d (%.16s)" ,fw_rev_maj (mdev),fw_rev_min (mdev),fw_rev_sub (mdev), mdev->board_id); -if (count ==sizeof (drvinfo->fw_version)) +if (count >=sizeof (drvinfo->fw_version))snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version),"%d.%d.%04d" ,fw_rev_maj (mdev),fw_rev_min (mdev),fw_rev_sub (mdev));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/75 net: sched: ife: fix potential use-after-free
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 19391a2ca98baa7b80279306cdf7dd43f81fa595 ]
ife_decode() calls pskb_may_pull() two times, we need to reload ifehdr after the second one, or risk use-after-free as reported by syzbot:
BUG: KASAN: slab-use-after-free in __ife_tlv_meta_valid net/ife/ife.c:108 [inline] BUG: KASAN: slab-use-after-free in ife_tlv_meta_decode+0x1d1/0x210 net/ife/ife.c:131 Read of size 2 at addr ffff88802d7300a4 by task syz-executor.5/22323 CPU: 0 PID: 22323 Comm: syz-executor.5 Not tainted 6.7.0-rc3-syzkaller-00804-g074ac38d5b95 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x1b0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:364 [inline] print_report+0xc4/0x620 mm/kasan/report.c:475 kasan_report+0xda/0x110 mm/kasan/report.c:588 __ife_tlv_meta_valid net/ife/ife.c:108 [inline] ife_tlv_meta_decode+0x1d1/0x210 net/ife/ife.c:131 tcf_ife_decode net/sched/act_ife.c:739 [inline] tcf_ife_act+0x4e3/0x1cd0 net/sched/act_ife.c:879 tc_act include/net/tc_wrapper.h:221 [inline] tcf_action_exec+0x1ac/0x620 net/sched/act_api.c:1079 tcf_exts_exec include/net/pkt_cls.h:344 [inline] mall_classify+0x201/0x310 net/sched/cls_matchall.c:42 tc_classify include/net/tc_wrapper.h:227 [inline] __tcf_classify net/sched/cls_api.c:1703 [inline] tcf_classify+0x82f/0x1260 net/sched/cls_api.c:1800 hfsc_classify net/sched/sch_hfsc.c:1147 [inline] hfsc_enqueue+0x315/0x1060 net/sched/sch_hfsc.c:1546 dev_qdisc_enqueue+0x3f/0x230 net/core/dev.c:3739 __dev_xmit_skb net/core/dev.c:3828 [inline] __dev_queue_xmit+0x1de1/0x3d30 net/core/dev.c:4311 dev_queue_xmit include/linux/netdevice.h:3165 [inline] packet_xmit+0x237/0x350 net/packet/af_packet.c:276 packet_snd net/packet/af_packet.c:3081 [inline] packet_sendmsg+0x24aa/0x5200 net/packet/af_packet.c:3113 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 __do_sys_sendto net/socket.c:2202 [inline] __se_sys_sendto net/socket.c:2198 [inline] __x64_sys_sendto+0xe0/0x1b0 net/socket.c:2198 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x63/0x6b RIP: 0033:0x7fe9acc7cae9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fe9ada450c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 00007fe9acd9bf80 RCX: 00007fe9acc7cae9 RDX: 000000000000fce0 RSI: 00000000200002c0 RDI: 0000000000000003 RBP: 00007fe9accc847a R08: 0000000020000140 R09: 0000000000000014 R10: 0000000000000004 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007fe9acd9bf80 R15: 00007ffd5427ae78 </TASK> Allocated by task 22323: kasan_save_stack+0x33/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:374 [inline] __kasan_kmalloc+0xa2/0xb0 mm/kasan/common.c:383 kasan_kmalloc include/linux/kasan.h:198 [inline] __do_kmalloc_node mm/slab_common.c:1007 [inline] __kmalloc_node_track_caller+0x5a/0x90 mm/slab_common.c:1027 kmalloc_reserve+0xef/0x260 net/core/skbuff.c:582 __alloc_skb+0x12b/0x330 net/core/skbuff.c:651 alloc_skb include/linux/skbuff.h:1298 [inline] alloc_skb_with_frags+0xe4/0x710 net/core/skbuff.c:6331 sock_alloc_send_pskb+0x7e4/0x970 net/core/sock.c:2780 packet_alloc_skb net/packet/af_packet.c:2930 [inline] packet_snd net/packet/af_packet.c:3024 [inline] packet_sendmsg+0x1e2a/0x5200 net/packet/af_packet.c:3113 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 __do_sys_sendto net/socket.c:2202 [inline] __se_sys_sendto net/socket.c:2198 [inline] __x64_sys_sendto+0xe0/0x1b0 net/socket.c:2198 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x63/0x6b Freed by task 22323: kasan_save_stack+0x33/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2b/0x40 mm/kasan/generic.c:522 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free+0x15b/0x1b0 mm/kasan/common.c:200 kasan_slab_free include/linux/kasan.h:164 [inline] slab_free_hook mm/slub.c:1800 [inline] slab_free_freelist_hook+0x114/0x1e0 mm/slub.c:1826 slab_free mm/slub.c:3809 [inline] __kmem_cache_free+0xc0/0x180 mm/slub.c:3822 skb_kfree_head net/core/skbuff.c:950 [inline] skb_free_head+0x110/0x1b0 net/core/skbuff.c:962 pskb_expand_head+0x3c5/0x1170 net/core/skbuff.c:2130 __pskb_pull_tail+0xe1/0x1830 net/core/skbuff.c:2655 pskb_may_pull_reason include/linux/skbuff.h:2685 [inline] pskb_may_pull include/linux/skbuff.h:2693 [inline] ife_decode+0x394/0x4f0 net/ife/ife.c:82 tcf_ife_decode net/sched/act_ife.c:727 [inline] tcf_ife_act+0x43b/0x1cd0 net/sched/act_ife.c:879 tc_act include/net/tc_wrapper.h:221 [inline] tcf_action_exec+0x1ac/0x620 net/sched/act_api.c:1079 tcf_exts_exec include/net/pkt_cls.h:344 [inline] mall_classify+0x201/0x310 net/sched/cls_matchall.c:42 tc_classify include/net/tc_wrapper.h:227 [inline] __tcf_classify net/sched/cls_api.c:1703 [inline] tcf_classify+0x82f/0x1260 net/sched/cls_api.c:1800 hfsc_classify net/sched/sch_hfsc.c:1147 [inline] hfsc_enqueue+0x315/0x1060 net/sched/sch_hfsc.c:1546 dev_qdisc_enqueue+0x3f/0x230 net/core/dev.c:3739 __dev_xmit_skb net/core/dev.c:3828 [inline] __dev_queue_xmit+0x1de1/0x3d30 net/core/dev.c:4311 dev_queue_xmit include/linux/netdevice.h:3165 [inline] packet_xmit+0x237/0x350 net/packet/af_packet.c:276 packet_snd net/packet/af_packet.c:3081 [inline] packet_sendmsg+0x24aa/0x5200 net/packet/af_packet.c:3113 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 __do_sys_sendto net/socket.c:2202 [inline] __se_sys_sendto net/socket.c:2198 [inline] __x64_sys_sendto+0xe0/0x1b0 net/socket.c:2198 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x63/0x6b The buggy address belongs to the object at ffff88802d730000
which belongs to the cache kmalloc-8k of size 8192 The buggy address is located 164 bytes inside of freed 8192-byte region [ffff88802d730000, ffff88802d732000)
The buggy address belongs to the physical page:
page:ffffea0000b5cc00 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x2d730 head:ffffea0000b5cc00 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0
flags: 0xfff00000000840(slab|head|node=0|zone=1|lastcpupid=0x7ff)page_type: 0xffffffff()
raw: 00fff00000000840 ffff888013042280 dead000000000122 0000000000000000 raw: 0000000000000000 0000000080020002 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Unmovable, gfp_mask 0x1d20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_HARDWALL), pid 22323, tgid 22320 (syz-executor.5), ts 950317230369, free_ts 950233467461 set_page_owner include/linux/page_owner.h:31 [inline] post_alloc_hook+0x2d0/0x350 mm/page_alloc.c:1544 prep_new_page mm/page_alloc.c:1551 [inline] get_page_from_freelist+0xa28/0x3730 mm/page_alloc.c:3319 __alloc_pages+0x22e/0x2420 mm/page_alloc.c:4575 alloc_pages_mpol+0x258/0x5f0 mm/mempolicy.c:2133 alloc_slab_page mm/slub.c:1870 [inline] allocate_slab mm/slub.c:2017 [inline] new_slab+0x283/0x3c0 mm/slub.c:2070 ___slab_alloc+0x979/0x1500 mm/slub.c:3223 __slab_alloc.constprop.0+0x56/0xa0 mm/slub.c:3322 __slab_alloc_node mm/slub.c:3375 [inline] slab_alloc_node mm/slub.c:3468 [inline] __kmem_cache_alloc_node+0x131/0x310 mm/slub.c:3517 __do_kmalloc_node mm/slab_common.c:1006 [inline] __kmalloc_node_track_caller+0x4a/0x90 mm/slab_common.c:1027 kmalloc_reserve+0xef/0x260 net/core/skbuff.c:582 __alloc_skb+0x12b/0x330 net/core/skbuff.c:651 alloc_skb include/linux/skbuff.h:1298 [inline] alloc_skb_with_frags+0xe4/0x710 net/core/skbuff.c:6331 sock_alloc_send_pskb+0x7e4/0x970 net/core/sock.c:2780 packet_alloc_skb net/packet/af_packet.c:2930 [inline] packet_snd net/packet/af_packet.c:3024 [inline] packet_sendmsg+0x1e2a/0x5200 net/packet/af_packet.c:3113 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 page last free stack trace: reset_page_owner include/linux/page_owner.h:24 [inline] free_pages_prepare mm/page_alloc.c:1144 [inline] free_unref_page_prepare+0x53c/0xb80 mm/page_alloc.c:2354 free_unref_page+0x33/0x3b0 mm/page_alloc.c:2494 __unfreeze_partials+0x226/0x240 mm/slub.c:2655 qlink_free mm/kasan/quarantine.c:168 [inline] qlist_free_all+0x6a/0x170 mm/kasan/quarantine.c:187 kasan_quarantine_reduce+0x18e/0x1d0 mm/kasan/quarantine.c:294 __kasan_slab_alloc+0x65/0x90 mm/kasan/common.c:305 kasan_slab_alloc include/linux/kasan.h:188 [inline] slab_post_alloc_hook mm/slab.h:763 [inline] slab_alloc_node mm/slub.c:3478 [inline] slab_alloc mm/slub.c:3486 [inline] __kmem_cache_alloc_lru mm/slub.c:3493 [inline] kmem_cache_alloc_lru+0x219/0x6f0 mm/slub.c:3509 alloc_inode_sb include/linux/fs.h:2937 [inline] ext4_alloc_inode+0x28/0x650 fs/ext4/super.c:1408 alloc_inode+0x5d/0x220 fs/inode.c:261 new_inode_pseudo fs/inode.c:1006 [inline] new_inode+0x22/0x260 fs/inode.c:1032 __ext4_new_inode+0x333/0x5200 fs/ext4/ialloc.c:958 ext4_symlink+0x5d7/0xa20 fs/ext4/namei.c:3398 vfs_symlink fs/namei.c:4464 [inline] vfs_symlink+0x3e5/0x620 fs/namei.c:4448 do_symlinkat+0x25f/0x310 fs/namei.c:4490 __do_sys_symlinkat fs/namei.c:4506 [inline] __se_sys_symlinkat fs/namei.c:4503 [inline] __x64_sys_symlinkat+0x97/0xc0 fs/namei.c:4503 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:82
--- net/ife/ife.c | 1 + 1 file changed, 1 insertion(+)
net/ife/ife.c +1 -0
@@ -82,6 +82,7 @@ void *ife_decode(struct sk_buff *skb, u16 *metalen)if (unlikely (!pskb_may_pull (skb, total_pull)))return NULL ; + ifehdr = (struct ifeheadr *)(skb->data + skb->dev->hard_header_len);skb_set_mac_header (skb, total_pull);__skb_pull (skb, total_pull); *metalen = ifehdrln -IFE_METAHDRLEN ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/75 ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 309fdb1c33fe726d92d0030481346f24e1b01f07 ]
In the error handling of 'offset > adapter->ring_size', the tx_ring->tx_buffer allocated by kzalloc should be freed, instead of 'goto failed' instantly.
--- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +4 -1
@@ -866,10 +866,13 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)netdev_err (adapter->netdev,"offset(%d) > ring size(%d) !!\n" , offset, adapter->ring_size); err =-1 ; - goto failed; + goto free_buffer; }return 0 ; +free_buffer: +kfree (tx_ring->tx_buffer); + tx_ring->tx_buffer =NULL ; failed:if (adapter->ring_vir_addr !=NULL ) { dma_free_coherent(&pdev->dev, adapter->ring_size,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/75 net/rose: fix races in rose_kill_by_device()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 64b8bc7d5f1434c636a40bdcfcd42b278d1714be ]
syzbot found an interesting netdev refcounting issue in net/rose/af_rose.c, thanks to CONFIG_NET_DEV_REFCNT_TRACKER=y [1]
Problem is that rose_kill_by_device() can change rose->device while other threads do not expect the pointer to be changed.
We have to first collect sockets in a temporary array, then perform the changes while holding the socket lock and rose_list_lock spinlock (in this order)
Change rose_release() to also acquire rose_list_lock before releasing the netdev refcount.
[1]
[ 1185.055088][ T7889] ref_tracker: reference already released. [ 1185.061476][ T7889] ref_tracker: allocated in: [ 1185.066081][ T7889] rose_bind+0x4ab/0xd10 [ 1185.070446][ T7889] __sys_bind+0x1ec/0x220 [ 1185.074818][ T7889] __x64_sys_bind+0x72/0xb0 [ 1185.079356][ T7889] do_syscall_64+0x40/0x110 [ 1185.083897][ T7889] entry_SYSCALL_64_after_hwframe+0x63/0x6b [ 1185.089835][ T7889] ref_tracker: freed in: [ 1185.094088][ T7889] rose_release+0x2f5/0x570 [ 1185.098629][ T7889] __sock_release+0xae/0x260 [ 1185.103262][ T7889] sock_close+0x1c/0x20 [ 1185.107453][ T7889] __fput+0x270/0xbb0 [ 1185.111467][ T7889] task_work_run+0x14d/0x240 [ 1185.116085][ T7889] get_signal+0x106f/0x2790 [ 1185.120622][ T7889] arch_do_signal_or_restart+0x90/0x7f0 [ 1185.126205][ T7889] exit_to_user_mode_prepare+0x121/0x240 [ 1185.131846][ T7889] syscall_exit_to_user_mode+0x1e/0x60 [ 1185.137293][ T7889] do_syscall_64+0x4d/0x110 [ 1185.141783][ T7889] entry_SYSCALL_64_after_hwframe+0x63/0x6b [ 1185.148085][ T7889] ------------[ cut here ]------------
WARNING: CPU: 1 PID: 7889 at lib/ref_tracker.c:255 ref_tracker_free+0x61a/0x810 lib/ref_tracker.c:255 Modules linked in: CPU: 1 PID: 7889 Comm: syz-executor.2 Not tainted 6.7.0-rc4-syzkaller-00162-g65c95f78917e #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 RIP: 0010:ref_tracker_free+0x61a/0x810 lib/ref_tracker.c:255 Code: 00 44 8b 6b 18 31 ff 44 89 ee e8 21 62 f5 fc 45 85 ed 0f 85 a6 00 00 00 e8 a3 66 f5 fc 48 8b 34 24 48 89 ef e8 27 5f f1 05 90 <0f> 0b 90 bb ea ff ff ff e9 52 fd ff ff e8 84 66 f5 fc 4c 8d 6d 44 RSP: 0018:ffffc90004917850 EFLAGS: 00010202 RAX: 0000000000000201 RBX: ffff88802618f4c0 RCX: 0000000000000000 RDX: 0000000000000202 RSI: ffffffff8accb920 RDI: 0000000000000001 RBP: ffff8880269ea5b8 R08: 0000000000000001 R09: fffffbfff23e35f6 R10: ffffffff91f1afb7 R11: 0000000000000001 R12: 1ffff92000922f0c R13: 0000000005a2039b R14: ffff88802618f4d8 R15: 00000000ffffffff FS: 00007f0a720ef6c0(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f43a819d988 CR3: 0000000076c64000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> netdev_tracker_free include/linux/netdevice.h:4127 [inline] netdev_put include/linux/netdevice.h:4144 [inline] netdev_put include/linux/netdevice.h:4140 [inline] rose_kill_by_device net/rose/af_rose.c:195 [inline] rose_device_event+0x25d/0x330 net/rose/af_rose.c:218 notifier_call_chain+0xb6/0x3b0 kernel/notifier.c:93 call_netdevice_notifiers_info+0xbe/0x130 net/core/dev.c:1967 call_netdevice_notifiers_extack net/core/dev.c:2005 [inline] call_netdevice_notifiers net/core/dev.c:2019 [inline] __dev_notify_flags+0x1f5/0x2e0 net/core/dev.c:8646 dev_change_flags+0x122/0x170 net/core/dev.c:8682 dev_ifsioc+0x9ad/0x1090 net/core/dev_ioctl.c:529 dev_ioctl+0x224/0x1090 net/core/dev_ioctl.c:786 sock_do_ioctl+0x198/0x270 net/socket.c:1234 sock_ioctl+0x22e/0x6b0 net/socket.c:1339 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:871 [inline] __se_sys_ioctl fs/ioctl.c:857 [inline] __x64_sys_ioctl+0x18f/0x210 fs/ioctl.c:857 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b RIP: 0033:0x7f0a7147cba9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f0a720ef0c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f0a7159bf80 RCX: 00007f0a7147cba9 RDX: 0000000020000040 RSI: 0000000000008914 RDI: 0000000000000004 RBP: 00007f0a714c847a R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f0a7159bf80 R15: 00007ffc8bb3a5f8 </TASK>
--- net/rose/af_rose.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
net/rose/af_rose.c +34 -5
@@ -181,21 +181,47 @@ void rose_kill_by_neigh(struct rose_neigh *neigh)*/ static void rose_kill_by_device (struct net_device *dev) { -struct sock *s; +struct sock *sk, *array[16 ]; +struct rose_sock *rose; +bool rescan; +int i, cnt; +start: + rescan = false; + cnt =0 ;spin_lock_bh (&rose_list_lock); -sk_for_each (s, &rose_list) { -struct rose_sock *rose =rose_sk (s); +sk_for_each (sk, &rose_list) { + rose =rose_sk (sk); +if (rose->device == dev) { +if (cnt ==ARRAY_SIZE (array)) { + rescan = true; +break ; + } +sock_hold (sk); + array[cnt++] = sk; + } + } +spin_unlock_bh (&rose_list_lock); +for (i =0 ; i < cnt; i++) { + sk = array[cnt]; + rose =rose_sk (sk); +lock_sock (sk); +spin_lock_bh (&rose_list_lock);if (rose->device == dev) { -rose_disconnect (s,ENETUNREACH ,ROSE_OUT_OF_ORDER ,0 ); +rose_disconnect (sk,ENETUNREACH ,ROSE_OUT_OF_ORDER ,0 );if (rose->neighbour) rose->neighbour->use--;dev_put (rose->device); rose->device =NULL ; } +spin_unlock_bh (&rose_list_lock); +release_sock (sk); +sock_put (sk); +cond_resched (); } -spin_unlock_bh (&rose_list_lock); +if (rescan) + goto start; }/*
@@ -655,7 +681,10 @@ static int rose_release(struct socket *sock)break ; } +spin_lock_bh (&rose_list_lock);dev_put (rose->device); + rose->device =NULL ; +spin_unlock_bh (&rose_list_lock); sock->sk =NULL ;release_sock (sk);sock_put (sk);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/75 net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Jian <[email protected]>
[ Upstream commit 01a564bab4876007ce35f312e16797dfe40e4823 ]
I got the below warning trace:
WARNING: CPU: 4 PID: 4056 at net/core/dev.c:11066 unregister_netdevice_many_notify CPU: 4 PID: 4056 Comm: ip Not tainted 6.7.0-rc4+ #15 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014 RIP: 0010:unregister_netdevice_many_notify+0x9a4/0x9b0 Call Trace: rtnl_dellink rtnetlink_rcv_msg netlink_rcv_skb netlink_unicast netlink_sendmsg __sock_sendmsg ____sys_sendmsg ___sys_sendmsg __sys_sendmsg do_syscall_64 entry_SYSCALL_64_after_hwframe
It can be repoduced via:
ip netns add ns1
ip netns exec ns1 ip link add bond0 type bond mode 0
ip netns exec ns1 ip link add bond_slave_1 type veth peer veth2
ip netns exec ns1 ip link set bond_slave_1 master bond0
[1] ip netns exec ns1 ethtool -K bond0 rx-vlan-filter off
[2] ip netns exec ns1 ip link add link bond_slave_1 name bond_slave_1.0 type vlan id 0
[3] ip netns exec ns1 ip link add link bond0 name bond0.0 type vlan id 0
[4] ip netns exec ns1 ip link set bond_slave_1 nomaster
[5] ip netns exec ns1 ip link del veth2
ip netns del ns1
This is all caused by command [1] turning off the rx-vlan-filter function of bond0. The reason is the same as commit 01f4fd270870 ("bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves"). Commands
[2] [3] add the same vid to slave and master respectively, causing command [4] to empty slave->vlan_info. The following command [5] triggers this problem.
To fix this problem, we should add VLAN_FILTER feature checks in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() to prevent incorrect addition or deletion of vlan_vid information.
--- net/8021q/vlan_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/8021q/vlan_core.c +8 -1
@@ -406,6 +406,8 @@ int vlan_vids_add_by_dev(struct net_device *dev,return 0 ;list_for_each_entry (vid_info, &vlan_info->vid_list, list) { +if (!vlan_hw_filter_capable (by_dev, vid_info->proto)) +continue ; err =vlan_vid_add (dev, vid_info->proto, vid_info->vid);if (err) goto unwind;
@@ -416,6 +418,8 @@ int vlan_vids_add_by_dev(struct net_device *dev,list_for_each_entry_continue_reverse (vid_info, &vlan_info->vid_list, list) { +if (!vlan_hw_filter_capable (by_dev, vid_info->proto)) +continue ;vlan_vid_del (dev, vid_info->proto, vid_info->vid); }
@@ -435,8 +439,11 @@ void vlan_vids_del_by_dev(struct net_device *dev,if (!vlan_info)return ; -list_for_each_entry (vid_info, &vlan_info->vid_list, list) +list_for_each_entry (vid_info, &vlan_info->vid_list, list) { +if (!vlan_hw_filter_capable (by_dev, vid_info->proto)) +continue ;vlan_vid_del (dev, vid_info->proto, vid_info->vid); + } }EXPORT_SYMBOL (vlan_vids_del_by_dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/75 afs: Fix the dynamic roots d_delete to always delete unused dentries
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 71f8b55bc30e82d6355e07811213d847981a32e2 ]
Fix the afs dynamic root's d_delete function to always delete unused dentries rather than only deleting them if they're positive. With things as they stand upstream, negative dentries stemming from failed DNS lookups stick around preventing retries.
--- fs/afs/dynroot.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
fs/afs/dynroot.c +1 -12
@@ -251,20 +251,9 @@ static int afs_dynroot_d_revalidate(struct dentry *dentry, unsigned int flags)return 1 ; } -/* -* Allow the VFS to enquire as to whether a dentry should be unhashed (mustn't -* sleep) -* - called from dput() when d_count is going to 0. -* - return 1 to request dentry be unhashed, 0 otherwise -*/ -static int afs_dynroot_d_delete (const struct dentry *dentry) -{ -return d_really_is_positive (dentry); -} -const struct dentry_operations afs_dynroot_dentry_operations = { .d_revalidate = afs_dynroot_d_revalidate, - .d_delete = afs_dynroot_d_delete, + .d_delete = always_delete_dentry, .d_release = afs_d_release, .d_automount = afs_d_automount, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/75 afs: Fix dynamic root lookup DNS check
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 74cef6872ceaefb5b6c5c60641371ea28702d358 ]
In the afs dynamic root directory, the ->lookup() function does a DNS check on the cell being asked for and if the DNS upcall reports an error it will report an error back to userspace (typically ENOENT).
However, if a failed DNS upcall returns a new-style result, it will return a valid result, with the status field set appropriately to indicate the type of failure - and in that case, dns_query() doesn't return an error and we let stat() complete with no error - which can cause confusion in userspace as subsequent calls that trigger d_automount then fail with ENOENT.
Fix this by checking the status result from a valid dns_query() and returning an error if it indicates a failure.
--- fs/afs/dynroot.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
fs/afs/dynroot.c +16 -2
@@ -113,6 +113,7 @@ static int afs_probe_cell_name(struct dentry *dentry)struct afs_net *net =afs_d2net (dentry);const char *name = dentry->d_name.name;size_t len = dentry->d_name.len; +char *result =NULL ;int ret;/* Names prefixed with a dot are R/W mounts. */
@@ -130,9 +131,22 @@ static int afs_probe_cell_name(struct dentry *dentry) } ret =dns_query (net->net,"afsdb" , name, len,"srv=1" , -NULL ,NULL , false); -if (ret == -ENODATA || ret == -ENOKEY ) + &result,NULL , false); +if (ret == -ENODATA || ret == -ENOKEY || ret ==0 ) ret = -ENOENT ; +if (ret >0 && ret >=sizeof (struct dns_server_list_v1_header )) { +struct dns_server_list_v1_header *v1 = (void *)result; + +if (v1->hdr.zero ==0 && + v1->hdr.content ==DNS_PAYLOAD_IS_SERVER_LIST && + v1->hdr.version ==1 && + (v1->status !=DNS_LOOKUP_GOOD && + v1->status !=DNS_LOOKUP_GOOD_WITH_BAD )) +return -ENOENT ; + + } + +kfree (result);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/75 net: warn if gso_type isnt set for a GSO SKB
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 1d155dfdf50efc2b0793bce93c06d1a5b23d0877 ]
In bug report [0] a warning in r8169 driver was reported that was caused by an invalid GSO SKB (gso_type was 0). See [1] for a discussion about this issue. Still the origin of the invalid GSO SKB isn't clear.
It shouldn't be a network drivers task to check for invalid GSO SKB's. Also, even if issue [0] can be fixed, we can't be sure that a similar issue doesn't pop up again at another place. Therefore let gso_features_check() check for such invalid GSO SKB's.
[0] https://bugzilla.kernel.org/show_bug.cgi?id=209423
[1] https://www.spinics.net/lists/netdev/msg690794.html
Stable-dep-of: 24ab059d2ebd ("net: check dev->gso_max_size in gso_features_check()")
--- net/core/dev.c | 5 +++++ 1 file changed, 5 insertions(+)
net/core/dev.c +5 -0
@@ -3523,6 +3523,11 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,if (gso_segs > dev->gso_max_segs)return features & ~NETIF_F_GSO_MASK ; +if (!skb_shinfo (skb)->gso_type) { +skb_warn_bad_offload (skb); +return features & ~NETIF_F_GSO_MASK ; + } +/* Support for GSO partial features requires software * intervention before we can actually process the packets * so we need to strip support for any partial features now
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/75 net: check dev->gso_max_size in gso_features_check()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 24ab059d2ebd62fdccc43794796f6ffbabe49ebc ]
Some drivers might misbehave if TSO packets get too big.
GVE for instance uses a 16bit field in its TX descriptor, and will do bad things if a packet is bigger than 2^16 bytes.
Linux TCP stack honors dev->gso_max_size, but there are other ways for too big packets to reach an ndo_start_xmit() handler : virtio_net, af_packet, GRO...
Add a generic check in gso_features_check() and fallback to GSO when needed.
gso_max_size was added in the blamed commit.
--- net/core/dev.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/dev.c +3 -0
@@ -3523,6 +3523,9 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,if (gso_segs > dev->gso_max_segs)return features & ~NETIF_F_GSO_MASK ; +if (unlikely (skb->len >=READ_ONCE (dev->gso_max_size))) +return features & ~NETIF_F_GSO_MASK ; +if (!skb_shinfo (skb)->gso_type) {skb_warn_bad_offload (skb);return features & ~NETIF_F_GSO_MASK ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/75 keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 39299bdd2546688d92ed9db4948f6219ca1b9542 ]
If a key has an expiration time, then when that time passes, the key is left around for a certain amount of time before being collected (5 mins by default) so that EKEYEXPIRED can be returned instead of ENOKEY. This is a problem for DNS keys because we want to redo the DNS lookup immediately at that point.
Fix this by allowing key types to be marked such that keys of that type don't have this extra period, but are reclaimed as soon as they expire and turn this on for dns_resolver-type keys. To make this easier to handle, key->expiry is changed to be permanent if TIME64_MAX rather than 0.
Furthermore, give such new-style negative DNS results a 1s default expiry if no other expiry time is set rather than allowing it to stick around indefinitely. This shouldn't be zero as ls will follow a failing stat call immediately with a second with AT_SYMLINK_NOFOLLOW added.
--- include/linux/key-type.h | 1 + net/dns_resolver/dns_key.c | 10 +++++++++- security/keys/gc.c | 31 +++++++++++++++++++++---------- security/keys/internal.h | 11 ++++++++++- security/keys/key.c | 15 +++++---------- security/keys/proc.c | 2 +- 6 files changed, 47 insertions(+), 23 deletions(-)
include/linux/key-type.h +1 -0
@@ -72,6 +72,7 @@ struct key_type {unsigned int flags;#define KEY_TYPE_NET_DOMAIN 0x00000001/* Keys of this type have a net namespace domain */ +#define KEY_TYPE_INSTANT_REAP 0x00000002/* Keys of this type don't have a delay after expiring */ /* vet a description */ int (*vet_description)(const char *description);
net/dns_resolver/dns_key.c +9 -1
@@ -91,6 +91,7 @@ const struct cred *dns_resolver_cache;static int dns_resolver_preparse (struct key_preparsed_payload *prep) { +const struct dns_server_list_v1_header *v1;const struct dns_payload_header *bin;struct user_key_payload *upayload;unsigned long derrno;
@@ -122,6 +123,13 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)return -EINVAL ; } + v1 = (const struct dns_server_list_v1_header *)bin; +if ((v1->status !=DNS_LOOKUP_GOOD && + v1->status !=DNS_LOOKUP_GOOD_WITH_BAD )) { +if (prep->expiry ==TIME64_MAX ) + prep->expiry =ktime_get_real_seconds () +1 ; + } + result_len = datalen; goto store_result; }
@@ -314,7 +322,7 @@ static long dns_resolver_read(const struct key *key,struct key_type key_type_dns_resolver = { .name ="dns_resolver" , - .flags =KEY_TYPE_NET_DOMAIN , + .flags =KEY_TYPE_NET_DOMAIN |KEY_TYPE_INSTANT_REAP , .preparse = dns_resolver_preparse, .free_preparse = dns_resolver_free_preparse, .instantiate = generic_key_instantiate,
security/keys/gc.c +21 -10
@@ -66,6 +66,19 @@ void key_schedule_gc(time64_t gc_at) } } +/* +* Set the expiration time on a key. +*/ +void key_set_expiry (struct key *key,time64_t expiry) +{ + key->expiry = expiry; +if (expiry !=TIME64_MAX ) { +if (!(key->type->flags &KEY_TYPE_INSTANT_REAP )) + expiry += key_gc_delay; +key_schedule_gc (expiry); + } +} +/* * Schedule a dead links collection run. */
@@ -176,7 +189,6 @@ static void key_garbage_collector(struct work_struct *work)static u8 gc_state;/* Internal persistent state */ #define KEY_GC_REAP_AGAIN 0x01/* - Need another cycle */ #define KEY_GC_REAPING_LINKS 0x02/* - We need to reap links */ -#define KEY_GC_SET_TIMER 0x04/* - We need to restart the timer */ #define KEY_GC_REAPING_DEAD_1 0x10/* - We need to mark dead keys */ #define KEY_GC_REAPING_DEAD_2 0x20/* - We need to reap dead key links */ #define KEY_GC_REAPING_DEAD_3 0x40/* - We need to reap dead keys */
@@ -184,21 +196,17 @@ static void key_garbage_collector(struct work_struct *work)struct rb_node *cursor;struct key *key; -time64_t new_timer, limit; +time64_t new_timer, limit, expiry;kenter ("[%lx,%x]" , key_gc_flags, gc_state); limit =ktime_get_real_seconds (); -if (limit > key_gc_delay) - limit -= key_gc_delay; -else - limit = key_gc_delay;/* Work out what we're going to be doing in this pass */ gc_state &=KEY_GC_REAPING_DEAD_1 |KEY_GC_REAPING_DEAD_2 ; gc_state <<=1 ;if (test_and_clear_bit (KEY_GC_KEY_EXPIRED , &key_gc_flags)) - gc_state |=KEY_GC_REAPING_LINKS |KEY_GC_SET_TIMER ; + gc_state |=KEY_GC_REAPING_LINKS ;if (test_and_clear_bit (KEY_GC_REAP_KEYTYPE , &key_gc_flags)) gc_state |=KEY_GC_REAPING_DEAD_1 ;
@@ -233,8 +241,11 @@ static void key_garbage_collector(struct work_struct *work) } } -if (gc_state &KEY_GC_SET_TIMER ) { -if (key->expiry > limit && key->expiry < new_timer) { + expiry = key->expiry; +if (expiry !=TIME64_MAX ) { +if (!(key->type->flags &KEY_TYPE_INSTANT_REAP )) + expiry += key_gc_delay; +if (expiry > limit && expiry < new_timer) {kdebug ("will expire %x in %lld" ,key_serial (key), key->expiry - limit); new_timer = key->expiry;
@@ -276,7 +287,7 @@ static void key_garbage_collector(struct work_struct *work)*/ kdebug ("pass complete" ); -if (gc_state &KEY_GC_SET_TIMER && new_timer != (time64_t )TIME64_MAX ) { +if (new_timer !=TIME64_MAX ) { new_timer += key_gc_delay;key_schedule_gc (new_timer); }
security/keys/internal.h +10 -1
@@ -176,6 +176,7 @@ extern unsigned key_gc_delay;extern void keyring_gc (struct key *keyring,time64_t limit);extern void keyring_restriction_gc (struct key *keyring,struct key_type *dead_type); +void key_set_expiry (struct key *key,time64_t expiry);extern void key_schedule_gc (time64_t gc_at);extern void key_schedule_gc_links (void );extern void key_gc_keytype (struct key_type *ktype);
@@ -224,10 +225,18 @@ extern struct key *key_get_instantiation_authkey(key_serial_t target_id);*/ static inline bool key_is_dead (const struct key *key,time64_t limit) { +time64_t expiry = key->expiry; + +if (expiry !=TIME64_MAX ) { +if (!(key->type->flags &KEY_TYPE_INSTANT_REAP )) + expiry += key_gc_delay; +if (expiry <= limit) +return true; + } +return key->flags & ((1 <<KEY_FLAG_DEAD ) | (1 <<KEY_FLAG_INVALIDATED )) || - (key->expiry >0 && key->expiry <= limit) || key->domain_tag->removed; }
security/keys/key.c +5 -10
@@ -294,6 +294,7 @@ struct key *key_alloc(struct key_type *type, const char *desc, key->uid = uid; key->gid = gid; key->perm = perm; + key->expiry =TIME64_MAX ; key->restrict_link = restrict_link; key->last_used_at =ktime_get_real_seconds ();
@@ -463,10 +464,7 @@ static int __key_instantiate_and_link(struct key *key,if (authkey)key_invalidate (authkey); -if (prep->expiry !=TIME64_MAX ) { - key->expiry = prep->expiry; -key_schedule_gc (prep->expiry + key_gc_delay); - } +key_set_expiry (key, prep->expiry); } }
@@ -605,8 +603,7 @@ int key_reject_and_link(struct key *key,atomic_inc (&key->user->nikeys);mark_key_instantiated (key, -error);notify_key (key,NOTIFY_KEY_INSTANTIATED , -error); - key->expiry =ktime_get_real_seconds () + timeout; -key_schedule_gc (key->expiry + key_gc_delay); +key_set_expiry (key,ktime_get_real_seconds () + timeout);if (test_and_clear_bit (KEY_FLAG_USER_CONSTRUCT , &key->flags)) awaken =1 ;
@@ -721,16 +718,14 @@ struct key_type *key_type_lookup(const char *type)void key_set_timeout (struct key *key,unsigned timeout) { -time64_t expiry =0 ; +time64_t expiry =TIME64_MAX ;/* make the changes with the locks held to prevent races */ down_write (&key->sem);if (timeout >0 ) expiry =ktime_get_real_seconds () + timeout; - - key->expiry = expiry; -key_schedule_gc (key->expiry + key_gc_delay); +key_set_expiry (key, expiry);up_write (&key->sem); }
security/keys/proc.c +1 -1
@@ -198,7 +198,7 @@ static int proc_keys_show(struct seq_file *m, void *v)/* come up with a suitable timeout value */ expiry =READ_ONCE (key->expiry); -if (expiry ==0 ) { +if (expiry ==TIME64_MAX ) {memcpy (xbuf,"perm" ,5 ); }else if (now >= expiry) {memcpy (xbuf,"expd" ,5 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/75 afs: Fix overwriting of result of DNS query
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit a9e01ac8c5ff32669119c40dfdc9e80eb0b7d7aa ]
In afs_update_cell(), ret is the result of the DNS lookup and the errors are to be handled by a switch - however, the value gets clobbered in between by setting it to -ENOMEM in case afs_alloc_vlserver_list() fails.
Fix this by moving the setting of -ENOMEM into the error handling for OOM failure. Further, only do it if we don't have an alternative error to return.
Found by Linux Verification Center (linuxtesting.org) with SVACE. Based on a patch from Anastasia Belova [1].
--- fs/afs/cell.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/afs/cell.c +4 -2
@@ -407,10 +407,12 @@ static int afs_update_cell(struct afs_cell *cell)if (ret == -ENOMEM ) goto out_wake; - ret = -ENOMEM ; vllist =afs_alloc_vlserver_list (0 ); -if (!vllist) +if (!vllist) { +if (ret >=0 ) + ret = -ENOMEM ; goto out_wake; + }switch (ret) {case -ENODATA :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/75 i2c: aspeed: Handle the coalesced stop conditions with the start conditions.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quan Nguyen <[email protected]>
[ Upstream commit b4cc1cbba5195a4dd497cf2f8f09e7807977d543 ]
Some masters may drive the transfers with low enough latency between the nak/stop phase of the current command and the start/address phase of the following command that the interrupts are coalesced by the time we process them.
Handle the stop conditions before processing SLAVE_MATCH to fix the complaints that sometimes occur below.
"aspeed-i2c-bus 1e78a040.i2c-bus: irq handled != irq. Expected 0x00000086, but was 0x00000084"
--- drivers/i2c/busses/i2c-aspeed.c | 48 ++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-aspeed.c +32 -16
@@ -250,18 +250,46 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)if (!slave)return 0 ; - command =readl (bus->base +ASPEED_I2C_CMD_REG ); +/* +* Handle stop conditions early, prior to SLAVE_MATCH. Some masters may drive +* transfers with low enough latency between the nak/stop phase of the current +* command and the start/address phase of the following command that the +* interrupts are coalesced by the time we process them. +*/ +if (irq_status &ASPEED_I2CD_INTR_NORMAL_STOP ) { + irq_handled |=ASPEED_I2CD_INTR_NORMAL_STOP ; + bus->slave_state =ASPEED_I2C_SLAVE_STOP ; + } + +if (irq_status &ASPEED_I2CD_INTR_TX_NAK && + bus->slave_state ==ASPEED_I2C_SLAVE_READ_PROCESSED ) { + irq_handled |=ASPEED_I2CD_INTR_TX_NAK ; + bus->slave_state =ASPEED_I2C_SLAVE_STOP ; + } + +/* Propagate any stop conditions to the slave implementation. */ +if (bus->slave_state ==ASPEED_I2C_SLAVE_STOP ) { +i2c_slave_event (slave,I2C_SLAVE_STOP , &value); + bus->slave_state =ASPEED_I2C_SLAVE_INACTIVE ; + } -/* Slave was requested, restart state machine. */ +/* +* Now that we've dealt with any potentially coalesced stop conditions, +* address any start conditions. +*/ if (irq_status &ASPEED_I2CD_INTR_SLAVE_MATCH ) { irq_handled |=ASPEED_I2CD_INTR_SLAVE_MATCH ; bus->slave_state =ASPEED_I2C_SLAVE_START ; } -/* Slave is not currently active, irq was for someone else. */ +/* +* If the slave has been stopped and not started then slave interrupt +* handling is complete. +*/ if (bus->slave_state ==ASPEED_I2C_SLAVE_INACTIVE )return irq_handled; + command =readl (bus->base +ASPEED_I2C_CMD_REG );dev_dbg (bus->dev,"slave irq status 0x%08x, cmd 0x%08x\n" , irq_status, command);
@@ -280,17 +308,6 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) irq_handled |=ASPEED_I2CD_INTR_RX_DONE ; } -/* Slave was asked to stop. */ -if (irq_status &ASPEED_I2CD_INTR_NORMAL_STOP ) { - irq_handled |=ASPEED_I2CD_INTR_NORMAL_STOP ; - bus->slave_state =ASPEED_I2C_SLAVE_STOP ; - } -if (irq_status &ASPEED_I2CD_INTR_TX_NAK && - bus->slave_state ==ASPEED_I2C_SLAVE_READ_PROCESSED ) { - irq_handled |=ASPEED_I2CD_INTR_TX_NAK ; - bus->slave_state =ASPEED_I2C_SLAVE_STOP ; - } -switch (bus->slave_state) {case ASPEED_I2C_SLAVE_READ_REQUESTED :if (unlikely (irq_status &ASPEED_I2CD_INTR_TX_ACK ))
@@ -319,8 +336,7 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)i2c_slave_event (slave,I2C_SLAVE_WRITE_RECEIVED , &value);break ;case ASPEED_I2C_SLAVE_STOP : -i2c_slave_event (slave,I2C_SLAVE_STOP , &value); - bus->slave_state =ASPEED_I2C_SLAVE_INACTIVE ; +/* Stop event handling is done early. Unreachable. */ break ;case ASPEED_I2C_SLAVE_START :/* Slave was just started. Waiting for the next event. */ ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/75 pinctrl: at91-pio4: use dedicated lock class for IRQ
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré <[email protected]>
[ Upstream commit 14694179e561b5f2f7e56a0f590e2cb49a9cc7ab ]
Trying to suspend to RAM on SAMA5D27 EVK leads to the following lockdep warning:
============================================
WARNING: possible recursive locking detected
6.7.0-rc5-wt+ #532 Not tainted
--------------------------------------------
sh/92 is trying to acquire lock:
c3cf306c (&irq_desc_lock_class){-.-.}-{2:2}, at: __irq_get_desc_lock+0xe8/0x100
but task is already holding lock:
c3d7c46c (&irq_desc_lock_class){-.-.}-{2:2}, at: __irq_get_desc_lock+0xe8/0x100
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&irq_desc_lock_class);
lock(&irq_desc_lock_class);
*** DEADLOCK ***
May be due to missing lock nesting notation
6 locks held by sh/92:
#0: c3aa0258 (sb_writers#6){.+.+}-{0:0}, at: ksys_write+0xd8/0x178 #1: c4c2df44 (&of->mutex){+.+.}-{3:3}, at: kernfs_fop_write_iter+0x138/0x284 #2: c32684a0 (kn->active){.+.+}-{0:0}, at: kernfs_fop_write_iter+0x148/0x284 #3: c232b6d4 (system_transition_mutex){+.+.}-{3:3}, at: pm_suspend+0x13c/0x4e8 #4: c387b088 (&dev->mutex){....}-{3:3}, at: __device_suspend+0x1e8/0x91c #5: c3d7c46c (&irq_desc_lock_class){-.-.}-{2:2}, at: __irq_get_desc_lock+0xe8/0x100
stack backtrace: CPU: 0 PID: 92 Comm: sh Not tainted 6.7.0-rc5-wt+ #532 Hardware name: Atmel SAMA5 unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x34/0x48 dump_stack_lvl from __lock_acquire+0x19ec/0x3a0c __lock_acquire from lock_acquire.part.0+0x124/0x2d0 lock_acquire.part.0 from _raw_spin_lock_irqsave+0x5c/0x78 _raw_spin_lock_irqsave from __irq_get_desc_lock+0xe8/0x100 __irq_get_desc_lock from irq_set_irq_wake+0xa8/0x204 irq_set_irq_wake from atmel_gpio_irq_set_wake+0x58/0xb4 atmel_gpio_irq_set_wake from irq_set_irq_wake+0x100/0x204 irq_set_irq_wake from gpio_keys_suspend+0xec/0x2b8 gpio_keys_suspend from dpm_run_callback+0xe4/0x248 dpm_run_callback from __device_suspend+0x234/0x91c __device_suspend from dpm_suspend+0x224/0x43c dpm_suspend from dpm_suspend_start+0x9c/0xa8 dpm_suspend_start from suspend_devices_and_enter+0x1e0/0xa84 suspend_devices_and_enter from pm_suspend+0x460/0x4e8 pm_suspend from state_store+0x78/0xe4 state_store from kernfs_fop_write_iter+0x1a0/0x284 kernfs_fop_write_iter from vfs_write+0x38c/0x6f4 vfs_write from ksys_write+0xd8/0x178 ksys_write from ret_fast_syscall+0x0/0x1c Exception stack(0xc52b3fa8 to 0xc52b3ff0) 3fa0: 00000004 005a0ae8 00000001 005a0ae8 00000004 00000001 3fc0: 00000004 005a0ae8 00000001 00000004 00000004 b6c616c0 00000020 0059d190 3fe0: 00000004 b6c61678 aec5a041 aebf1a26
This warning is raised because pinctrl-at91-pio4 uses chained IRQ. Whenever a wake up source configures an IRQ through irq_set_irq_wake, it will lock the corresponding IRQ desc, and then call irq_set_irq_wake on "parent" IRQ which will do the same on its own IRQ desc, but since those two locks share the same class, lockdep reports this as an issue.
Fix lockdep false positive by setting a different class for parent and children IRQ
--- drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pinctrl/pinctrl-at91-pio4.c +8 -0
@@ -999,6 +999,13 @@ static const struct of_device_id atmel_pctrl_of_match[] = { } }; +/* +* This lock class allows to tell lockdep that parent IRQ and children IRQ do +* not share the same class so it does not raise false positive +*/ +static struct lock_class_key atmel_lock_key; +static struct lock_class_key atmel_request_key; +static int atmel_pinctrl_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -1148,6 +1155,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)irq_set_chip_and_handler (irq, &atmel_gpio_irq_chip, handle_simple_irq);irq_set_chip_data (irq, atmel_pioctrl); +irq_set_lockdep_class (irq, &atmel_lock_key, &atmel_request_key);dev_dbg (dev,"atmel gpio irq domain: hwirq: %d, linux irq: %d\n" , i, irq);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/75 ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Vehmanen <[email protected]>
[ Upstream commit e81d71e343c6c62cf323042caed4b7ca049deda5 ]
On some Intel NUC10 variants, codec reports AC_JACK_PORT_NONE as pin default config for all pins. This results in broken audio. Add a quirk to force connectivity.
Stable-dep-of: 3b1ff57e24a7 ("ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB")
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1970,6 +1970,7 @@ static const struct snd_pci_quirk force_connect_list[] = {SND_PCI_QUIRK (0x1043 ,0x86ae ,"ASUS" ,1 ),/* Z170 PRO */ SND_PCI_QUIRK (0x1043 ,0x86c7 ,"ASUS" ,1 ),/* Z170M PLUS */ SND_PCI_QUIRK (0x1462 ,0xec94 ,"MS-7C94" ,1 ), + SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1), {} };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/75 ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Vehmanen <[email protected]>
[ Upstream commit 3b1ff57e24a7bcd2e2a8426dd2013a80d1fa96eb ]
Add one more older NUC model that requires quirk to force all pins to be connected. The display codec pins are not registered properly without the force-connect quirk. The codec will report only one pin as having external connectivity, but i915 finds all three connectors on the system, so the two drivers are not in sync.
Issue found with DRM igt-gpu-tools test kms_hdmi_inject@inject-audio.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1970,6 +1970,7 @@ static const struct snd_pci_quirk force_connect_list[] = {SND_PCI_QUIRK (0x1043 ,0x86ae ,"ASUS" ,1 ),/* Z170 PRO */ SND_PCI_QUIRK (0x1043 ,0x86c7 ,"ASUS" ,1 ),/* Z170M PLUS */ SND_PCI_QUIRK (0x1462 ,0xec94 ,"MS-7C94" ,1 ), +SND_PCI_QUIRK (0x8086 ,0x2060 ,"Intel NUC5CPYB" ,1 ), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1), {} };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/75 smb: client: fix NULL deref in asn1_ber_decoder()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit 90d025c2e953c11974e76637977c473200593a46 ]
If server replied SMB2_NEGOTIATE with a zero SecurityBufferOffset, smb2_get_data_area() sets @len to non-zero but return NULL, so decode_negTokeninit() ends up being called with a NULL @security_blob:
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 2 PID: 871 Comm: mount.cifs Not tainted 6.7.0-rc4 #2 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 RIP: 0010:asn1_ber_decoder+0x173/0xc80 Code: 01 4c 39 2c 24 75 09 45 84 c9 0f 85 2f 03 00 00 48 8b 14 24 4c 29 ea 48 83 fa 01 0f 86 1e 07 00 00 48 8b 74 24 28 4d 8d 5d 01 <42> 0f b6 3c 2e 89 fa 40 88 7c 24 5c f7 d2 83 e2 1f 0f 84 3d 07 00 RSP: 0018:ffffc9000063f950 EFLAGS: 00010202 RAX: 0000000000000002 RBX: 0000000000000000 RCX: 000000000000004a RDX: 000000000000004a RSI: 0000000000000000 RDI: 0000000000000000 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000002 R11: 0000000000000001 R12: 0000000000000000 R13: 0000000000000000 R14: 000000000000004d R15: 0000000000000000 FS: 00007fce52b0fbc0(0000) GS:ffff88806ba00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000001ae64000 CR4: 0000000000750ef0 PKRU: 55555554 Call Trace: <TASK> ? __die+0x23/0x70 ? page_fault_oops+0x181/0x480 ? __stack_depot_save+0x1e6/0x480 ? exc_page_fault+0x6f/0x1c0 ? asm_exc_page_fault+0x26/0x30 ? asn1_ber_decoder+0x173/0xc80 ? check_object+0x40/0x340 decode_negTokenInit+0x1e/0x30 [cifs] SMB2_negotiate+0xc99/0x17c0 [cifs] ? smb2_negotiate+0x46/0x60 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 smb2_negotiate+0x46/0x60 [cifs] cifs_negotiate_protocol+0xae/0x130 [cifs] cifs_get_smb_ses+0x517/0x1040 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? queue_delayed_work_on+0x5d/0x90 cifs_mount_get_session+0x78/0x200 [cifs] dfs_mount_share+0x13a/0x9f0 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? lock_acquire+0xbf/0x2b0 ? find_nls+0x16/0x80 ? srso_alias_return_thunk+0x5/0xfbef5 cifs_mount+0x7e/0x350 [cifs] cifs_smb3_do_mount+0x128/0x780 [cifs] smb3_get_tree+0xd9/0x290 [cifs] vfs_get_tree+0x2c/0x100 ? capable+0x37/0x70 path_mount+0x2d7/0xb80 ? srso_alias_return_thunk+0x5/0xfbef5 ? _raw_spin_unlock_irqrestore+0x44/0x60 __x64_sys_mount+0x11a/0x150 do_syscall_64+0x47/0xf0 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7fce52c2ab1e
Fix this by setting @len to zero when @off == 0 so callers won't attempt to dereference non-existing data areas.
--- fs/cifs/smb2misc.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
fs/cifs/smb2misc.c +10 -16
@@ -305,6 +305,9 @@ static const bool has_smb2_data_area[NUMBER_OF_SMB2_COMMANDS] = {char *smb2_get_data_area_len (int *off,int *len,struct smb2_sync_hdr *shdr) { +const int max_off =4096 ; +const int max_len =128 *1024 ; + *off =0 ; *len =0 ;
@@ -376,29 +379,20 @@ smb2_get_data_area_len(int *off, int *len, struct smb2_sync_hdr *shdr)* Invalid length or offset probably means data area is invalid, but * we have little choice but to ignore the data area in this case. */ -if (*off >4096 ) { -cifs_dbg (VFS ,"offset %d too large, data area ignored\n" , *off); - *len =0 ; - *off =0 ; - }else if (*off <0 ) { -cifs_dbg (VFS ,"negative offset %d to data invalid ignore data area\n" , - *off); +if (unlikely (*off <0 || *off > max_off || + *len <0 || *len > max_len)) { +cifs_dbg (VFS ,"%s: invalid data area (off=%d len=%d)\n" , + __func__, *off, *len); *off =0 ; *len =0 ; - }else if (*len <0 ) { -cifs_dbg (VFS ,"negative data length %d invalid, data area ignored\n" , - *len); - *len =0 ; - }else if (*len >128 *1024 ) { -cifs_dbg (VFS ,"data area larger than 128K: %d\n" , *len); + }else if (*off ==0 ) { *len =0 ; }/* return pointer to beginning of data area, ie offset from SMB start */ -if ((*off !=0 ) && (*len !=0 )) +if (*off >0 && *len >0 )return (char *)shdr + *off; -else -return NULL ; +return NULL ; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/75 btrfs: do not allow non subvolume root targets for snapshot
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit a8892fd71933126ebae3d60aec5918d4dceaae76 ]
Our btrfs subvolume snapshot <source> <destination> utility enforces that <source> is the root of the subvolume, however this isn't enforced in the kernel. Update the kernel to also enforce this limitation to avoid problems with other users of this ioctl that don't have the appropriate checks in place.
--- fs/btrfs/ioctl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/btrfs/ioctl.c +9 -0
@@ -1868,6 +1868,15 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file,* are limited to own subvolumes only */ ret = -EPERM ; + }else if (btrfs_ino (BTRFS_I (src_inode)) !=BTRFS_FIRST_FREE_OBJECTID ) { +/* +* Snapshots must be made with the src_inode referring +* to the subvolume inode, otherwise the permission +* checking above is useless because we may have +* permission on a lower directory but not the subvol +* itself. +*/ + ret = -EINVAL ; }else { ret = btrfs_mksnapshot(&file->f_path, name, namelen, BTRFS_I(src_inode)->root,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/75 interconnect: Treat xlate() returning NULL node as an error
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Tipton <[email protected]>
[ Upstream commit ad2ab1297d0c80899125a842bb7a078abfe1e6ce ]
Currently, if provider->xlate() or provider->xlate_extended() "successfully" return a NULL node, then of_icc_get_from_provider() won't consider that an error and will successfully return the NULL node. This bypasses error handling in of_icc_get_by_index() and leads to NULL dereferences in path_find().
This could be avoided by ensuring provider callbacks always return an error for NULL nodes, but it's better to explicitly protect against this in the common framework.
--- drivers/interconnect/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/interconnect/core.c +3 -0
@@ -380,6 +380,9 @@ struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) }mutex_unlock (&icc_lock); +if (!node) +return ERR_PTR (-EINVAL ); +if (IS_ERR (node))return ERR_CAST (node);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/75 iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit c3df0e29fb7788c4b3ddf37d5ed87dda2b822943 ]
inv_mpu6050_sensor_show() can return -EINVAL or IIO_VAL_INT. Return the true value rather than only return IIO_VAL_INT.
--- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +2 -2
@@ -707,13 +707,13 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev, ret =inv_mpu6050_sensor_show (st, st->reg->gyro_offset, chan->channel2, val);mutex_unlock (&st->lock); -return IIO_VAL_INT ; +return ret;case IIO_ACCEL :mutex_lock (&st->lock); ret =inv_mpu6050_sensor_show (st, st->reg->accl_offset, chan->channel2, val);mutex_unlock (&st->lock); -return IIO_VAL_INT ; +return ret;default :return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/75 interconnect: qcom: sm8250: Enable sync_state
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit bfc7db1cb94ad664546d70212699f8cc6c539e8c ]
Add the generic icc sync_state callback to ensure interconnect votes are taken into account, instead of being pegged at maximum values.
--- drivers/interconnect/qcom/sm8250.c | 1 + 1 file changed, 1 insertion(+)
drivers/interconnect/qcom/sm8250.c +1 -0
@@ -643,6 +643,7 @@ static struct platform_driver qnoc_driver = { .driver = { .name = "qnoc-sm8250", .of_match_table = qnoc_of_match, + .sync_state = icc_sync_state, }, };module_platform_driver (qnoc_driver);
Signature · 1 line
2.43.0
Re: [PATCH 5.10 29/75] interconnect: qcom: sm8250: Enable sync_state
Quoted 11 lines · Greg Kroah-Hartman
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit
bfc7db1cb94ad664546d70212699f8cc6c539e8c]Add the generic icc
sync_statecallback to ensure interconnect votes are taken into account, instead of being pegged at maximum values.
Quoted 6 lines
Fixes b95b668eaaa2 ("interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate")Signed-off-by Konrad Dybcio <[email protected]>Signed-off-by Georgi Djakov <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
Hi, please drop this as the platform will become unbootable without some more DT+driver changes.
Konrad
Greg Kroah-Hartman
maintainerPATCH 30/75 Input: ipaq-micro-keys - add error handling for devm_kmemdup
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoran Liu <[email protected]>
[ Upstream commit 59b6a747e2d39227ac2325c5e29d6ab3bb070c2a ]
Check the return value of i2c_add_adapter. Static analysis revealed that the function did not properly handle potential failures of i2c_add_adapter, which could lead to partial initialization of the I2C adapter and unstable operation.
--- drivers/input/keyboard/ipaq-micro-keys.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/input/keyboard/ipaq-micro-keys.c +3 -0
@@ -105,6 +105,9 @@ static int micro_key_probe(struct platform_device *pdev) keys->codes =devm_kmemdup (&pdev->dev, micro_keycodes, keys->input->keycodesize * keys->input->keycodemax,GFP_KERNEL ); +if (!keys->codes) +return -ENOMEM ; + keys->input->keycode = keys->codes;__set_bit (EV_KEY , keys->input->evbit);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/75 scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Yongjun <[email protected]>
[ Upstream commit 08c94d80b2da481652fb633e79cbc41e9e326a91 ]
skb_share_check() already drops the reference to the skb when returning NULL. Using kfree_skb() in the error handling path leads to an skb double free.
Fix this by removing the variable tmp_skb, and return directly when skb_share_check() returns NULL.
--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +3 -6
@@ -430,7 +430,6 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev,struct fcoe_ctlr *ctlr;struct fcoe_rcv_info *fr;struct fcoe_percpu_s *bg; -struct sk_buff *tmp_skb; interface = container_of(ptype, struct bnx2fc_interface, fcoe_packet_type);
@@ -442,11 +441,9 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev, goto err; } - tmp_skb =skb_share_check (skb,GFP_ATOMIC ); -if (!tmp_skb) - goto err; - - skb = tmp_skb; + skb =skb_share_check (skb,GFP_ATOMIC ); +if (!skb) +return -1 ;if (unlikely (eth_hdr (skb)->h_proto !=htons (ETH_P_FCOE ))) { printk(KERN_ERR PFX "bnx2fc_rcv: Wrong FC type frame\n");
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/75 iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Javier Carrasco <[email protected]>
commit 54cf39ec16335dadbe1ba008d8e5e98dae3e26f8 upstream.
The HTU21 offers 4 sampling frequencies: 20, 40, 70 and 120, which are associated to an index that is used to select the right measurement resolution and its corresponding measurement time. The current implementation selects the measurement resolution and the temperature measurement time properly, but it does not select the right humidity measurement time in all cases.
In summary, the 40 and 70 humidity measurement times are swapped.
The reason for that is probably the unusual coding for the measurement resolution. According to the datasheet, the bits [7,0] of the "user register" are used as follows to select the bit resolution:
--------------------------------------------------
| Bit 7 | Bit 0 | RH | Temp | Trh (us) | Tt (us) |
--------------------------------------------------
| 0 | 0 | 12 | 14 | 16000 | 50000 |
--------------------------------------------------
| 0 | 1 | 8 | 12 | 3000 | 13000 |
--------------------------------------------------
| 1 | 0 | 10 | 13 | 5000 | 25000 |
--------------------------------------------------
| 1 | 1 | 11 | 11 | 8000 | 7000 |
--------------------------------------------------
*This table is available in the official datasheet, page 13/21. I have just appended the times provided in the humidity/temperature tables, pages 3/21, 5/21. Note that always a pair of resolutions is selected.
The sampling frequencies [20, 40, 70, 120] are assigned to a linear index [0..3] which is then coded as follows [1]:
Index [7,0]
--------------
idx 0 0,0 idx 1 1,0 idx 2 0,1 idx 3 1,1
That is done that way because the temperature measurements are being used as the reference for the sampling frequency (the frequencies and the temperature measurement times are correlated), so increasing the index always reduces the temperature measurement time and its resolution. Therefore, the temperature measurement time array is as simple as [50000, 25000, 13000, 7000]
On the other hand, the humidity resolution cannot follow the same pattern because of the way it is coded in the "user register", where both resolutions are selected at the same time. The humidity measurement time array is the following: [16000, 3000, 5000, 8000], which defines the following assignments:
Index [7,0] Trh
-----------------------
idx 0 0,0 16000 -> right, [0,0] selects 12 bits (Trh = 16000) idx 1 1,0 3000 -> wrong! [1,0] selects 10 bits (Trh = 5000) idx 2 0,1 5000 -> wrong! [0,1] selects 8 bits (Trh = 3000) idx 3 1,1 8000 -> right, [1,1] selects 11 bits (Trh = 8000)
The times have been ordered as if idx = 1 -> [0,1] and idx = 2 -> [1,0], which is not the case for the reason explained above.
So a simple modification is required to obtain the right humidity measurement time array, swapping the values in the positions 1 and 2.
The right table should be the following: [16000, 5000, 3000, 8000]
Fix the humidity measurement time array with the right idex/value coding.
[1] The actual code that makes this coding and assigns it to the current value of the "user register" is the following:config_reg &= 0x7E;config_reg |= ((i & 1) << 7) + ((i & 2) >> 1);
--- drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/common/ms_sensors/ms_sensors_i2c.c +2 -2
@@ -15,8 +15,8 @@/* Conversion times in us */ static const u16 ms_sensors_ht_t_conversion_time[] = {50000 ,25000 ,13000 ,7000 }; -static const u16 ms_sensors_ht_h_conversion_time[] = {16000 ,3000 , -5000 ,8000 }; +static const u16 ms_sensors_ht_h_conversion_time[] = {16000 ,5000 , +3000 ,8000 };static const u16 ms_sensors_tp_conversion_time[] = {500 ,1100 ,2100 ,4100 ,8220 ,16440 };
Greg Kroah-Hartman
maintainerPATCH 33/75 iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wadim Egorov <[email protected]>
commit 60576e84c187043cef11f11d015249e71151d35a upstream.
Fix wrong handling of a DMA request where the probing only failed if -EPROPE_DEFER was returned. Instead, let us fail if a non -ENODEV value is returned. This makes DMAs explicitly optional. Even if the DMA request is unsuccessfully, the ADC can still work properly. We do also handle the defer probe case by making use of dev_err_probe().
--- drivers/iio/adc/ti_am335x_adc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
@@ -640,8 +640,10 @@ static int tiadc_probe(struct platform_dplatform_set_drvdata (pdev, indio_dev); err =tiadc_request_dma (pdev, adc_dev); -if (err && err == -EPROBE_DEFER ) +if (err && err != -ENODEV ) { +dev_err_probe (&pdev->dev, err,"DMA request failed\n" ); goto err_dma; + }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 34/75 wifi: cfg80211: Add my certificate
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
commit fb768d3b13ffa325b7e84480d488ac799c9d2cd7 upstream.
As announced [1][2], I have taken over maintainership of the wireless-regdb project.
Add my certificate so that newer releases are valid to the kernel. Seth's certificate should be kept around for awhile, at least until a few new releases by me happen.
This should also be applied to stable trees so that stable kernels can utilize newly released database binaries.
[1] https://lore.kernel.org/linux-wireless/CAGb2v657baNMPKU3QADijx7hZa=GUcSv2LEDdn6N=QQaFX8r-g@mail.gmail.com/
[2] https://lore.kernel.org/linux-wireless/[email protected]/
--- net/wireless/certs/wens.hex | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 net/wireless/certs/wens.hex
net/wireless/certs/wens.hex new file +87 -0
@@ -0,0 +1,87 @@ +/* Chen-Yu Tsai's regdb certificate */ +0x30, 0x82, 0x02, 0xa7, 0x30, 0x82, 0x01, 0x8f, +0x02, 0x14, 0x61, 0xc0, 0x38, 0x65, 0x1a, 0xab, +0xdc, 0xf9, 0x4b, 0xd0, 0xac, 0x7f, 0xf0, 0x6c, +0x72, 0x48, 0xdb, 0x18, 0xc6, 0x00, 0x30, 0x0d, +0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, +0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x0f, 0x31, +0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03, +0x0c, 0x04, 0x77, 0x65, 0x6e, 0x73, 0x30, 0x20, +0x17, 0x0d, 0x32, 0x33, 0x31, 0x32, 0x30, 0x31, +0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, 0x18, +0x0f, 0x32, 0x31, 0x32, 0x33, 0x31, 0x31, 0x30, +0x37, 0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, +0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, +0x55, 0x04, 0x03, 0x0c, 0x04, 0x77, 0x65, 0x6e, +0x73, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, +0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, +0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, +0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, +0x01, 0x00, 0xa9, 0x7a, 0x2c, 0x78, 0x4d, 0xa7, +0x19, 0x2d, 0x32, 0x52, 0xa0, 0x2e, 0x6c, 0xef, +0x88, 0x7f, 0x15, 0xc5, 0xb6, 0x69, 0x54, 0x16, +0x43, 0x14, 0x79, 0x53, 0xb7, 0xae, 0x88, 0xfe, +0xc0, 0xb7, 0x5d, 0x47, 0x8e, 0x1a, 0xe1, 0xef, +0xb3, 0x90, 0x86, 0xda, 0xd3, 0x64, 0x81, 0x1f, +0xce, 0x5d, 0x9e, 0x4b, 0x6e, 0x58, 0x02, 0x3e, +0xb2, 0x6f, 0x5e, 0x42, 0x47, 0x41, 0xf4, 0x2c, +0xb8, 0xa8, 0xd4, 0xaa, 0xc0, 0x0e, 0xe6, 0x48, +0xf0, 0xa8, 0xce, 0xcb, 0x08, 0xae, 0x37, 0xaf, +0xf6, 0x40, 0x39, 0xcb, 0x55, 0x6f, 0x5b, 0x4f, +0x85, 0x34, 0xe6, 0x69, 0x10, 0x50, 0x72, 0x5e, +0x4e, 0x9d, 0x4c, 0xba, 0x38, 0x36, 0x0d, 0xce, +0x73, 0x38, 0xd7, 0x27, 0x02, 0x2a, 0x79, 0x03, +0xe1, 0xac, 0xcf, 0xb0, 0x27, 0x85, 0x86, 0x93, +0x17, 0xab, 0xec, 0x42, 0x77, 0x37, 0x65, 0x8a, +0x44, 0xcb, 0xd6, 0x42, 0x93, 0x92, 0x13, 0xe3, +0x39, 0x45, 0xc5, 0x6e, 0x00, 0x4a, 0x7f, 0xcb, +0x42, 0x17, 0x2b, 0x25, 0x8c, 0xb8, 0x17, 0x3b, +0x15, 0x36, 0x59, 0xde, 0x42, 0xce, 0x21, 0xe6, +0xb6, 0xc7, 0x6e, 0x5e, 0x26, 0x1f, 0xf7, 0x8a, +0x57, 0x9e, 0xa5, 0x96, 0x72, 0xb7, 0x02, 0x32, +0xeb, 0x07, 0x2b, 0x73, 0xe2, 0x4f, 0x66, 0x58, +0x9a, 0xeb, 0x0f, 0x07, 0xb6, 0xab, 0x50, 0x8b, +0xc3, 0x8f, 0x17, 0xfa, 0x0a, 0x99, 0xc2, 0x16, +0x25, 0xbf, 0x2d, 0x6b, 0x1a, 0xaa, 0xe6, 0x3e, +0x5f, 0xeb, 0x6d, 0x9b, 0x5d, 0x4d, 0x42, 0x83, +0x2d, 0x39, 0xb8, 0xc9, 0xac, 0xdb, 0x3a, 0x91, +0x50, 0xdf, 0xbb, 0xb1, 0x76, 0x6d, 0x15, 0x73, +0xfd, 0xc6, 0xe6, 0x6b, 0x71, 0x9e, 0x67, 0x36, +0x22, 0x83, 0x79, 0xb1, 0xd6, 0xb8, 0x84, 0x52, +0xaf, 0x96, 0x5b, 0xc3, 0x63, 0x02, 0x4e, 0x78, +0x70, 0x57, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, +0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, +0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, +0x01, 0x01, 0x00, 0x24, 0x28, 0xee, 0x22, 0x74, +0x7f, 0x7c, 0xfa, 0x6c, 0x1f, 0xb3, 0x18, 0xd1, +0xc2, 0x3d, 0x7d, 0x29, 0x42, 0x88, 0xad, 0x82, +0xa5, 0xb1, 0x8a, 0x05, 0xd0, 0xec, 0x5c, 0x91, +0x20, 0xf6, 0x82, 0xfd, 0xd5, 0x67, 0x60, 0x5f, +0x31, 0xf5, 0xbd, 0x88, 0x91, 0x70, 0xbd, 0xb8, +0xb9, 0x8c, 0x88, 0xfe, 0x53, 0xc9, 0x54, 0x9b, +0x43, 0xc4, 0x7a, 0x43, 0x74, 0x6b, 0xdd, 0xb0, +0xb1, 0x3b, 0x33, 0x45, 0x46, 0x78, 0xa3, 0x1c, +0xef, 0x54, 0x68, 0xf7, 0x85, 0x9c, 0xe4, 0x51, +0x6f, 0x06, 0xaf, 0x81, 0xdb, 0x2a, 0x7b, 0x7b, +0x6f, 0xa8, 0x9c, 0x67, 0xd8, 0xcb, 0xc9, 0x91, +0x40, 0x00, 0xae, 0xd9, 0xa1, 0x9f, 0xdd, 0xa6, +0x43, 0x0e, 0x28, 0x7b, 0xaa, 0x1b, 0xe9, 0x84, +0xdb, 0x76, 0x64, 0x42, 0x70, 0xc9, 0xc0, 0xeb, +0xae, 0x84, 0x11, 0x16, 0x68, 0x4e, 0x84, 0x9e, +0x7e, 0x92, 0x36, 0xee, 0x1c, 0x3b, 0x08, 0x63, +0xeb, 0x79, 0x84, 0x15, 0x08, 0x9d, 0xaf, 0xc8, +0x9a, 0xc7, 0x34, 0xd3, 0x94, 0x4b, 0xd1, 0x28, +0x97, 0xbe, 0xd1, 0x45, 0x75, 0xdc, 0x35, 0x62, +0xac, 0x1d, 0x1f, 0xb7, 0xb7, 0x15, 0x87, 0xc8, +0x98, 0xc0, 0x24, 0x31, 0x56, 0x8d, 0xed, 0xdb, +0x06, 0xc6, 0x46, 0xbf, 0x4b, 0x6d, 0xa6, 0xd5, +0xab, 0xcc, 0x60, 0xfc, 0xe5, 0x37, 0xb6, 0x53, +0x7d, 0x58, 0x95, 0xa9, 0x56, 0xc7, 0xf7, 0xee, +0xc3, 0xa0, 0x76, 0xf7, 0x65, 0x4d, 0x53, 0xfa, +0xff, 0x5f, 0x76, 0x33, 0x5a, 0x08, 0xfa, 0x86, +0x92, 0x5a, 0x13, 0xfa, 0x1a, 0xfc, 0xf2, 0x1b, +0x8c, 0x7f, 0x42, 0x6d, 0xb7, 0x7e, 0xb7, 0xb4, +0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, +0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, +0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, +0x45, 0x4e, 0xc3
Greg Kroah-Hartman
maintainerPATCH 35/75 wifi: cfg80211: fix certs build to not depend on file order
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 3c2a8ebe3fe66a5f77d4c164a0bea8e2ff37b455 upstream.
The file for the new certificate (Chen-Yu Tsai's) didn't end with a comma, so depending on the file order in the build rule, we'd end up with invalid C when concatenating the (now two) certificates. Fix that.
--- net/wireless/certs/wens.hex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/certs/wens.hex +1 -1
@@ -84,4 +84,4 @@ 0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, 0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, 0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, -0x45, 0x4e, 0xc3 +0x45, 0x4e, 0xc3,
Greg Kroah-Hartman
maintainerPATCH 36/75 USB: serial: ftdi_sio: update Actisense PIDs constant names
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Glover <[email protected]>
commit 513d88a88e0203188a38f4647dd08170aebd85df upstream.
Update the constant names for unused USB PIDs (product identifiers) to reflect the new products now using the PIDs.
--- drivers/usb/serial/ftdi_sio.c | 6 +++--- drivers/usb/serial/ftdi_sio_ids.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/serial/ftdi_sio.c +3 -3
@@ -1011,9 +1011,9 @@ static const struct usb_device_id id_tab { USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) }, { USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) }, { USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) }, - { USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) }, - { USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) }, - { USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) }, { USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) }, { USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) }, { USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) },
drivers/usb/serial/ftdi_sio_ids.h +3 -3
@@ -1561,9 +1561,9 @@#define ACTISENSE_USG_PID 0xD9A9/* USG USB Serial Adapter */ #define ACTISENSE_NGT_PID 0xD9AA/* NGT NMEA2000 Interface */ #define ACTISENSE_NGW_PID 0xD9AB/* NGW NMEA2000 Gateway */ -#define ACTISENSE_D9AC_PID 0xD9AC/* Actisense Reserved */ -#define ACTISENSE_D9AD_PID 0xD9AD/* Actisense Reserved */ -#define ACTISENSE_D9AE_PID 0xD9AE/* Actisense Reserved */ +#define ACTISENSE_UID_PID 0xD9AC/* USB Isolating Device */ +#define ACTISENSE_USA_PID 0xD9AD/* USB to Serial Adapter */ +#define ACTISENSE_NGX_PID 0xD9AE/* NGX NMEA2000 Gateway */ #define ACTISENSE_D9AF_PID 0xD9AF/* Actisense Reserved */ #define CHETCO_SEAGAUGE_PID 0xA548/* SeaGauge USB Adapter */ #define CHETCO_SEASWITCH_PID 0xA549/* SeaSwitch USB Adapter */
Greg Kroah-Hartman
maintainerPATCH 37/75 USB: serial: option: add Quectel EG912Y module support
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alper Ak <[email protected]>
commit 6d79d9434c69bb8ffa8a631050eb0ad6b83d3e90 upstream.
Add Quectel EG912Y "DIAG, AT, MODEM"
0x6001: ECM / RNDIS + DIAG + AT + MODEM
T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=6001 Rev= 3.18 S: Manufacturer=Android S: Product=Android S: SerialNumber=0000 C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=06 Prot=00 I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0c(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0b(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=89(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=88(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -272,6 +272,7 @@ static void option_instat_callback(struc#define QUECTEL_PRODUCT_RM500Q 0x0800#define QUECTEL_PRODUCT_RM520N 0x0801#define QUECTEL_PRODUCT_EC200U 0x0901 +#define QUECTEL_PRODUCT_EG912Y 0x6001#define QUECTEL_PRODUCT_EC200S_CN 0x6002#define QUECTEL_PRODUCT_EC200A 0x6005#define QUECTEL_PRODUCT_EM061K_LWW 0x6008
@@ -1244,6 +1245,7 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
Greg Kroah-Hartman
maintainerPATCH 38/75 USB: serial: option: add Foxconn T99W265 with new baseline
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Slark Xiao <[email protected]>
commit 13fde9ac23ca8c6d1ac13cc9eefe1f1ac3ee30a4 upstream.
This ID was added based on latest SDX12 code base line, and we made some changes with previous 0489:e0db.
Test evidence as below:
T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 2 P: Vendor=0489 ProdID=e0da Rev=05.04 S: Manufacturer=Qualcomm S: Product=Qualcomm Snapdragon X12 S: SerialNumber=2bda65fb C: #Ifs= 6 Cfg#= 2 Atr=a0 MxPwr=896mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#=0x4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
0&1: MBIM, 2: Modem, 3:GNSS, 4:Diag, 5:ADB
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -2244,6 +2244,8 @@ static const struct usb_device_id option .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, { USB_DEVICE(0x0489, 0xe0b5), /* Foxconn T77W968 ESIM */ .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, + { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0da, 0xff), /* Foxconn T99W265 MBIM variant */ + .driver_info = RSVD(3) | RSVD(5) }, { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff), /* Foxconn T99W265 MBIM */ .driver_info = RSVD(3) }, { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0ee, 0xff), /* Foxconn T99W368 MBIM */
Greg Kroah-Hartman
maintainerPATCH 39/75 USB: serial: option: add Quectel RM500Q R13 firmware support
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinhard Speyerer <[email protected]>
commit 06f22cd6635bdae7d73566fca9879b2026a08e00 upstream.
Add support for Quectel RM500Q R13 firmware which uses Prot=40 for the NMEA port:
T: Bus=02 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 8 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=2c7c ProdID=0800 Rev= 4.14 S: Manufacturer=Quectel S: Product=RM500Q-AE S: SerialNumber=xxxxxxxx C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -1233,6 +1233,7 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0700, 0xff), /* BG95 */ .driver_info = RSVD(3) | ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), .driver_info = ZLP },
Greg Kroah-Hartman
maintainerPATCH 40/75 Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
commit 99e67d46e5ff3c7c901af6009edec72d3d363be8 upstream.
Before setting HCI_INQUIRY bit check if HCI_OP_INQUIRY was really sent otherwise the controller maybe be generating invalid events or, more likely, it is a result of fuzzing tools attempting to test the right behavior of the stack when unexpected events are generated.
--- net/bluetooth/hci_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +2 -1
@@ -1834,7 +1834,8 @@ static void hci_cs_inquiry(struct hci_dereturn ; } -set_bit (HCI_INQUIRY , &hdev->flags); +if (hci_sent_cmd_data (hdev,HCI_OP_INQUIRY )) +set_bit (HCI_INQUIRY , &hdev->flags); }static void hci_cs_create_conn (struct hci_dev *hdev,__u8 status)
Greg Kroah-Hartman
maintainerPATCH 41/75 Bluetooth: L2CAP: Send reject on command corrupted request
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frédéric Danis <[email protected]>
commit 78b99eb1faa7371bf9c534690f26a71b6996622d upstream.
L2CAP/COS/CED/BI-02-C PTS test send a malformed L2CAP signaling packet with 2 commands in it (a connection request and an unknown command) and expect to get a connection response packet and a command reject packet. The second is currently not sent.
--- net/bluetooth/l2cap_core.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
net/bluetooth/l2cap_core.c +15 -6
@@ -6488,6 +6488,14 @@ drop:kfree_skb (skb); } +static inline void l2cap_sig_send_rej (struct l2cap_conn *conn,u16 ident) +{ +struct l2cap_cmd_rej_unk rej; + + rej.reason =cpu_to_le16 (L2CAP_REJ_NOT_UNDERSTOOD ); +l2cap_send_cmd (conn, ident,L2CAP_COMMAND_REJ ,sizeof (rej), &rej); +} +static inline void l2cap_sig_channel (struct l2cap_conn *conn,struct sk_buff *skb) {
@@ -6513,23 +6521,24 @@ static inline void l2cap_sig_channel(strif (len > skb->len || !cmd->ident) {BT_DBG ("corrupted command" ); +l2cap_sig_send_rej (conn, cmd->ident);break ; } err =l2cap_bredr_sig_cmd (conn, cmd, len, skb->data);if (err) { -struct l2cap_cmd_rej_unk rej; -BT_ERR ("Wrong link type (%d)" , err); - - rej.reason =cpu_to_le16 (L2CAP_REJ_NOT_UNDERSTOOD ); -l2cap_send_cmd (conn, cmd->ident,L2CAP_COMMAND_REJ , -sizeof (rej), &rej); +l2cap_sig_send_rej (conn, cmd->ident); }skb_pull (skb, len); } +if (skb->len >0 ) { +BT_DBG ("corrupted command" ); +l2cap_sig_send_rej (conn,0 ); + } + drop:kfree_skb (skb); }
Greg Kroah-Hartman
maintainerPATCH 42/75 Input: soc_button_array - add mapping for airplane mode button
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoffer Sandberg <[email protected]>
commit ea3715941a9b7d816a1e9096ac0577900af2a69e upstream.
This add a mapping for the airplane mode button on the TUXEDO Pulse Gen3.
While it is physically a key it behaves more like a switch, sending a key down on first press and a key up on 2nd press. Therefor the switch event is used here. Besides this behaviour it uses the HID usage-id 0xc6 (Wireless Radio Button) and not 0xc8 (Wireless Radio Slider Switch), but since neither 0xc6 nor 0xc8 are currently implemented at all in soc_button_array this not to standard behaviour is not put behind a quirk for the moment.
--- drivers/input/misc/soc_button_array.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/input/misc/soc_button_array.c +5 -0
@@ -299,6 +299,11 @@ static int soc_button_parse_btn_desc(str info->name ="power" ; info->event_code =KEY_POWER ; info->wakeup = true; + }else if (upage ==0x01 && usage ==0xc6 ) { + info->name ="airplane mode switch" ; + info->event_type =EV_SW ; + info->event_code =SW_RFKILL_ALL ; + info->active_low = false; }else if (upage ==0x01 && usage ==0xca ) { info->name ="rotation lock switch" ; info->event_type =EV_SW ;
Greg Kroah-Hartman
maintainerPATCH 43/75 net: 9p: avoid freeing uninit memory in p9pdu_vreadf
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit ff49bf1867578f23a5ffdd38f927f6e1e16796c4 upstream.
If some of p9pdu_readf() calls inside case 'T' in p9pdu_vreadf() fails, the error path is not handled properly. *wnames or members of *wnames array may be left uninitialized and invalidly freed.
Initialize *wnames to NULL in beginning of case 'T'. Initialize the first *wnames array element to NULL and nullify the failing *wnames element so that the error path freeing loop stops on the first NULL element and doesn't proceed further.
Found by Linux Verification Center (linuxtesting.org).
Message-ID: <[email protected]>
--- net/9p/protocol.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
net/9p/protocol.c +13 -4
@@ -228,6 +228,8 @@ p9pdu_vreadf(struct p9_fcall *pdu, int p uint16_t *nwname = va_arg(ap, uint16_t *); char ***wnames = va_arg(ap, char ***); + *wnames =NULL ; + errcode =p9pdu_readf (pdu, proto_version,"w" , nwname);if (!errcode) {
@@ -237,6 +239,8 @@ p9pdu_vreadf(struct p9_fcall *pdu, int p GFP_NOFS);if (!*wnames) errcode = -ENOMEM ; +else + (*wnames)[0 ] =NULL ; }if (!errcode) {
@@ -248,8 +252,10 @@ p9pdu_vreadf(struct p9_fcall *pdu, int p proto_version,"s" , &(*wnames)[i]); -if (errcode) +if (errcode) { + (*wnames)[i] =NULL ;break ; + } } }
@@ -257,11 +263,14 @@ p9pdu_vreadf(struct p9_fcall *pdu, int pif (*wnames) {int i; -for (i =0 ; i < *nwname; i++) +for (i =0 ; i < *nwname; i++) { +if (!(*wnames)[i]) +break ;kfree ((*wnames)[i]); + } +kfree (*wnames); + *wnames =NULL ; } -kfree (*wnames); - *wnames =NULL ; } }break ;
Greg Kroah-Hartman
maintainerPATCH 44/75 net: rfkill: gpio: set GPIO direction
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rouven Czerwinski <[email protected]>
commit 23484d817082c3005252d8edfc8292c8a1006b5b upstream.
Fix the undefined usage of the GPIO consumer API after retrieving the GPIO description with GPIO_ASIS. The API documentation mentions that GPIO_ASIS won't set a GPIO direction and requires the user to set a direction before using the GPIO.
This can be confirmed on i.MX6 hardware, where rfkill-gpio is no longer able to enabled/disable a device, presumably because the GPIO controller was never configured for the output direction.
--- net/rfkill/rfkill-gpio.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/rfkill/rfkill-gpio.c +8 -0
@@ -116,6 +116,14 @@ static int rfkill_gpio_probe(struct platreturn -EINVAL ; } + ret =gpiod_direction_output (rfkill->reset_gpio, true); +if (ret) +return ret; + + ret =gpiod_direction_output (rfkill->shutdown_gpio, true); +if (ret) +return ret; + rfkill->rfkill_dev =rfkill_alloc (rfkill->name, &pdev->dev, rfkill->type, &rfkill_gpio_ops, rfkill);
Greg Kroah-Hartman
maintainerPATCH 45/75 net: ks8851: Fix TX stall caused by TX buffer overrun
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronald Wahl <[email protected]>
commit 3dc5d44545453de1de9c53cc529cc960a85933da upstream.
There is a bug in the ks8851 Ethernet driver that more data is written to the hardware TX buffer than actually available. This is caused by wrong accounting of the free TX buffer space.
The driver maintains a tx_space variable that represents the TX buffer space that is deemed to be free. The ks8851_start_xmit_spi() function adds an SKB to a queue if tx_space is large enough and reduces tx_space by the amount of buffer space it will later need in the TX buffer and then schedules a work item. If there is not enough space then the TX queue is stopped.
The worker function ks8851_tx_work() dequeues all the SKBs and writes the data into the hardware TX buffer. The last packet will trigger an interrupt after it was send. Here it is assumed that all data fits into the TX buffer.
In the interrupt routine (which runs asynchronously because it is a threaded interrupt) tx_space is updated with the current value from the hardware. Also the TX queue is woken up again.
Now it could happen that after data was sent to the hardware and before handling the TX interrupt new data is queued in ks8851_start_xmit_spi() when the TX buffer space had still some space left. When the interrupt is actually handled tx_space is updated from the hardware but now we already have new SKBs queued that have not been written to the hardware TX buffer yet. Since tx_space has been overwritten by the value from the hardware the space is not accounted for.
Now we have more data queued then buffer space available in the hardware and ks8851_tx_work() will potentially overrun the hardware TX buffer. In many cases it will still work because often the buffer is written out fast enough so that no overrun occurs but for example if the peer throttles us via flow control then an overrun may happen.
This can be fixed in different ways. The most simple way would be to set tx_space to 0 before writing data to the hardware TX buffer preventing the queuing of more SKBs until the TX interrupt has been handled. I have chosen a slightly more efficient (and still rather simple) way and track the amount of data that is already queued and not yet written to the hardware. When new SKBs are to be queued the already queued amount of data is honoured when checking free TX buffer space.
I tested this with a setup of two linked KS8851 running iperf3 between the two in bidirectional mode. Before the fix I got a stall after some minutes. With the fix I saw now issues anymore after hours.
--- drivers/net/ethernet/micrel/ks8851.h | 3 ++ drivers/net/ethernet/micrel/ks8851_common.c | 20 ++++++------- drivers/net/ethernet/micrel/ks8851_spi.c | 42 ++++++++++++++++++---------- 3 files changed, 40 insertions(+), 25 deletions(-)
drivers/net/ethernet/micrel/ks8851.h +3 -0
@@ -350,6 +350,8 @@ union ks8851_tx_hdr {* @rxd: Space for receiving SPI data, in DMA-able space. * @txd: Space for transmitting SPI data, in DMA-able space. * @msg_enable: The message flags controlling driver output (see ethtool). +* @tx_space: Free space in the hardware TX buffer (cached copy of KS_TXMIR). +* @queued_len: Space required in hardware TX buffer for queued packets in txq. * @fid: Incrementing frame id tag. * @rc_ier: Cached copy of KS_IER. * @rc_ccr: Cached copy of KS_CCR.
@@ -398,6 +400,7 @@ struct ks8851_net {struct work_struct rxctrl_work;struct sk_buff_head txq; +unsigned int queued_len;struct eeprom_93cx6 eeprom;struct regulator *vdd_reg;
drivers/net/ethernet/micrel/ks8851_common.c +10 -10
@@ -363,16 +363,18 @@ static irqreturn_t ks8851_irq(int irq, v handled |=IRQ_RXPSI ;if (status &IRQ_TXI ) { - handled |=IRQ_TXI ; +unsigned short tx_space =ks8851_rdreg16 (ks,KS_TXMIR ); -/* no lock here, tx queue should have been stopped */ +netif_dbg (ks, intr, ks->netdev, +"%s: txspace %d\n" , __func__, tx_space); -/* update our idea of how much tx space is available to the -* system */ - ks->tx_space =ks8851_rdreg16 (ks,KS_TXMIR ); +spin_lock (&ks->statelock); + ks->tx_space = tx_space; +if (netif_queue_stopped (ks->netdev)) +netif_wake_queue (ks->netdev); +spin_unlock (&ks->statelock); -netif_dbg (ks, intr, ks->netdev, -"%s: txspace %d\n" , __func__, ks->tx_space); + handled |=IRQ_TXI ; }if (status &IRQ_RXI )
@@ -415,9 +417,6 @@ static irqreturn_t ks8851_irq(int irq, vif (status &IRQ_LCI )mii_check_link (&ks->mii); -if (status &IRQ_TXI ) -netif_wake_queue (ks->netdev); -return IRQ_HANDLED ; }
@@ -501,6 +500,7 @@ static int ks8851_net_open(struct net_deks8851_wrreg16 (ks,KS_ISR , ks->rc_ier);ks8851_wrreg16 (ks,KS_IER , ks->rc_ier); + ks->queued_len =0 ;netif_start_queue (ks->netdev);netif_dbg (ks, ifup, ks->netdev,"network device up\n" );
drivers/net/ethernet/micrel/ks8851_spi.c +27 -15
86 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 46/75 dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
commit a2a8aefecbd0f87d6127951cef33b3def8439057 upstream.
Both imx23.dtsi and imx28.dtsi describe the OCOTP nodes in the format:
compatible = "fsl,imx28-ocotp", "fsl,ocotp";
Document the "fsl,ocotp" entry to fix the following schema warning:
efuse@8002c000: compatible: ['fsl,imx23-ocotp', 'fsl,ocotp'] is too long from schema $id: http://devicetree.org/schemas/nvmem/mxs-ocotp.yaml#
--- Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml +6 -4
@@ -14,9 +14,11 @@ allOf: properties: compatible: - enum: - - fsl,imx23-ocotp - - fsl,imx28-ocotp + items: + - enum: + - fsl,imx23-ocotp + - fsl,imx28-ocotp + - const: fsl,ocotp "#address-cells": const: 1
@@ -40,7 +42,7 @@ additionalProperties: false examples: - | ocotp: efuse@8002c000 { - compatible = "fsl,imx28-ocotp"; + compatible = "fsl,imx28-ocotp", "fsl,ocotp"; #address-cells = <1>; #size-cells = <1>; reg = <0x8002c000 0x2000>;
Greg Kroah-Hartman
maintainerPATCH 47/75 tracing / synthetic: Disable events after testing in synth_event_gen_test_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 88b30c7f5d27e1594d70dc2bd7199b18f2b57fa9 upstream.
The synth_event_gen_test module can be built in, if someone wants to run the tests at boot up and not have to load them.
The synth_event_gen_test_init() function creates and enables the synthetic events and runs its tests.
The synth_event_gen_test_exit() disables the events it created and destroys the events.
If the module is builtin, the events are never disabled. The issue is, the events should be disable after the tests are run. This could be an issue if the rest of the boot up tests are enabled, as they expect the events to be in a known state before testing. That known state happens to be disabled.
When CONFIG_SYNTH_EVENT_GEN_TEST=y and CONFIG_EVENT_TRACE_STARTUP_TEST=y a warning will trigger:
Running tests on trace events:
Testing event create_synth_test:
Enabled event during self test!
------------[ cut here ]------------ WARNING: CPU: 2 PID: 1 at kernel/trace/trace_events.c:4150 event_trace_self_tests+0x1c2/0x480 Modules linked in: CPU: 2 PID: 1 Comm: swapper/0 Not tainted 6.7.0-rc2-test-00031-gb803d7c664d5-dirty #276 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:event_trace_self_tests+0x1c2/0x480 Code: bb e8 a2 ab 5d fc 48 8d 7b 48 e8 f9 3d 99 fc 48 8b 73 48 40 f6 c6 01 0f 84 d6 fe ff ff 48 c7 c7 20 b6 ad bb e8 7f ab 5d fc 90 <0f> 0b 90 48 89 df e8 d3 3d 99 fc 48 8b 1b 4c 39 f3 0f 85 2c ff ff RSP: 0000:ffffc9000001fdc0 EFLAGS: 00010246 RAX: 0000000000000029 RBX: ffff88810399ca80 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffffb9f19478 RDI: ffff88823c734e64 RBP: ffff88810399f300 R08: 0000000000000000 R09: fffffbfff79eb32a R10: ffffffffbcf59957 R11: 0000000000000001 R12: ffff888104068090 R13: ffffffffbc89f0a0 R14: ffffffffbc8a0f08 R15: 0000000000000078 FS: 0000000000000000(0000) GS:ffff88823c700000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001f6282001 CR4: 0000000000170ef0 Call Trace: <TASK> ? __warn+0xa5/0x200 ? event_trace_self_tests+0x1c2/0x480 ? report_bug+0x1f6/0x220 ? handle_bug+0x6f/0x90 ? exc_invalid_op+0x17/0x50 ? asm_exc_invalid_op+0x1a/0x20 ? tracer_preempt_on+0x78/0x1c0 ? event_trace_self_tests+0x1c2/0x480 ? __pfx_event_trace_self_tests_init+0x10/0x10 event_trace_self_tests_init+0x27/0xe0 do_one_initcall+0xd6/0x3c0 ? __pfx_do_one_initcall+0x10/0x10 ? kasan_set_track+0x25/0x30 ? rcu_is_watching+0x38/0x60 kernel_init_freeable+0x324/0x450 ? __pfx_kernel_init+0x10/0x10 kernel_init+0x1f/0x1e0 ? _raw_spin_unlock_irq+0x33/0x50 ret_from_fork+0x34/0x60 ? __pfx_kernel_init+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK>
This is because the synth_event_gen_test_init() left the synthetic events that it created enabled. By having it disable them after testing, the other selftests will run fine.
--- kernel/trace/synth_event_gen_test.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
kernel/trace/synth_event_gen_test.c +11 -0
@@ -477,6 +477,17 @@ static int __init synth_event_gen_test_init(void) ret =test_trace_synth_event ();WARN_ON (ret); + +/* Disable when done */ +trace_array_set_clr_event (gen_synth_test->tr, +"synthetic" , +"gen_synth_test" , false); +trace_array_set_clr_event (empty_synth_test->tr, +"synthetic" , +"empty_synth_test" , false); +trace_array_set_clr_event (create_synth_test->tr, +"synthetic" , +"create_synth_test" , false); out:return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/75 bus: ti-sysc: Flush posted write only after srst_udelay
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
commit f71f6ff8c1f682a1cae4e8d7bdeed9d7f76b8f75 upstream.
Commit 34539b442b3b ("bus: ti-sysc: Flush posted write on enable before reset") caused a regression reproducable on omap4 duovero where the ISS target module can produce interconnect errors on boot. Turns out the registers are not accessible until after a delay for devices needing a ti,sysc-delay-us value.
Let's fix this by flushing the posted write only after the reset delay. We do flushing also for ti,sysc-delay-us using devices as that should trigger an interconnect error if the delay is not properly configured.
Let's also add some comments while at it.
--- drivers/bus/ti-sysc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/bus/ti-sysc.c +14 -4
@@ -2093,13 +2093,23 @@ static int sysc_reset(struct sysc *ddata sysc_val =sysc_read_sysconfig (ddata); sysc_val |= sysc_mask;sysc_write (ddata, sysc_offset, sysc_val); -/* Flush posted write */ + +/* +* Some devices need a delay before reading registers +* after reset. Presumably a srst_udelay is not needed +* for devices that use a rstctrl register reset. +*/ +if (ddata->cfg.srst_udelay) +fsleep (ddata->cfg.srst_udelay); + +/* +* Flush posted write. For devices needing srst_udelay +* this should trigger an interconnect error if the +* srst_udelay value is needed but not configured. +*/ sysc_val =sysc_read_sysconfig (ddata); } -if (ddata->cfg.srst_udelay) -fsleep (ddata->cfg.srst_udelay); -if (ddata->post_reset_quirk) ddata->post_reset_quirk (ddata);
Greg Kroah-Hartman
maintainerPATCH 49/75 lib/vsprintf: Fix %pfwf when current node refcount == 0
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herve Codina <[email protected]>
commit 5c47251e8c4903111608ddcba2a77c0c425c247c upstream.
A refcount issue can appeared in __fwnode_link_del() due to the pr_debug() call:
WARNING: CPU: 0 PID: 901 at lib/refcount.c:25 refcount_warn_saturate+0xe5/0x110 Call Trace: <TASK> ... of_node_get+0x1e/0x30 of_fwnode_get+0x28/0x40 fwnode_full_name_string+0x34/0x90 fwnode_string+0xdb/0x140 ... vsnprintf+0x17b/0x630 ... __fwnode_link_del+0x25/0xa0 fwnode_links_purge+0x39/0xb0 of_node_release+0xd9/0x180 ...
Indeed, an fwnode (of_node) is being destroyed and so, of_node_release() is called because the of_node refcount reached 0.
Quoted 1 line
From
of_node_release()several function calls are done and lead to
a pr_debug() calls with %pfwf to print the fwnode full name. The issue is not present if we change %pfwf to %pfwP.
To print the full name, %pfwf iterates over the current node and its parents and obtain/drop a reference to all nodes involved.
In order to allow to print the full name (%pfwf) of a node while it is being destroyed, do not obtain/drop a reference to this current node.
--- lib/vsprintf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
lib/vsprintf.c +8 -3
@@ -1984,15 +1984,20 @@ char *fwnode_full_name_string(struct fwn/* Loop starting from the root node to the current node. */ for (depth =fwnode_count_parents (fwnode); depth >=0 ; depth--) { -struct fwnode_handle *__fwnode = -fwnode_get_nth_parent (fwnode, depth); +/* +* Only get a reference for other nodes (i.e. parent nodes). +* fwnode refcount may be 0 here. +*/ +struct fwnode_handle *__fwnode = depth ? +fwnode_get_nth_parent (fwnode, depth) : fwnode; buf =string (buf, end,fwnode_get_name_prefix (__fwnode), default_str_spec); buf =string (buf, end,fwnode_get_name (__fwnode), default_str_spec); -fwnode_handle_put (__fwnode); +if (depth) +fwnode_handle_put (__fwnode); }return buf;
Greg Kroah-Hartman
maintainerPATCH 50/75 x86/alternatives: Sync core before enabling interrupts
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 3ea1704a92967834bf0e64ca1205db4680d04048 upstream.
text_poke_early() does:
local_irq_save(flags); memcpy(addr, opcode, len); local_irq_restore(flags); sync_core();
That's not really correct because the synchronization should happen before interrupts are re-enabled to ensure that a pending interrupt observes the complete update of the opcodes.
It's not entirely clear whether the interrupt entry provides enough serialization already, but moving the sync_core() invocation into interrupt disabled region does no harm and is obviously correct.
--- arch/x86/kernel/alternative.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/alternative.c +1 -1
@@ -1093,8 +1093,8 @@ void __init_or_module text_poke_early(vo }else {local_irq_save (flags);memcpy (addr, opcode, len); -local_irq_restore (flags);sync_core (); +local_irq_restore (flags);/* * Could also do a CLFLUSH here to speed up CPU recovery; but
Greg Kroah-Hartman
maintainerPATCH 51/75 9p/net: fix possible memory leak in p9_check_errors()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangyu Hua <[email protected]>
commit ce07087964208eee2ca2f9ee4a98f8b5d9027fe6 upstream.
When p9pdu_readf() is called with "s?d" attribute, it allocates a pointer that will store a string. But when p9pdu_readf() fails while handling "d" then this pointer will not be freed in p9_check_errors().
Message-ID: <[email protected]>
--- net/9p/client.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/9p/client.c +5 -2
@@ -520,11 +520,14 @@ static int p9_check_errors(struct p9_clireturn 0 ;if (!p9_is_proto_dotl (c)) { -char *ename; +char *ename =NULL ; + err =p9pdu_readf (&req->rc, c->proto_version,"s?d" , &ename, &ecode); -if (err) +if (err) { +kfree (ename); goto out_err; + }if (p9_is_proto_dotu (c) && ecode <512 ) err = -ecode;
Greg Kroah-Hartman
maintainerPATCH 52/75 ARM: dts: Fix occasional boot hang for am3 usb
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb ]
With subtle timings changes, we can now sometimes get an external abort on non-linefetch error booting am3 devices at sysc_reset(). This is because of a missing reset delay needed for the usb target module.
Looks like we never enabled the delay earlier for am3, although a similar issue was seen earlier with a similar usb setup for dm814x as described in commit ebf244148092 ("ARM: OMAP2+: Use srst_udelay for USB on dm814x").
--- arch/arm/boot/dts/am33xx.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/am33xx.dtsi +1 -0
@@ -347,6 +347,7 @@ usb: target-module@47400000 { <SYSC_IDLE_NO>, <SYSC_IDLE_SMART>, <SYSC_IDLE_SMART_WKUP>; + ti,sysc-delay-us = <2>; clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/75 Bluetooth: SMP: Convert BT_ERR/BT_DBG to bt_dev_err/bt_dev_dbg
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 2e1614f7d61e407f1a8e7935a2903a6fa3cb0b11 ]
This converts instances of BT_ERR and BT_DBG to bt_dev_err and bt_dev_dbg which can be enabled at runtime when BT_FEATURE_DEBUG is enabled.
Note: Not all instances could be converted as some are exercised by selftest.
Stable-dep-of: 59b047bc9808 ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
--- net/bluetooth/smp.c | 98 ++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 46 deletions(-)
net/bluetooth/smp.c +52 -46
@@ -596,7 +596,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)if (!chan)return ; -BT_DBG ("code 0x%2.2x" , code); +bt_dev_dbg (conn->hcon->hdev,"code 0x%2.2x" , code); iv[0 ].iov_base = &code; iv[0 ].iov_len =1 ;
@@ -860,7 +860,8 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,memset (smp->tk,0 ,sizeof (smp->tk));clear_bit (SMP_FLAG_TK_VALID , &smp->flags); -BT_DBG ("tk_request: auth:%d lcl:%d rem:%d" , auth, local_io, remote_io); +bt_dev_dbg (hcon->hdev,"auth:%d lcl:%d rem:%d" , auth, local_io, + remote_io);/* If neither side wants MITM, either "just" confirm an incoming * request or use just-works for outgoing ones. The JUST_CFM
@@ -925,7 +926,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,get_random_bytes (&passkey,sizeof (passkey)); passkey %=1000000 ;put_unaligned_le32 (passkey, smp->tk); -BT_DBG ("PassKey: %d" , passkey); +bt_dev_dbg (hcon->hdev,"PassKey: %d" , passkey);set_bit (SMP_FLAG_TK_VALID , &smp->flags); }
@@ -950,7 +951,7 @@ static u8 smp_confirm(struct smp_chan *smp)struct smp_cmd_pairing_confirm cp;int ret; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (conn->hcon->hdev,"conn %p" , conn); ret = smp_c1(smp->tk, smp->prnd, smp->preq, smp->prsp, conn->hcon->init_addr_type, &conn->hcon->init_addr,
@@ -978,7 +979,8 @@ static u8 smp_random(struct smp_chan *smp)u8 confirm[16 ];int ret; -BT_DBG ("conn %p %s" , conn, conn->hcon->out ?"master" :"slave" ); +bt_dev_dbg (conn->hcon->hdev,"conn %p %s" , conn, + conn->hcon->out ?"master" :"slave" ); ret = smp_c1(smp->tk, smp->rrnd, smp->preq, smp->prsp, hcon->init_addr_type, &hcon->init_addr,
@@ -1237,7 +1239,7 @@ static void smp_distribute_keys(struct smp_chan *smp)struct hci_dev *hdev = hcon->hdev;__u8 *keydist; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn); rsp = (void *) &smp->prsp[1 ];
@@ -1267,7 +1269,7 @@ static void smp_distribute_keys(struct smp_chan *smp) *keydist &= ~SMP_SC_NO_DIST ; } -BT_DBG ("keydist 0x%x" , *keydist); +bt_dev_dbg (hdev,"keydist 0x%x" , *keydist);if (*keydist &SMP_DIST_ENC_KEY ) {struct smp_cmd_encrypt_info enc;
@@ -1367,13 +1369,14 @@ static void smp_timeout(struct work_struct *work) security_timer.work);struct l2cap_conn *conn = smp->conn; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (conn->hcon->hdev,"conn %p" , conn);hci_disconnect (conn->hcon,HCI_ERROR_REMOTE_USER_TERM ); }static struct smp_chan *smp_chan_create (struct l2cap_conn *conn) { +struct hci_conn *hcon = conn->hcon;struct l2cap_chan *chan = conn->smp;struct smp_chan *smp;
@@ -1383,13 +1386,13 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn) smp->tfm_cmac =crypto_alloc_shash ("cmac(aes)" ,0 ,0 );if (IS_ERR (smp->tfm_cmac)) { -BT_ERR ("Unable to create CMAC crypto context" ); +bt_dev_err (hcon->hdev,"Unable to create CMAC crypto context" ); goto zfree_smp; } smp->tfm_ecdh =crypto_alloc_kpp ("ecdh" ,0 ,0 );if (IS_ERR (smp->tfm_ecdh)) { -BT_ERR ("Unable to create ECDH crypto context" ); +bt_dev_err (hcon->hdev,"Unable to create ECDH crypto context" ); goto free_shash; }
@@ -1400,7 +1403,7 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)INIT_DELAYED_WORK (&smp->security_timer, smp_timeout); -hci_conn_hold (conn->hcon); +hci_conn_hold (hcon);return smp;
@@ -1565,8 +1568,8 @@ static u8 sc_passkey_round(struct smp_chan *smp, u8 smp_op)if (!hcon->out)return 0 ; -BT_DBG ("%s Starting passkey round %u" , hdev->name, - smp->passkey_round +1 ); +bt_dev_dbg (hdev,"Starting passkey round %u" , + smp->passkey_round +1 );SMP_ALLOW_CMD (smp,SMP_CMD_PAIRING_CONFIRM );
@@ -1626,7 +1629,7 @@ int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey)u32 value;int err; -BT_DBG ("" ); +bt_dev_dbg (conn->hcon->hdev,"" );if (!conn)return -ENOTCONN ;
@@ -1652,7 +1655,7 @@ int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey)case MGMT_OP_USER_PASSKEY_REPLY : value =le32_to_cpu (passkey);memset (smp->tk,0 ,sizeof (smp->tk)); -BT_DBG ("PassKey: %d" , value); +bt_dev_dbg (conn->hcon->hdev,"PassKey: %d" , value);put_unaligned_le32 (value, smp->tk); fallthrough;case MGMT_OP_USER_CONFIRM_REPLY :
@@ -1734,7 +1737,7 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)u8 key_size, auth, sec_level;int ret; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn);if (skb->len <sizeof (*req))return SMP_INVALID_PARAMS ;
@@ -1888,7 +1891,7 @@ static u8 sc_send_public_key(struct smp_chan *smp) }if (hci_dev_test_flag (hdev,HCI_USE_DEBUG_KEYS )) { -BT_DBG ("Using debug keys" ); +bt_dev_dbg (hdev,"Using debug keys" );if (set_ecdh_privkey (smp->tfm_ecdh, debug_sk))return SMP_UNSPECIFIED ;memcpy (smp->local_pk, debug_pk,64 );
@@ -1925,7 +1928,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)u8 key_size, auth;int ret; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn);if (skb->len <sizeof (*rsp))return SMP_INVALID_PARAMS ;
@@ -2020,7 +2023,7 @@ static u8 sc_check_confirm(struct smp_chan *smp) {struct l2cap_conn *conn = smp->conn; -BT_DBG ("" ); +bt_dev_dbg (conn->hcon->hdev,"" );if (smp->method ==REQ_PASSKEY || smp->method ==DSP_PASSKEY )return sc_passkey_round (smp,SMP_CMD_PAIRING_CONFIRM );
@@ -2079,8 +2082,10 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb) {struct l2cap_chan *chan = conn->smp;struct smp_chan *smp = chan->data; +struct hci_conn *hcon = conn->hcon; +struct hci_dev *hdev = hcon->hdev; -BT_DBG ("conn %p %s" , conn, conn->hcon->out ?"master" :"slave" ); +bt_dev_dbg (hdev,"conn %p %s" , conn, hcon->out ?"master" :"slave" );if (skb->len <sizeof (smp->pcnf))return SMP_INVALID_PARAMS ;
@@ -2095,7 +2100,7 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)if (test_bit (SMP_FLAG_REMOTE_PK , &smp->flags))return sc_check_confirm (smp); -BT_ERR ("Unexpected SMP Pairing Confirm" ); +bt_dev_err (hdev,"Unexpected SMP Pairing Confirm" ); ret =fixup_sc_false_positive (smp);if (ret)
@@ -2126,7 +2131,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)u32 passkey;int err; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hcon->hdev,"conn %p" , conn);if (skb->len <sizeof (smp->rrnd))return SMP_INVALID_PARAMS ;
@@ -2285,7 +2290,7 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)struct smp_chan *smp;u8 sec_level, auth; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn);if (skb->len <sizeof (*rp))return SMP_INVALID_PARAMS ;
@@ -2348,7 +2353,8 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)__u8 authreq;int ret; -BT_DBG ("conn %p hcon %p level 0x%2.2x" , conn, hcon, sec_level); +bt_dev_dbg (hcon->hdev,"conn %p hcon %p level 0x%2.2x" , conn, hcon, + sec_level);/* This may be NULL if there's an unexpected disconnection */ if (!conn)
@@ -2484,7 +2490,7 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)struct l2cap_chan *chan = conn->smp;struct smp_chan *smp = chan->data; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (conn->hcon->hdev,"conn %p" , conn);if (skb->len <sizeof (*rp))return SMP_INVALID_PARAMS ;
@@ -2517,7 +2523,7 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)struct smp_ltk *ltk;u8 authenticated; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn);if (skb->len <sizeof (*rp))return SMP_INVALID_PARAMS ;
@@ -2549,7 +2555,7 @@ static int smp_cmd_ident_info(struct l2cap_conn *conn, struct sk_buff *skb)struct l2cap_chan *chan = conn->smp;struct smp_chan *smp = chan->data; -BT_DBG ("" ); +bt_dev_dbg (conn->hcon->hdev,"" );if (skb->len <sizeof (*info))return SMP_INVALID_PARAMS ;
@@ -2581,7 +2587,7 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,struct hci_conn *hcon = conn->hcon;bdaddr_t rpa; -BT_DBG ("" ); +bt_dev_dbg (hcon->hdev,"" );if (skb->len <sizeof (*info))return SMP_INVALID_PARAMS ;
@@ -2648,7 +2654,7 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)struct smp_chan *smp = chan->data;struct smp_csrk *csrk; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (conn->hcon->hdev,"conn %p" , conn);if (skb->len <sizeof (*rp))return SMP_INVALID_PARAMS ;
@@ -2728,7 +2734,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)struct smp_cmd_pairing_confirm cfm;int err; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hdev,"conn %p" , conn);if (skb->len <sizeof (*key))return SMP_INVALID_PARAMS ;
@@ -2792,7 +2798,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb) smp->method =sc_select_method (smp); -BT_DBG ("%s selected method 0x%02x" , hdev->name, smp->method); +bt_dev_dbg (hdev,"selected method 0x%02x" , smp->method);/* JUST_WORKS and JUST_CFM result in an unauthenticated key */ if (smp->method ==JUST_WORKS || smp->method ==JUST_CFM )
@@ -2867,7 +2873,7 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)u8 io_cap[3 ], r[16 ], e[16 ];int err; -BT_DBG ("conn %p" , conn); +bt_dev_dbg (hcon->hdev,"conn %p" , conn);if (skb->len <sizeof (*check))return SMP_INVALID_PARAMS ;
@@ -2927,7 +2933,7 @@ static int smp_cmd_keypress_notify(struct l2cap_conn *conn, {struct smp_cmd_keypress_notify *kp = (void *) skb->data; -BT_DBG ("value 0x%02x" , kp->value); +bt_dev_dbg (conn->hcon->hdev,"value 0x%02x" , kp->value);return 0 ; }
@@ -3024,7 +3030,7 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)break ;default : -BT_DBG ("Unknown command code 0x%2.2x" , code); +bt_dev_dbg (hcon->hdev,"Unknown command code 0x%2.2x" , code); reason =SMP_CMD_NOTSUPP ; goto done; }
@@ -3049,7 +3055,7 @@ static void smp_teardown_cb(struct l2cap_chan *chan, int err) {struct l2cap_conn *conn = chan->conn; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (conn->hcon->hdev,"chan %p" , chan);if (chan->data)smp_chan_destroy (conn);
@@ -3066,7 +3072,7 @@ static void bredr_pairing(struct l2cap_chan *chan)struct smp_cmd_pairing req;struct smp_chan *smp; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (hdev,"chan %p" , chan);/* Only new pairings are interesting */ if (!test_bit (HCI_CONN_NEW_LINK_KEY , &hcon->flags))
@@ -3113,7 +3119,7 @@ static void bredr_pairing(struct l2cap_chan *chan)set_bit (SMP_FLAG_SC , &smp->flags); -BT_DBG ("%s starting SMP over BR/EDR" , hdev->name); +bt_dev_dbg (hdev,"starting SMP over BR/EDR" );/* Prepare and send the BR/EDR SMP Pairing Request */ build_bredr_pairing_cmd (smp, &req,NULL );
@@ -3131,7 +3137,7 @@ static void smp_resume_cb(struct l2cap_chan *chan)struct l2cap_conn *conn = chan->conn;struct hci_conn *hcon = conn->hcon; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (hcon->hdev,"chan %p" , chan);if (hcon->type ==ACL_LINK ) {bredr_pairing (chan);
@@ -3154,7 +3160,7 @@ static void smp_ready_cb(struct l2cap_chan *chan)struct l2cap_conn *conn = chan->conn;struct hci_conn *hcon = conn->hcon; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (hcon->hdev,"chan %p" , chan);/* No need to call l2cap_chan_hold() here since we already own * the reference taken in smp_new_conn_cb(). This is just the
@@ -3172,7 +3178,7 @@ static int smp_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) {int err; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (chan->conn->hcon->hdev,"chan %p" , chan); err =smp_sig_channel (chan, skb);if (err) {
@@ -3224,7 +3230,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan) {struct l2cap_chan *chan; -BT_DBG ("pchan %p" , pchan); +bt_dev_dbg (pchan->conn->hcon->hdev,"pchan %p" , pchan); chan =l2cap_chan_create ();if (!chan)
@@ -3245,7 +3251,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)*/ atomic_set (&chan->nesting,L2CAP_NESTING_SMP ); -BT_DBG ("created chan %p" , chan); +bt_dev_dbg (pchan->conn->hcon->hdev,"created chan %p" , chan);return chan; }
@@ -3286,14 +3292,14 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid) tfm_cmac =crypto_alloc_shash ("cmac(aes)" ,0 ,0 );if (IS_ERR (tfm_cmac)) { -BT_ERR ("Unable to create CMAC crypto context" ); +bt_dev_err (hdev,"Unable to create CMAC crypto context" );kfree_sensitive (smp);return ERR_CAST (tfm_cmac); } tfm_ecdh =crypto_alloc_kpp ("ecdh" ,0 ,0 );if (IS_ERR (tfm_ecdh)) { -BT_ERR ("Unable to create ECDH crypto context" ); +bt_dev_err (hdev,"Unable to create ECDH crypto context" );crypto_free_shash (tfm_cmac);kfree_sensitive (smp);return ERR_CAST (tfm_ecdh);
@@ -3349,7 +3355,7 @@ static void smp_del_chan(struct l2cap_chan *chan) {struct smp_dev *smp; -BT_DBG ("chan %p" , chan); +bt_dev_dbg (chan->conn->hcon->hdev,"chan %p" , chan); smp = chan->data;if (smp) {
@@ -3422,7 +3428,7 @@ int smp_register(struct hci_dev *hdev) {struct l2cap_chan *chan; -BT_DBG ("%s" , hdev->name); +bt_dev_dbg (hdev,"" );/* If the controller does not support Low Energy operation, then * there is also no need to register any SMP channel.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/75 Bluetooth: use inclusive language in SMP
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Archie Pusaka <[email protected]>
[ Upstream commit fad646e16d3cafd67d3cfff8e66f77401190957e ]
This patch replaces some non-inclusive terms based on the appropriate language mapping table compiled by the Bluetooth SIG:
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf
Specifically, these terms are replaced:
master -> initiator
slave -> responder
Stable-dep-of: 59b047bc9808 ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
--- include/net/bluetooth/mgmt.h | 2 +- net/bluetooth/mgmt.c | 10 +++--- net/bluetooth/smp.c | 66 +++++++++++++++++++----------------- net/bluetooth/smp.h | 6 ++-- 4 files changed, 43 insertions(+), 41 deletions(-)
include/net/bluetooth/mgmt.h +1 -1
@@ -202,7 +202,7 @@ struct mgmt_cp_load_link_keys {struct mgmt_ltk_info {struct mgmt_addr_info addr;__u8 type; -__u8 master; +__u8 initiator;__u8 enc_size;__le16 ediv;__le64 rand;
net/bluetooth/mgmt.c +5 -5
@@ -5939,7 +5939,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,static bool ltk_is_valid (struct mgmt_ltk_info *key) { -if (key->master !=0x00 && key->master !=0x01 ) +if (key->initiator !=0x00 && key->initiator !=0x01 )return false;switch (key->addr.type) {
@@ -6017,11 +6017,11 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,switch (key->type) {case MGMT_LTK_UNAUTHENTICATED : authenticated =0x00 ; - type = key->master ?SMP_LTK :SMP_LTK_SLAVE ; + type = key->initiator ?SMP_LTK :SMP_LTK_RESPONDER ;break ;case MGMT_LTK_AUTHENTICATED : authenticated =0x01 ; - type = key->master ?SMP_LTK :SMP_LTK_SLAVE ; + type = key->initiator ?SMP_LTK :SMP_LTK_RESPONDER ;break ;case MGMT_LTK_P256_UNAUTH : authenticated =0x00 ;
@@ -8055,7 +8055,7 @@ static u8 mgmt_ltk_type(struct smp_ltk *ltk) {switch (ltk->type) {case SMP_LTK : -case SMP_LTK_SLAVE : +case SMP_LTK_RESPONDER :if (ltk->authenticated)return MGMT_LTK_AUTHENTICATED ;return MGMT_LTK_UNAUTHENTICATED ;
@@ -8101,7 +8101,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent) ev.key.rand = key->rand;if (key->type ==SMP_LTK ) - ev.key.master =1 ; + ev.key.initiator =1 ;/* Make sure we copy only the significant bytes based on the * encryption key size, and set the rest of the value to zeroes.
net/bluetooth/smp.c +34 -32
181 lines not on this page · raw message
net/bluetooth/smp.h +3 -3
@@ -79,8 +79,8 @@ struct smp_cmd_encrypt_info {__u8 ltk[16 ]; } __packed; -#define SMP_CMD_MASTER_IDENT 0x07 -struct smp_cmd_master_ident { +#define SMP_CMD_INITIATOR_IDENT 0x07 +struct smp_cmd_initiator_ident {__le16 ediv;__le64 rand; } __packed;
@@ -146,7 +146,7 @@ struct smp_cmd_keypress_notify {enum {SMP_STK ,SMP_LTK , -SMP_LTK_SLAVE , +SMP_LTK_RESPONDER ,SMP_LTK_P256 ,SMP_LTK_P256_DEBUG , };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/75 Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiao Yao <[email protected]>
[ Upstream commit 59b047bc98084f8af2c41483e4d68a5adf2fa7f7 ]
If two Bluetooth devices both support BR/EDR and BLE, and also support Secure Connections, then they only need to pair once. The LTK generated during the LE pairing process may be converted into a BR/EDR link key for BR/EDR transport, and conversely, a link key generated during the BR/EDR SSP pairing process can be converted into an LTK for LE transport. Hence, the link type of the link key and LTK is not fixed, they can be either an LE LINK or an ACL LINK.
Currently, in the mgmt_new_irk/ltk/crsk/link_key functions, the link type is fixed, which could lead to incorrect address types being reported to the application layer. Therefore, it is necessary to add link_type/addr_type to the smp_irk/ltk/crsk and link_key, to ensure the generation of the correct address type.
SMP over BREDR:
Before Fix:
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 12
BR/EDR SMP: Identity Address Information (0x09) len 7
Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Identity Resolving Key (0x0018) plen 30
Random address: 00:00:00:00:00:00 (Non-Resolvable)
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Long Term Key (0x000a) plen 37
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated key from P-256 (0x03)After Fix:
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 12
BR/EDR SMP: Identity Address Information (0x09) len 7
Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Identity Resolving Key (0x0018) plen 30
Random address: 00:00:00:00:00:00 (Non-Resolvable)
BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Long Term Key (0x000a) plen 37
BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated key from P-256 (0x03)SMP over LE:
Before Fix:
@ MGMT Event: New Identity Resolving Key (0x0018) plen 30
Random address: 5F:5C:07:37:47:D5 (Resolvable)
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Long Term Key (0x000a) plen 37
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated key from P-256 (0x03)
@ MGMT Event: New Link Key (0x0009) plen 26
BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated Combination key from P-256 (0x08)After Fix:
@ MGMT Event: New Identity Resolving Key (0x0018) plen 30
Random address: 5E:03:1C:00:38:21 (Resolvable)
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
@ MGMT Event: New Long Term Key (0x000a) plen 37
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated key from P-256 (0x03)
@ MGMT Event: New Link Key (0x0009) plen 26
Store hint: Yes (0x01)
LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76)
Key type: Authenticated Combination key from P-256 (0x08)--- include/net/bluetooth/hci_core.h | 5 +++++ net/bluetooth/mgmt.c | 25 ++++++++++++++++++------- net/bluetooth/smp.c | 7 +++++++ 3 files changed, 30 insertions(+), 7 deletions(-)
include/net/bluetooth/hci_core.h +5 -0
@@ -174,6 +174,7 @@ struct blocked_key {struct smp_csrk {bdaddr_t bdaddr;u8 bdaddr_type; +u8 link_type;u8 type;u8 val[16 ]; };
@@ -183,6 +184,7 @@ struct smp_ltk {struct rcu_head rcu;bdaddr_t bdaddr;u8 bdaddr_type; +u8 link_type;u8 authenticated;u8 type;u8 enc_size;
@@ -197,6 +199,7 @@ struct smp_irk {bdaddr_t rpa;bdaddr_t bdaddr;u8 addr_type; +u8 link_type;u8 val[16 ]; };
@@ -204,6 +207,8 @@ struct link_key {struct list_head list;struct rcu_head rcu;bdaddr_t bdaddr; +u8 bdaddr_type; +u8 link_type;u8 type;u8 val[HCI_LINK_KEY_SIZE ];u8 pin_len;
net/bluetooth/mgmt.c +18 -7
@@ -2373,7 +2373,8 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,for (i =0 ; i < key_count; i++) {struct mgmt_link_key_info *key = &cp->keys[i]; -if (key->addr.type !=BDADDR_BREDR || key->type >0x08 ) +/* Considering SMP over BREDR/LE, there is no need to check addr_type */ +if (key->type >0x08 )return mgmt_cmd_status (sk, hdev->id,MGMT_OP_LOAD_LINK_KEYS ,MGMT_STATUS_INVALID_PARAMS );
@@ -5914,6 +5915,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,for (i =0 ; i < irk_count; i++) {struct mgmt_irk_info *irk = &cp->irks[i]; +u8 addr_type =le_addr_type (irk->addr.type); if (hci_is_blocked_key(hdev, HCI_BLOCKED_KEY_TYPE_IRK,
@@ -5923,8 +5925,12 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,continue ; } +/* When using SMP over BR/EDR, the addr type should be set to BREDR */ +if (irk->addr.type ==BDADDR_BREDR ) + addr_type =BDADDR_BREDR ; +hci_add_irk (hdev, &irk->addr.bdaddr, -le_addr_type (irk->addr.type), irk->val, + addr_type, irk->val,BDADDR_ANY ); }
@@ -6005,6 +6011,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,for (i =0 ; i < key_count; i++) {struct mgmt_ltk_info *key = &cp->keys[i];u8 type, authenticated; +u8 addr_type =le_addr_type (key->addr.type); if (hci_is_blocked_key(hdev, HCI_BLOCKED_KEY_TYPE_LTK,
@@ -6039,8 +6046,12 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,continue ; } +/* When using SMP over BR/EDR, the addr type should be set to BREDR */ +if (key->addr.type ==BDADDR_BREDR ) + addr_type =BDADDR_BREDR ; +hci_add_ltk (hdev, &key->addr.bdaddr, -le_addr_type (key->addr.type), type, authenticated, + addr_type, type, authenticated, key->val, key->enc_size, key->ediv, key->rand); }
@@ -8043,7 +8054,7 @@ void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, ev.store_hint = persistent;bacpy (&ev.key.addr.bdaddr, &key->bdaddr); - ev.key.addr.type =BDADDR_BREDR ; + ev.key.addr.type =link_to_bdaddr (key->link_type, key->bdaddr_type); ev.key.type = key->type;memcpy (ev.key.val, key->val,HCI_LINK_KEY_SIZE ); ev.key.pin_len = key->pin_len;
@@ -8094,7 +8105,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent) ev.store_hint = persistent;bacpy (&ev.key.addr.bdaddr, &key->bdaddr); - ev.key.addr.type =link_to_bdaddr (LE_LINK , key->bdaddr_type); + ev.key.addr.type =link_to_bdaddr (key->link_type, key->bdaddr_type); ev.key.type =mgmt_ltk_type (key); ev.key.enc_size = key->enc_size; ev.key.ediv = key->ediv;
@@ -8123,7 +8134,7 @@ void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk, bool persistent)bacpy (&ev.rpa, &irk->rpa);bacpy (&ev.irk.addr.bdaddr, &irk->bdaddr); - ev.irk.addr.type =link_to_bdaddr (LE_LINK , irk->addr_type); + ev.irk.addr.type =link_to_bdaddr (irk->link_type, irk->addr_type);memcpy (ev.irk.val, irk->val,sizeof (irk->val));mgmt_event (MGMT_EV_NEW_IRK , hdev, &ev,sizeof (ev),NULL );
@@ -8152,7 +8163,7 @@ void mgmt_new_csrk(struct hci_dev *hdev, struct smp_csrk *csrk, ev.store_hint = persistent;bacpy (&ev.key.addr.bdaddr, &csrk->bdaddr); - ev.key.addr.type =link_to_bdaddr (LE_LINK , csrk->bdaddr_type); + ev.key.addr.type =link_to_bdaddr (csrk->link_type, csrk->bdaddr_type); ev.key.type = csrk->type;memcpy (ev.key.val, csrk->val,sizeof (csrk->val));
net/bluetooth/smp.c +7 -0
@@ -1059,6 +1059,7 @@ static void smp_notify_keys(struct l2cap_conn *conn) }if (smp->remote_irk) { + smp->remote_irk->link_type = hcon->type;mgmt_new_irk (hdev, smp->remote_irk, persistent);/* Now that user space can be considered to know the
@@ -1073,24 +1074,28 @@ static void smp_notify_keys(struct l2cap_conn *conn) }if (smp->csrk) { + smp->csrk->link_type = hcon->type; smp->csrk->bdaddr_type = hcon->dst_type;bacpy (&smp->csrk->bdaddr, &hcon->dst);mgmt_new_csrk (hdev, smp->csrk, persistent); }if (smp->responder_csrk) { + smp->responder_csrk->link_type = hcon->type; smp->responder_csrk->bdaddr_type = hcon->dst_type;bacpy (&smp->responder_csrk->bdaddr, &hcon->dst);mgmt_new_csrk (hdev, smp->responder_csrk, persistent); }if (smp->ltk) { + smp->ltk->link_type = hcon->type; smp->ltk->bdaddr_type = hcon->dst_type;bacpy (&smp->ltk->bdaddr, &hcon->dst);mgmt_new_ltk (hdev, smp->ltk, persistent); }if (smp->responder_ltk) { + smp->responder_ltk->link_type = hcon->type; smp->responder_ltk->bdaddr_type = hcon->dst_type;bacpy (&smp->responder_ltk->bdaddr, &hcon->dst);mgmt_new_ltk (hdev, smp->responder_ltk, persistent);
@@ -1110,6 +1115,8 @@ static void smp_notify_keys(struct l2cap_conn *conn) key =hci_add_link_key (hdev, smp->conn->hcon, &hcon->dst, smp->link_key, type,0 , &persistent);if (key) { + key->link_type = hcon->type; + key->bdaddr_type = hcon->dst_type;mgmt_new_link_key (hdev, key, persistent);/* Don't keep debug keys around if the relevant
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/75 usb: fotg210-hcd: delete an incorrect bounds test
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 7fbcd195e2b8cc952e4aeaeb50867b798040314c ]
Here "temp" is the number of characters that we have written and "size" is the size of the buffer. The intent was clearly to say that if we have written to the end of the buffer then stop.
However, for that to work the comparison should have been done on the original "size" value instead of the "size -= temp" value. Not only will that not trigger when we want to, but there is a small chance that it will trigger incorrectly before we want it to and we break from the loop slightly earlier than intended.
This code was recently changed from using snprintf() to scnprintf(). With snprintf() we likely would have continued looping and passed a negative size parameter to snprintf(). This would have triggered an annoying WARN(). Now that we have converted to scnprintf() "size" will never drop below 1 and there is no real need for this test. We could change the condition to "if (temp <= 1) goto done;" but just deleting the test is cleanest.
--- drivers/usb/host/fotg210-hcd.c | 3 --- 1 file changed, 3 deletions(-)
drivers/usb/host/fotg210-hcd.c +0 -3
@@ -429,8 +429,6 @@ static void qh_lines(struct fotg210_hcd *fotg210, struct fotg210_qh *qh, temp = size; size -= temp; next += temp; -if (temp == size) - goto done; } temp =snprintf (next, size,"\n" );
@@ -440,7 +438,6 @@ static void qh_lines(struct fotg210_hcd *fotg210, struct fotg210_qh *qh, size -= temp; next += temp; -done: *sizep = size; *nextp = next; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/75 smb: client: fix OOB in SMB2_query_info_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit 33eae65c6f49770fec7a662935d4eb4a6406d24b ]
A small CIFS buffer (448 bytes) isn't big enough to hold SMB2_QUERY_INFO request along with user's input data from CIFS_QUERY_INFO ioctl. That is, if the user passed an input buffer > 344 bytes, the client will memcpy() off the end of @req->Buffer in SMB2_query_info_init() thus causing the following KASAN splat:
BUG: KASAN: slab-out-of-bounds in SMB2_query_info_init+0x242/0x250 [cifs] Write of size 1023 at addr ffff88801308c5a8 by task a.out/1240 CPU: 1 PID: 1240 Comm: a.out Not tainted 6.7.0-rc4 #5 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x4a/0x80 print_report+0xcf/0x650 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? __phys_addr+0x46/0x90 kasan_report+0xd8/0x110 ? SMB2_query_info_init+0x242/0x250 [cifs] ? SMB2_query_info_init+0x242/0x250 [cifs] kasan_check_range+0x105/0x1b0 __asan_memcpy+0x3c/0x60 SMB2_query_info_init+0x242/0x250 [cifs] ? __pfx_SMB2_query_info_init+0x10/0x10 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? smb_rqst_len+0xa6/0xc0 [cifs] smb2_ioctl_query_info+0x4f4/0x9a0 [cifs] ? __pfx_smb2_ioctl_query_info+0x10/0x10 [cifs] ? __pfx_cifsConvertToUTF16+0x10/0x10 [cifs] ? kasan_set_track+0x25/0x30 ? srso_alias_return_thunk+0x5/0xfbef5 ? __kasan_kmalloc+0x8f/0xa0 ? srso_alias_return_thunk+0x5/0xfbef5 ? cifs_strndup_to_utf16+0x12d/0x1a0 [cifs] ? __build_path_from_dentry_optional_prefix+0x19d/0x2d0 [cifs] ? __pfx_smb2_ioctl_query_info+0x10/0x10 [cifs] cifs_ioctl+0x11c7/0x1de0 [cifs] ? __pfx_cifs_ioctl+0x10/0x10 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? rcu_is_watching+0x23/0x50 ? srso_alias_return_thunk+0x5/0xfbef5 ? __rseq_handle_notify_resume+0x6cd/0x850 ? __pfx___schedule+0x10/0x10 ? blkcg_iostat_update+0x250/0x290 ? srso_alias_return_thunk+0x5/0xfbef5 ? ksys_write+0xe9/0x170 __x64_sys_ioctl+0xc9/0x100 do_syscall_64+0x47/0xf0 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7f893dde49cf Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 RSP: 002b:00007ffc03ff4160 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007ffc03ff4378 RCX: 00007f893dde49cf RDX: 00007ffc03ff41d0 RSI: 00000000c018cf07 RDI: 0000000000000003 RBP: 00007ffc03ff4260 R08: 0000000000000410 R09: 0000000000000001 R10: 00007f893dce7300 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffc03ff4388 R14: 00007f893df15000 R15: 0000000000406de0 </TASK>
Fix this by increasing size of SMB2_QUERY_INFO request buffers and validating input length to prevent other callers from overflowing @req in SMB2_query_info_init() as well.
--- fs/cifs/smb2pdu.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
fs/cifs/smb2pdu.c +22 -7
@@ -373,10 +373,15 @@ static int __smb2_plain_req_init(__le16 smb2_command, struct cifs_tcon *tcon, void **request_buf, unsigned int *total_len) {/* BB eventually switch this to SMB2 specific small buf size */ -if (smb2_command ==SMB2_SET_INFO ) +switch (smb2_command) { +case SMB2_SET_INFO : +case SMB2_QUERY_INFO : *request_buf =cifs_buf_get (); -else +break ; +default : *request_buf =cifs_small_buf_get (); +break ; + }if (*request_buf ==NULL ) {/* BB should we add a retry in here if not a writepage? */ return -ENOMEM ;
@@ -3346,8 +3351,13 @@ SMB2_query_info_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server,struct smb2_query_info_req *req;struct kvec *iov = rqst->rq_iov;unsigned int total_len; +size_t len;int rc; +if (unlikely (check_add_overflow (input_len,sizeof (*req), &len) || + len > CIFSMaxBufSize)) +return -EINVAL ; + rc =smb2_plain_req_init (SMB2_QUERY_INFO , tcon, server, (void **) &req, &total_len);if (rc)
@@ -3369,7 +3379,7 @@ SMB2_query_info_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, iov[0 ].iov_base = (char *)req;/* 1 for Buffer */ - iov[0 ].iov_len = total_len -1 + input_len; + iov[0 ].iov_len = len;return 0 ; }
@@ -3377,7 +3387,7 @@ void SMB2_query_info_free(struct smb_rqst *rqst) {if (rqst && rqst->rq_iov) -cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ +cifs_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ } static int
@@ -5104,6 +5114,11 @@ build_qfs_info_req(struct kvec *iov, struct cifs_tcon *tcon,return 0 ; } +static inline void free_qfs_info_req (struct kvec *iov) +{ +cifs_buf_release (iov->iov_base); +} +int SMB311_posix_qfs_info (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,struct kstatfs *fsdata)
@@ -5135,7 +5150,7 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, rc =cifs_send_recv (xid, ses, server, &rqst, &resp_buftype, flags, &rsp_iov); -cifs_small_buf_release (iov.iov_base); +free_qfs_info_req (&iov);if (rc) {cifs_stats_fail_inc (tcon,SMB2_QUERY_INFO_HE ); goto posix_qfsinf_exit;
@@ -5186,7 +5201,7 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, rc =cifs_send_recv (xid, ses, server, &rqst, &resp_buftype, flags, &rsp_iov); -cifs_small_buf_release (iov.iov_base); +free_qfs_info_req (&iov);if (rc) {cifs_stats_fail_inc (tcon,SMB2_QUERY_INFO_HE ); goto qfsinf_exit;
@@ -5253,7 +5268,7 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon, rc =cifs_send_recv (xid, ses, server, &rqst, &resp_buftype, flags, &rsp_iov); -cifs_small_buf_release (iov.iov_base); +free_qfs_info_req (&iov);if (rc) {cifs_stats_fail_inc (tcon,SMB2_QUERY_INFO_HE ); goto qfsattr_exit;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/75 smb: client: fix OOB in smbCalcSize()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit b35858b3786ddbb56e1c35138ba25d6adf8d0bef ]
Validate @smb->WordCount to avoid reading off the end of @smb and thus causing the following KASAN splat:
BUG: KASAN: slab-out-of-bounds in smbCalcSize+0x32/0x40 [cifs] Read of size 2 at addr ffff88801c024ec5 by task cifsd/1328 CPU: 1 PID: 1328 Comm: cifsd Not tainted 6.7.0-rc5 #9 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x4a/0x80 print_report+0xcf/0x650 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? __phys_addr+0x46/0x90 kasan_report+0xd8/0x110 ? smbCalcSize+0x32/0x40 [cifs] ? smbCalcSize+0x32/0x40 [cifs] kasan_check_range+0x105/0x1b0 smbCalcSize+0x32/0x40 [cifs] checkSMB+0x162/0x370 [cifs] ? __pfx_checkSMB+0x10/0x10 [cifs] cifs_handle_standard+0xbc/0x2f0 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 cifs_demultiplex_thread+0xed1/0x1360 [cifs] ? __pfx_cifs_demultiplex_thread+0x10/0x10 [cifs] ? srso_alias_return_thunk+0x5/0xfbef5 ? lockdep_hardirqs_on_prepare+0x136/0x210 ? __pfx_lock_release+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ? mark_held_locks+0x1a/0x90 ? lockdep_hardirqs_on_prepare+0x136/0x210 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? __kthread_parkme+0xce/0xf0 ? __pfx_cifs_demultiplex_thread+0x10/0x10 [cifs] kthread+0x18d/0x1d0 ? kthread+0xdb/0x1d0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x34/0x60 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK>
This fixes CVE-2023-6606.
--- fs/cifs/misc.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/cifs/misc.c +4 -0
@@ -353,6 +353,10 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server)cifs_dbg (VFS ,"Length less than smb header size\n" ); }return -EIO ; + }else if (total_read <sizeof (*smb) +2 * smb->WordCount) { +cifs_dbg (VFS ,"%s: can't read BCC due to invalid WordCount(%u)\n" , + __func__, smb->WordCount); +return -EIO ; }/* otherwise, there is enough to get to the BCC */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/75 Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hyunwoo Kim <[email protected]>
[ Upstream commit 2e07e8348ea454615e268222ae3fc240421be768 ]
This can cause a race with bt_sock_ioctl() because bt_sock_recvmsg() gets the skb from sk->sk_receive_queue and then frees it without holding lock_sock.
A use-after-free for a skb occurs with the following flow.
``` bt_sock_recvmsg() -> skb_recv_datagram() -> skb_free_datagram() bt_sock_ioctl() -> skb_peek() ```
Add lock_sock to bt_sock_recvmsg() to fix this issue.
--- net/bluetooth/af_bluetooth.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/bluetooth/af_bluetooth.c +6 -1
@@ -263,11 +263,14 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,if (flags &MSG_OOB )return -EOPNOTSUPP ; +lock_sock (sk); + skb =skb_recv_datagram (sk, flags, noblock, &err);if (!skb) {if (sk->sk_shutdown &RCV_SHUTDOWN ) -return 0 ; + err =0 ; +release_sock (sk);return err; }
@@ -293,6 +296,8 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,skb_free_datagram (sk, skb); +release_sock (sk); +if (flags &MSG_TRUNC ) copied = skblen;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/75 spi: atmel: Switch to transfer_one transfer method
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Sneddon <[email protected]>
[ Upstream commit 5fa5e6dec762305a783e918a90a05369fc10e346 ]
Switch from using our own transfer_one_message routine to using the one provided by the SPI core.
Stable-dep-of: fc70d643a2f6 ("spi: atmel: Fix clock issue when using devices with different polarities")
--- drivers/spi/spi-atmel.c | 124 +++++++++++----------------------------- 1 file changed, 33 insertions(+), 91 deletions(-)
drivers/spi/spi-atmel.c +33 -91
@@ -867,7 +867,6 @@ static int atmel_spi_set_xfer_speed(struct atmel_spi *as,* lock is held, spi irq is blocked */ static void atmel_spi_pdc_next_xfer (struct spi_master *master, -struct spi_message *msg,struct spi_transfer *xfer) {struct atmel_spi *as =spi_master_get_devdata (master);
@@ -883,12 +882,12 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master,spi_writel (as,RPR , rx_dma);spi_writel (as,TPR , tx_dma); -if (msg->spi->bits_per_word >8 ) +if (xfer->bits_per_word >8 ) len >>=1 ;spi_writel (as,RCR , len);spi_writel (as,TCR , len); - dev_dbg(&msg->spi->dev, + dev_dbg(&master->dev, " start xfer %p: len %u tx %p/%08llx rx %p/%08llx\n", xfer, xfer->len, xfer->tx_buf, (unsigned long long)xfer->tx_dma, xfer->rx_buf,
@@ -902,12 +901,12 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master,spi_writel (as,RNPR , rx_dma);spi_writel (as,TNPR , tx_dma); -if (msg->spi->bits_per_word >8 ) +if (xfer->bits_per_word >8 ) len >>=1 ;spi_writel (as,RNCR , len);spi_writel (as,TNCR , len); - dev_dbg(&msg->spi->dev, + dev_dbg(&master->dev, " next xfer %p: len %u tx %p/%08llx rx %p/%08llx\n", xfer, xfer->len, xfer->tx_buf, (unsigned long long)xfer->tx_dma, xfer->rx_buf,
@@ -1277,12 +1276,28 @@ static int atmel_spi_setup(struct spi_device *spi)return 0 ; } +static void atmel_spi_set_cs (struct spi_device *spi,bool enable) +{ +struct atmel_spi *as =spi_master_get_devdata (spi->master); +/* the core doesn't really pass us enable/disable, but CS HIGH vs CS LOW +* since we already have routines for activate/deactivate translate +* high/low to active/inactive +*/ + enable = (!!(spi->mode &SPI_CS_HIGH ) == enable); + +if (enable) { +cs_activate (as, spi); + }else { +cs_deactivate (as, spi); + } + +} +static int atmel_spi_one_transfer (struct spi_master *master, -struct spi_message *msg, +struct spi_device *spi,struct spi_transfer *xfer) {struct atmel_spi *as; -struct spi_device *spi = msg->spi;u8 bits;u32 len;struct atmel_spi_device *asd;
@@ -1291,11 +1306,8 @@ static int atmel_spi_one_transfer(struct spi_master *master,unsigned long dma_timeout; as =spi_master_get_devdata (master); - -if (!(xfer->tx_buf || xfer->rx_buf) && xfer->len) { -dev_dbg (&spi->dev,"missing rx or tx buf\n" ); -return -EINVAL ; - } +/* This lock was orignally taken in atmel_spi_trasfer_one_message */ +atmel_spi_lock (as); asd = spi->controller_state; bits = (asd->csr >>4 ) &0xf ;
@@ -1309,13 +1321,13 @@ static int atmel_spi_one_transfer(struct spi_master *master,* DMA map early, for performance (empties dcache ASAP) and * better fault reporting. */ -if ((!msg->is_dma_mapped) +if ((!master->cur_msg_mapped) && as->use_pdc) {if (atmel_spi_dma_map_xfer (as, xfer) <0 )return -ENOMEM ; } -atmel_spi_set_xfer_speed (as, msg->spi, xfer); +atmel_spi_set_xfer_speed (as, spi, xfer); as->done_status =0 ; as->current_transfer = xfer;
@@ -1324,7 +1336,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,reinit_completion (&as->xfer_completion);if (as->use_pdc) { -atmel_spi_pdc_next_xfer (master, msg, xfer); +atmel_spi_pdc_next_xfer (master, xfer); }else if (atmel_spi_use_dma (as, xfer)) { len = as->current_remaining_bytes; ret = atmel_spi_next_xfer_dma_submit(master,
@@ -1332,7 +1344,8 @@ static int atmel_spi_one_transfer(struct spi_master *master,if (ret) {dev_err (&spi->dev,"unable to use DMA, fallback to PIO\n" ); -atmel_spi_next_xfer_pio (master, xfer); + as->done_status = ret; +break ; }else { as->current_remaining_bytes -= len;if (as->current_remaining_bytes <0 )
@@ -1385,90 +1398,18 @@ static int atmel_spi_one_transfer(struct spi_master *master, }else if (atmel_spi_use_dma (as, xfer)) {atmel_spi_stop_dma (master); } - -if (!msg->is_dma_mapped - && as->use_pdc) -atmel_spi_dma_unmap_xfer (master, xfer); - -return 0 ; - - }else { -/* only update length if no error */ - msg->actual_length += xfer->len; } -if (!msg->is_dma_mapped +if (!master->cur_msg_mapped && as->use_pdc)atmel_spi_dma_unmap_xfer (master, xfer); -spi_transfer_delay_exec (xfer); - -if (xfer->cs_change) { -if (list_is_last (&xfer->transfer_list, - &msg->transfers)) { - as->keep_cs = true; - }else { -cs_deactivate (as, msg->spi); -udelay (10 ); -cs_activate (as, msg->spi); - } - } - -return 0 ; -} - -static int atmel_spi_transfer_one_message (struct spi_master *master, -struct spi_message *msg) -{ -struct atmel_spi *as; -struct spi_transfer *xfer; -struct spi_device *spi = msg->spi; -int ret =0 ; - - as =spi_master_get_devdata (master); - -dev_dbg (&spi->dev,"new message %p submitted for %s\n" , - msg,dev_name (&spi->dev)); - -atmel_spi_lock (as); -cs_activate (as, spi); - - as->keep_cs = false; - - msg->status =0 ; - msg->actual_length =0 ; - -list_for_each_entry (xfer, &msg->transfers, transfer_list) { -trace_spi_transfer_start (msg, xfer); - - ret =atmel_spi_one_transfer (master, msg, xfer); -if (ret) - goto msg_done; - -trace_spi_transfer_stop (msg, xfer); - } -if (as->use_pdc)atmel_spi_disable_pdc_transfer (as); -list_for_each_entry (xfer, &msg->transfers, transfer_list) { -dev_dbg (&spi->dev, -" xfer %p: len %u tx %p/%pad rx %p/%pad\n" , - xfer, xfer->len, - xfer->tx_buf, &xfer->tx_dma, - xfer->rx_buf, &xfer->rx_dma); - } - -msg_done: -if (!as->keep_cs) -cs_deactivate (as, msg->spi); -atmel_spi_unlock (as); - msg->status = as->done_status; -spi_finalize_current_message (spi->master); - -return ret; +return as->done_status; }static void atmel_spi_cleanup (struct spi_device *spi)
@@ -1558,7 +1499,8 @@ static int atmel_spi_probe(struct platform_device *pdev) master->num_chipselect =4 ; master->setup = atmel_spi_setup; master->flags = (SPI_MASTER_MUST_RX |SPI_MASTER_MUST_TX ); - master->transfer_one_message = atmel_spi_transfer_one_message; + master->transfer_one = atmel_spi_one_transfer; + master->set_cs = atmel_spi_set_cs; master->cleanup = atmel_spi_cleanup; master->auto_runtime_pm = true; master->max_dma_len =SPI_MAX_DMA_XFER ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/75 spi: atmel: Fix CS and initialization bug
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Sneddon <[email protected]>
[ Upstream commit 69e1818ad27bae167eeaaf6829d4a08900ef5153 ]
Commit 5fa5e6dec762 ("spi: atmel: Switch to transfer_one transfer method") switched to using transfer_one and set_cs. The core doesn't call set_cs when the chip select lines are gpios. Add the SPI_MASTER_GPIO_SS flag to the driver to ensure the calls to set_cs happen since the driver programs configuration registers there.
Stable-dep-of: fc70d643a2f6 ("spi: atmel: Fix clock issue when using devices with different polarities")
--- drivers/spi/spi-atmel.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/spi/spi-atmel.c +2 -7
@@ -352,8 +352,6 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) } mr =spi_readl (as,MR ); -if (spi->cs_gpiod) -gpiod_set_value (spi->cs_gpiod,1 ); }else {u32 cpol = (spi->mode &SPI_CPOL ) ?SPI_BIT (CPOL ) :0 ;int i;
@@ -369,8 +367,6 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) mr =spi_readl (as,MR ); mr =SPI_BFINS (PCS , ~(1 << chip_select), mr); -if (spi->cs_gpiod) -gpiod_set_value (spi->cs_gpiod,1 );spi_writel (as,MR , mr); }
@@ -400,8 +396,6 @@ static void cs_deactivate(struct atmel_spi *as, struct spi_device *spi)if (!spi->cs_gpiod)spi_writel (as,CR ,SPI_BIT (LASTXFER )); -else -gpiod_set_value (spi->cs_gpiod,0 ); } static void atmel_spi_lock(struct atmel_spi *as) __acquires(&as->lock)
@@ -1498,7 +1492,8 @@ static int atmel_spi_probe(struct platform_device *pdev) master->bus_num = pdev->id; master->num_chipselect =4 ; master->setup = atmel_spi_setup; - master->flags = (SPI_MASTER_MUST_RX |SPI_MASTER_MUST_TX ); + master->flags = (SPI_MASTER_MUST_RX |SPI_MASTER_MUST_TX | +SPI_MASTER_GPIO_SS ); master->transfer_one = atmel_spi_one_transfer; master->set_cs = atmel_spi_set_cs; master->cleanup = atmel_spi_cleanup;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/75 scsi: core: Add scsi_prot_ref_tag() helper
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin K. Petersen <[email protected]>
[ Upstream commit 7ba46799d34695534666a3f71a2be10ea85ece6c ]
We are about to remove the request pointer from struct scsi_cmnd and that will complicate getting to the ref_tag via t10_pi_ref_tag() in the various drivers. Introduce a helper function to retrieve the reference tag so drivers will not have to worry about the details.
Message-Id: <[email protected]>
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
--- include/scsi/scsi_cmnd.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/scsi/scsi_cmnd.h +7 -0
@@ -291,6 +291,13 @@ static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)return blk_rq_pos (scmd->request); } +static inline u32 scsi_prot_ref_tag (struct scsi_cmnd *scmd) +{ +struct request *rq =blk_mq_rq_from_pdu (scmd); + +return t10_pi_ref_tag (rq); +} +static inline unsigned int scsi_prot_interval (struct scsi_cmnd *scmd) {return scmd->device->sector_size;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/75 scsi: core: Introduce scsi_get_sector()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit f0f214fe8cd32224267ebea93817b8c32074623d ]
Since scsi_get_lba() returns a sector_t value instead of the LBA, the name of that function is confusing. Introduce an identical function scsi_get_sector().
Message-Id: <[email protected]>
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
--- include/scsi/scsi_cmnd.h | 5 +++++ 1 file changed, 5 insertions(+)
include/scsi/scsi_cmnd.h +5 -0
@@ -224,6 +224,11 @@ static inline int scsi_sg_copy_to_buffer(struct scsi_cmnd *cmd, buf, buflen); } +static inline sector_t scsi_get_sector (struct scsi_cmnd *scmd) +{ +return blk_rq_pos (scmd->request); +} +/* * The operations below are hints that tell the controller driver how * to handle I/Os with DIF or similar types of protection information.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/75 scsi: core: Make scsi_get_lba() return the LBA
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin K. Petersen <[email protected]>
[ Upstream commit d2c945f01d233085fedc9e3cf7ec180eaa2b7a85 ]
scsi_get_lba() confusingly returned the block layer sector number expressed in units of 512 bytes. Now that we have a more aptly named scsi_get_sector() function, make scsi_get_lba() return the actual LBA.
Message-Id: <[email protected]>
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
--- include/scsi/scsi_cmnd.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
include/scsi/scsi_cmnd.h +7 -5
@@ -229,6 +229,13 @@ static inline sector_t scsi_get_sector(struct scsi_cmnd *scmd)return blk_rq_pos (scmd->request); } +static inline sector_t scsi_get_lba (struct scsi_cmnd *scmd) +{ +unsigned int shift =ilog2 (scmd->device->sector_size) -SECTOR_SHIFT ; + +return blk_rq_pos (scmd->request) >> shift; +} +/* * The operations below are hints that tell the controller driver how * to handle I/Os with DIF or similar types of protection information.
@@ -291,11 +298,6 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd)return scmd->prot_type; } -static inline sector_t scsi_get_lba (struct scsi_cmnd *scmd) -{ -return blk_rq_pos (scmd->request); -} -static inline u32 scsi_prot_ref_tag (struct scsi_cmnd *scmd) {struct request *rq =blk_mq_rq_from_pdu (scmd);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/75 scsi: core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit aa8e25e5006aac52c943c84e9056ab488630ee19 ]
Prepare for removal of the request pointer by using scsi_cmd_to_rq() instead. Cast away constness where necessary when passing a SCSI command pointer to scsi_cmd_to_rq(). This patch does not change any functionality.
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
--- drivers/scsi/scsi.c | 2 +- drivers/scsi/scsi_error.c | 15 ++++++++------- drivers/scsi/scsi_lib.c | 28 +++++++++++++++------------- drivers/scsi/scsi_logging.c | 18 ++++++++++-------- include/scsi/scsi_cmnd.h | 8 +++++--- include/scsi/scsi_device.h | 16 +++++++++------- 6 files changed, 48 insertions(+), 39 deletions(-)
drivers/scsi/scsi.c +1 -1
@@ -197,7 +197,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd) "(result %x)\n", cmd->result)); good_bytes =scsi_bufflen (cmd); -if (!blk_rq_is_passthrough (cmd->request)) { +if (!blk_rq_is_passthrough (scsi_cmd_to_rq (cmd))) {int old_good_bytes = good_bytes; drv =scsi_cmd_to_driver (cmd);if (drv->done)
drivers/scsi/scsi_error.c +8 -7
@@ -230,7 +230,7 @@ scsi_abort_command(struct scsi_cmnd *scmd)*/ static void scsi_eh_reset (struct scsi_cmnd *scmd) { -if (!blk_rq_is_passthrough (scmd->request)) { +if (!blk_rq_is_passthrough (scsi_cmd_to_rq (scmd))) {struct scsi_driver *sdrv =scsi_cmd_to_driver (scmd);if (sdrv->eh_reset) sdrv->eh_reset (scmd);
@@ -1167,7 +1167,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)static int scsi_eh_action (struct scsi_cmnd *scmd,int rtn) { -if (!blk_rq_is_passthrough (scmd->request)) { +if (!blk_rq_is_passthrough (scsi_cmd_to_rq (scmd))) {struct scsi_driver *sdrv =scsi_cmd_to_driver (scmd);if (sdrv->eh_action) rtn = sdrv->eh_action (scmd, rtn);
@@ -1733,22 +1733,24 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,*/ int scsi_noretry_cmd (struct scsi_cmnd *scmd) { +struct request *req =scsi_cmd_to_rq (scmd); +switch (host_byte (scmd->result)) {case DID_OK :break ;case DID_TIME_OUT : goto check_type;case DID_BUS_BUSY : -return (scmd->request->cmd_flags &REQ_FAILFAST_TRANSPORT ); +return req->cmd_flags &REQ_FAILFAST_TRANSPORT ;case DID_PARITY : -return (scmd->request->cmd_flags &REQ_FAILFAST_DEV ); +return req->cmd_flags &REQ_FAILFAST_DEV ;case DID_ERROR :if (msg_byte (scmd->result) ==COMMAND_COMPLETE &&status_byte (scmd->result) ==RESERVATION_CONFLICT )return 0 ; fallthrough;case DID_SOFT_ERROR : -return (scmd->request->cmd_flags &REQ_FAILFAST_DRIVER ); +return req->cmd_flags &REQ_FAILFAST_DRIVER ; }if (status_byte (scmd->result) !=CHECK_CONDITION )
@@ -1759,8 +1761,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd)* assume caller has checked sense and determined * the check condition was retryable. */ -if (scmd->request->cmd_flags &REQ_FAILFAST_DEV || -blk_rq_is_passthrough (scmd->request)) +if (req->cmd_flags &REQ_FAILFAST_DEV ||blk_rq_is_passthrough (req))return 1 ;return 0 ;
drivers/scsi/scsi_lib.c +15 -13
@@ -153,13 +153,15 @@ scsi_set_blocked(struct scsi_cmnd *cmd, int reason)static void scsi_mq_requeue_cmd (struct scsi_cmnd *cmd) { -if (cmd->request->rq_flags &RQF_DONTPREP ) { - cmd->request->rq_flags &= ~RQF_DONTPREP ; +struct request *rq =scsi_cmd_to_rq (cmd); + +if (rq->rq_flags &RQF_DONTPREP ) { + rq->rq_flags &= ~RQF_DONTPREP ;scsi_mq_uninit_cmd (cmd); }else {WARN_ON_ONCE (true); } -blk_mq_requeue_request (cmd->request, true); +blk_mq_requeue_request (rq, true); }/**
@@ -198,7 +200,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, bool unbusy)*/ cmd->result =0 ; -blk_mq_requeue_request (cmd->request, true); +blk_mq_requeue_request (scsi_cmd_to_rq (cmd), true); }/**
@@ -508,7 +510,7 @@ void scsi_run_host_queues(struct Scsi_Host *shost)static void scsi_uninit_cmd (struct scsi_cmnd *cmd) { -if (!blk_rq_is_passthrough (cmd->request)) { +if (!blk_rq_is_passthrough (scsi_cmd_to_rq (cmd))) {struct scsi_driver *drv =scsi_cmd_to_driver (cmd);if (drv->uninit_command)
@@ -658,7 +660,7 @@ static void scsi_io_completion_reprep(struct scsi_cmnd *cmd,static bool scsi_cmd_runtime_exceeced (struct scsi_cmnd *cmd) { -struct request *req = cmd->request; +struct request *req =scsi_cmd_to_rq (cmd);unsigned long wait_for;if (cmd->allowed ==SCSI_CMD_RETRIES_NO_LIMIT )
@@ -677,7 +679,7 @@ static bool scsi_cmd_runtime_exceeced(struct scsi_cmnd *cmd)static void scsi_io_completion_action (struct scsi_cmnd *cmd,int result) {struct request_queue *q = cmd->device->request_queue; -struct request *req = cmd->request; +struct request *req =scsi_cmd_to_rq (cmd);int level =0 ;enum {ACTION_FAIL ,ACTION_REPREP ,ACTION_RETRY ,ACTION_DELAYED_RETRY } action;
@@ -849,7 +851,7 @@ static int scsi_io_completion_nz_result(struct scsi_cmnd *cmd, int result, {bool sense_valid;bool sense_current = true;/* false implies "deferred sense" */ -struct request *req = cmd->request; +struct request *req =scsi_cmd_to_rq (cmd);struct scsi_sense_hdr sshdr; sense_valid =scsi_command_normalize_sense (cmd, &sshdr);
@@ -938,7 +940,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) {int result = cmd->result;struct request_queue *q = cmd->device->request_queue; -struct request *req = cmd->request; +struct request *req =scsi_cmd_to_rq (cmd);blk_status_t blk_stat =BLK_STS_OK ;if (unlikely (result))/* a nz result may or may not be an error */
@@ -1006,7 +1008,7 @@ static inline bool scsi_cmd_needs_dma_drain(struct scsi_device *sdev,blk_status_t scsi_alloc_sgtables (struct scsi_cmnd *cmd) {struct scsi_device *sdev = cmd->device; -struct request *rq = cmd->request; +struct request *rq =scsi_cmd_to_rq (cmd);unsigned short nr_segs =blk_rq_nr_phys_segments (rq);struct scatterlist *last_sg =NULL ;blk_status_t ret;
@@ -1135,7 +1137,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) {void *buf = cmd->sense_buffer;void *prot = cmd->prot_sdb; -struct request *rq =blk_mq_rq_from_pdu (cmd); +struct request *rq =scsi_cmd_to_rq (cmd);unsigned int flags = cmd->flags &SCMD_PRESERVED_FLAGS ;unsigned long jiffies_at_alloc;int retries, to_clear;
@@ -1594,12 +1596,12 @@ static blk_status_t scsi_prepare_cmd(struct request *req)static void scsi_mq_done (struct scsi_cmnd *cmd) { -if (unlikely (blk_should_fake_timeout (cmd->request->q))) +if (unlikely (blk_should_fake_timeout (scsi_cmd_to_rq (cmd)->q)))return ;if (unlikely (test_and_set_bit (SCMD_STATE_COMPLETE , &cmd->state)))return ;trace_scsi_dispatch_cmd_done (cmd); -blk_mq_complete_request (cmd->request); +blk_mq_complete_request (scsi_cmd_to_rq (cmd)); }static void scsi_mq_put_budget (struct request_queue *q)
drivers/scsi/scsi_logging.c +10 -8
@@ -28,8 +28,9 @@ static void scsi_log_release_buffer(char *bufptr)static inline const char *scmd_name (const struct scsi_cmnd *scmd) { -return scmd->request->rq_disk ? - scmd->request->rq_disk->disk_name :NULL ; +struct request *rq =scsi_cmd_to_rq ((struct scsi_cmnd *)scmd); + +return rq->rq_disk ? rq->rq_disk->disk_name :NULL ; } static size_t sdev_format_header(char *logbuf, size_t logbuf_len,
@@ -91,7 +92,7 @@ void scmd_printk(const char *level, const struct scsi_cmnd *scmd,if (!logbuf)return ; off =sdev_format_header (logbuf, logbuf_len,scmd_name (scmd), - scmd->request->tag); +scsi_cmd_to_rq ((struct scsi_cmnd *)scmd)->tag);if (off < logbuf_len) {va_start (args, fmt); off +=vscnprintf (logbuf + off, logbuf_len - off, fmt, args);
@@ -188,7 +189,7 @@ void scsi_print_command(struct scsi_cmnd *cmd)return ; off =sdev_format_header (logbuf, logbuf_len, -scmd_name (cmd), cmd->request->tag); +scmd_name (cmd),scsi_cmd_to_rq (cmd)->tag);if (off >= logbuf_len) goto out_printk; off +=scnprintf (logbuf + off, logbuf_len - off,"CDB: " );
@@ -210,7 +211,7 @@ void scsi_print_command(struct scsi_cmnd *cmd) off =sdev_format_header (logbuf, logbuf_len,scmd_name (cmd), - cmd->request->tag); +scsi_cmd_to_rq (cmd)->tag);if (!WARN_ON (off > logbuf_len -58 )) { off +=scnprintf (logbuf + off, logbuf_len - off,"CDB[%02x]: " , k);
@@ -373,7 +374,8 @@ EXPORT_SYMBOL(__scsi_print_sense);/* Normalize and print sense buffer in SCSI command */ void scsi_print_sense (const struct scsi_cmnd *cmd) { -scsi_log_print_sense (cmd->device,scmd_name (cmd), cmd->request->tag, +scsi_log_print_sense (cmd->device,scmd_name (cmd), +scsi_cmd_to_rq ((struct scsi_cmnd *)cmd)->tag, cmd->sense_buffer,SCSI_SENSE_BUFFERSIZE ); }EXPORT_SYMBOL (scsi_print_sense);
@@ -392,8 +394,8 @@ void scsi_print_result(const struct scsi_cmnd *cmd, const char *msg,if (!logbuf)return ; - off =sdev_format_header (logbuf, logbuf_len, -scmd_name (cmd), cmd->request->tag); + off =sdev_format_header (logbuf, logbuf_len,scmd_name (cmd), +scsi_cmd_to_rq ((struct scsi_cmnd *)cmd)->tag);if (off >= logbuf_len) goto out_printk;
include/scsi/scsi_cmnd.h +5 -3
@@ -162,7 +162,9 @@ static inline void *scsi_cmd_priv(struct scsi_cmnd *cmd)/* make sure not to use it with passthrough commands */ static inline struct scsi_driver *scsi_cmd_to_driver (struct scsi_cmnd *cmd) { -return *(struct scsi_driver **)cmd->request->rq_disk->private_data; +struct request *rq =scsi_cmd_to_rq (cmd); + +return *(struct scsi_driver **)rq->rq_disk->private_data; }extern void scsi_finish_command (struct scsi_cmnd *cmd);
@@ -226,14 +228,14 @@ static inline int scsi_sg_copy_to_buffer(struct scsi_cmnd *cmd,static inline sector_t scsi_get_sector (struct scsi_cmnd *scmd) { -return blk_rq_pos (scmd->request); +return blk_rq_pos (scsi_cmd_to_rq (scmd)); }static inline sector_t scsi_get_lba (struct scsi_cmnd *scmd) {unsigned int shift =ilog2 (scmd->device->sector_size) -SECTOR_SHIFT ; -return blk_rq_pos (scmd->request) >> shift; +return blk_rq_pos (scsi_cmd_to_rq (scmd)) >> shift; }/*
include/scsi/scsi_device.h +9 -7
@@ -264,13 +264,15 @@ sdev_prefix_printk(const char *, const struct scsi_device *, const char *, __printf(3, 4) voidscmd_printk (const char *,const struct scsi_cmnd *,const char *, ...); -#define scmd_dbg(scmd, fmt, a...) \ - do { \ - if ((scmd)->request->rq_disk) \ - sdev_dbg((scmd)->device, "[%s] " fmt, \ - (scmd)->request->rq_disk->disk_name, ##a);\ - else \ - sdev_dbg((scmd)->device, fmt, ##a); \ +#define scmd_dbg(scmd, fmt, a...) \ + do { \ + struct request *__rq = scsi_cmd_to_rq((scmd)); \ + \ + if (__rq->rq_disk) \ + sdev_dbg((scmd)->device, "[%s] " fmt, \ + __rq->rq_disk->disk_name, ##a); \ + else \ + sdev_dbg((scmd)->device, fmt, ##a); \ } while (0)enum scsi_target_state {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/75 scsi: core: Use a structure member to track the SCSI command submitter
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit bf23e619039d360d503b7282d030daf2277a5d47 ]
Conditional statements are faster than indirect calls. Use a structure member to track the SCSI command submitter such that later patches can call scsi_done(scmd) instead of scmd->scsi_done(scmd).
The asymmetric behavior that scsi_send_eh_cmnd() sets the submission context to the SCSI error handler and that it does not restore the submission context to the SCSI core is retained.
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
--- drivers/scsi/scsi_error.c | 17 ++++++----------- drivers/scsi/scsi_lib.c | 10 ++++++++++ drivers/scsi/scsi_priv.h | 1 + include/scsi/scsi_cmnd.h | 7 +++++++ 4 files changed, 24 insertions(+), 11 deletions(-)
drivers/scsi/scsi_error.c +6 -11
@@ -50,8 +50,6 @@#include <asm/unaligned.h> -static void scsi_eh_done (struct scsi_cmnd *scmd); -/* * These should *probably* be handled by the host itself. * Since it is allowed to sleep, it probably should.
@@ -500,7 +498,8 @@ int scsi_check_sense(struct scsi_cmnd *scmd)/* handler does not care. Drop down to default handling */ } -if (scmd->cmnd[0 ] ==TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done) +if (scmd->cmnd[0 ] ==TEST_UNIT_READY && + scmd->submitter !=SUBMITTED_BY_SCSI_ERROR_HANDLER )/* * nasty: for mid-layer issued TURs, we need to return the * actual sense data without any recovery attempt. For eh
@@ -768,7 +767,7 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)* scsi_eh_done - Completion function for error handling. * @scmd: Cmd that is done. */ -static void scsi_eh_done (struct scsi_cmnd *scmd) +void scsi_eh_done (struct scsi_cmnd *scmd) {struct completion *eh_action;
@@ -1068,7 +1067,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, shost->eh_action = &done;scsi_log_send (scmd); - scmd->scsi_done = scsi_eh_done; + scmd->submitter =SUBMITTED_BY_SCSI_ERROR_HANDLER ;/* * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can
@@ -1095,6 +1094,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,if (rtn) {if (timeleft > stall_for) {scsi_eh_restore_cmnd (scmd, &ses); + timeleft -= stall_for;msleep (jiffies_to_msecs (stall_for)); goto retry;
@@ -2322,11 +2322,6 @@ void scsi_report_device_reset(struct Scsi_Host *shost, int channel, int target) }EXPORT_SYMBOL (scsi_report_device_reset); -static void -scsi_reset_provider_done_command (struct scsi_cmnd *scmd) -{ -} -/** * scsi_ioctl_reset: explicitly reset a host/bus/target/device * @dev: scsi_device to operate on
@@ -2363,7 +2358,7 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg) scmd->request = rq; scmd->cmnd =scsi_req (rq)->cmd; - scmd->scsi_done = scsi_reset_provider_done_command; + scmd->submitter =SUBMITTED_BY_SCSI_RESET_IOCTL ;memset (&scmd->sdb,0 ,sizeof (scmd->sdb)); scmd->cmd_len =0 ;
drivers/scsi/scsi_lib.c +10 -0
@@ -1596,6 +1596,15 @@ static blk_status_t scsi_prepare_cmd(struct request *req)static void scsi_mq_done (struct scsi_cmnd *cmd) { +switch (cmd->submitter) { +case SUBMITTED_BY_BLOCK_LAYER : +break ; +case SUBMITTED_BY_SCSI_ERROR_HANDLER : +return scsi_eh_done (cmd); +case SUBMITTED_BY_SCSI_RESET_IOCTL : +return ; + } +if (unlikely (blk_should_fake_timeout (scsi_cmd_to_rq (cmd)->q)))return ;if (unlikely (test_and_set_bit (SCMD_STATE_COMPLETE , &cmd->state)))
@@ -1685,6 +1694,7 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,scsi_set_resid (cmd,0 );memset (cmd->sense_buffer,0 ,SCSI_SENSE_BUFFERSIZE ); + cmd->submitter =SUBMITTED_BY_BLOCK_LAYER ; cmd->scsi_done = scsi_mq_done;blk_mq_start_request (req);
drivers/scsi/scsi_priv.h +1 -0
@@ -82,6 +82,7 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost,int scsi_eh_get_sense (struct list_head *work_q,struct list_head *done_q);int scsi_noretry_cmd (struct scsi_cmnd *scmd); +void scsi_eh_done (struct scsi_cmnd *scmd);/* scsi_lib.c */ extern int scsi_maybe_unblock_host (struct scsi_device *sdev);
include/scsi/scsi_cmnd.h +7 -0
@@ -65,6 +65,12 @@ struct scsi_pointer {#define SCMD_STATE_COMPLETE 0#define SCMD_STATE_INFLIGHT 1 +enum scsi_cmnd_submitter { +SUBMITTED_BY_BLOCK_LAYER =0 , +SUBMITTED_BY_SCSI_ERROR_HANDLER =1 , +SUBMITTED_BY_SCSI_RESET_IOCTL =2 , +} __packed; +struct scsi_cmnd {struct scsi_request req;struct scsi_device *device;
@@ -88,6 +94,7 @@ struct scsi_cmnd {unsigned char prot_op;unsigned char prot_type;unsigned char prot_flags; +enum scsi_cmnd_submitter submitter;unsigned short cmd_len;enum dma_data_direction sc_data_direction;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/75 scsi: core: Always send batch on reset or error handling command
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Atanasov <[email protected]>
[ Upstream commit 066c5b46b6eaf2f13f80c19500dbb3b84baabb33 ]
In commit 8930a6c20791 ("scsi: core: add support for request batching") the block layer bd->last flag was mapped to SCMD_LAST and used as an indicator to send the batch for the drivers that implement this feature. However, the error handling code was not updated accordingly.
scsi_send_eh_cmnd() is used to send error handling commands and request sense. The problem is that request sense comes as a single command that gets into the batch queue and times out. As a result the device goes offline after several failed resets. This was observed on virtio_scsi during a device resize operation.
[ 496.316946] sd 0:0:4:0: [sdd] tag#117 scsi_eh_0: requesting sense [ 506.786356] sd 0:0:4:0: [sdd] tag#117 scsi_send_eh_cmnd timeleft: 0 [ 506.787981] sd 0:0:4:0: [sdd] tag#117 abort
To fix this always set SCMD_LAST flag in scsi_send_eh_cmnd() and scsi_reset_ioctl().
--- drivers/scsi/scsi_error.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/scsi_error.c +2 -0
@@ -1068,6 +1068,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,scsi_log_send (scmd); scmd->submitter =SUBMITTED_BY_SCSI_ERROR_HANDLER ; + scmd->flags |=SCMD_LAST ;/* * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can
@@ -2359,6 +2360,7 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg) scmd->cmnd =scsi_req (rq)->cmd; scmd->submitter =SUBMITTED_BY_SCSI_RESET_IOCTL ; + scmd->flags |=SCMD_LAST ;memset (&scmd->sdb,0 ,sizeof (scmd->sdb)); scmd->cmd_len =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/75 ring-buffer: Fix wake ups when buffer_percent is set to 100
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 623b1f896fa8a669a277ee5a258307a16c7377a3 upstream.
The tracefs file "buffer_percent" is to allow user space to set a water-mark on how much of the tracing ring buffer needs to be filled in order to wake up a blocked reader.
0 - is to wait until any data is in the buffer
1 - is to wait for 1% of the sub buffers to be filled
50 - would be half of the sub buffers are filled with data 100 - is not to wake the waiter until the ring buffer is completely full
Unfortunately the test for being full was:
dirty = ring_buffer_nr_dirty_pages(buffer, cpu); return (dirty * 100) > (full * nr_pages);
Where "full" is the value for "buffer_percent".
There is two issues with the above when full == 100.
1. dirty * 100 > 100 * nr_pages will never be true
That is, the above is basically saying that if the user sets buffer_percent to 100, more pages need to be dirty than exist in the ring buffer!
2. The page that the writer is on is never considered dirty, as dirty pages are only those that are full. When the writer goes to a new sub-buffer, it clears the contents of that sub-buffer.
That is, even if the check was ">=" it would still not be equal as the most pages that can be considered "dirty" is nr_pages - 1.
To fix this, add one to dirty and use ">=" in the compare.
--- kernel/trace/ring_buffer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/trace/ring_buffer.c +7 -2
@@ -810,9 +810,14 @@ static __always_inline bool full_hit(strif (!nr_pages || !full)return true; - dirty =ring_buffer_nr_dirty_pages (buffer, cpu); +/* +* Add one as dirty will never equal nr_pages, as the sub-buffer +* that the writer is on is not counted as dirty. +* This is needed if "buffer_percent" is set to 100. +*/ + dirty =ring_buffer_nr_dirty_pages (buffer, cpu) +1 ; -return (dirty *100 ) > (full * nr_pages); +return (dirty *100 ) >= (full * nr_pages); }/*
Greg Kroah-Hartman
maintainerPATCH 69/75 tracing: Fix blocked reader of snapshot buffer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 39a7dc23a1ed0fe81141792a09449d124c5953bd upstream.
If an application blocks on the snapshot or snapshot_raw files, expecting to be woken up when a snapshot occurs, it will not happen. Or it may happen with an unexpected result.
That result is that the application will be reading the main buffer instead of the snapshot buffer. That is because when the snapshot occurs, the main and snapshot buffers are swapped. But the reader has a descriptor still pointing to the buffer that it originally connected to.
This is fine for the main buffer readers, as they may be blocked waiting for a watermark to be hit, and when a snapshot occurs, the data that the main readers want is now on the snapshot buffer.
But for waiters of the snapshot buffer, they are waiting for an event to occur that will trigger the snapshot and they can then consume it quickly to save the snapshot before the next snapshot occurs. But to do this, they need to read the new snapshot buffer, not the old one that is now receiving new data.
Also, it does not make sense to have a watermark "buffer_percent" on the snapshot buffer, as the snapshot buffer is static and does not receive new data except all at once.
--- kernel/trace/ring_buffer.c | 3 ++- kernel/trace/trace.c | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-)
kernel/trace/ring_buffer.c +2 -1
@@ -866,7 +866,8 @@ void ring_buffer_wake_waiters(struct tra/* make sure the waiters see the new index */ smp_wmb (); -rb_wake_up_waiters (&rbwork->work); +/* This can be called in any context */ +irq_work_queue (&rbwork->work); }/**
kernel/trace/trace.c +17 -3
@@ -1892,17 +1892,31 @@ update_max_tr_single(struct trace_array__update_max_tr (tr, tsk, cpu);arch_spin_unlock (&tr->max_lock); + +/* Any waiters on the old snapshot buffer need to wake up */ + ring_buffer_wake_waiters(tr->array_buffer.buffer, RING_BUFFER_ALL_CPUS); }#endif /* CONFIG_TRACER_MAX_TRACE */ static int wait_on_pipe (struct trace_iterator *iter,int full) { +int ret; +/* Iterators are static, they should be filled or empty */ if (trace_buffer_iter (iter, iter->cpu_file))return 0 ; -return ring_buffer_wait (iter->array_buffer->buffer, iter->cpu_file, - full); + ret =ring_buffer_wait (iter->array_buffer->buffer, iter->cpu_file, full); + +#ifdef CONFIG_TRACER_MAX_TRACE +/* +* Make sure this is still the snapshot buffer, as if a snapshot were +* to happen, this would now be the main buffer. +*/ +if (iter->snapshot) + iter->array_buffer = &iter->tr->max_buffer; +#endif +return ret; }#ifdef CONFIG_FTRACE_STARTUP_TEST
@@ -7953,7 +7967,7 @@ tracing_buffers_splice_read(struct fileif ((file->f_flags &O_NONBLOCK ) || (flags &SPLICE_F_NONBLOCK )) goto out; - ret =wait_on_pipe (iter, iter->tr->buffer_percent); + ret =wait_on_pipe (iter, iter->snapshot ?0 : iter->tr->buffer_percent);if (ret) goto out;
Greg Kroah-Hartman
maintainerPATCH 70/75 netfilter: nf_tables: skip set commit for deleted/destroyed sets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 7315dc1e122c85ffdfc8defffbb8f8b616c2eb1a upstream.
NFT_MSG_DELSET deactivates all elements in the set, skip set->ops->commit() to avoid the unnecessary clone (for the pipapo case) as well as the sync GC cycle, which could deactivate again expired elements in such set.
--- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +1 -1
@@ -8377,7 +8377,7 @@ static void nft_set_commit_update(structlist_for_each_entry_safe (set, next, set_update_list, pending_update) {list_del_init (&set->pending_update); -if (!set->ops->commit) +if (!set->ops->commit || set->dead)continue ; set->ops->commit (set);
Greg Kroah-Hartman
maintainerPATCH 71/75 dm-integrity: dont modify bios immutable bio_vec in integrity_metadata()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit b86f4b790c998afdbc88fe1aa55cfe89c4068726 upstream.
__bio_for_each_segment assumes that the first struct bio_vec argument doesn't change - it calls "bio_advance_iter_single((bio), &(iter), (bvl).bv_len)" to advance the iterator. Unfortunately, the dm-integrity code changes the bio_vec with "bv.bv_len -= pos". When this code path is taken, the iterator would be out of sync and dm-integrity would report errors. This happens if the machine is out of memory and "kmalloc" fails.
Fix this bug by making a copy of "bv" and changing the copy instead.
--- drivers/md/dm-integrity.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/md/dm-integrity.c +6 -5
@@ -1657,11 +1657,12 @@ static void integrity_metadata(struct wo sectors_to_process = dio->range.n_sectors;__bio_for_each_segment (bv, bio, iter, dio->bio_details.bi_iter) { +struct bio_vec bv_copy = bv;unsigned pos;char *mem, *checksums_ptr; again: - mem = (char *)kmap_atomic (bv.bv_page) + bv.bv_offset; + mem = (char *)kmap_atomic (bv_copy.bv_page) + bv_copy.bv_offset; pos =0 ; checksums_ptr = checksums; do {
@@ -1670,7 +1671,7 @@ again: sectors_to_process -= ic->sectors_per_block; pos += ic->sectors_per_block <<SECTOR_SHIFT ; sector += ic->sectors_per_block; - }while (pos < bv.bv_len && sectors_to_process && checksums != checksums_onstack); + }while (pos < bv_copy.bv_len && sectors_to_process && checksums != checksums_onstack);kunmap_atomic (mem); r = dm_integrity_rw_tag(ic, checksums, &dio->metadata_block, &dio->metadata_offset,
@@ -1691,9 +1692,9 @@ again:if (!sectors_to_process)break ; -if (unlikely (pos < bv.bv_len)) { - bv.bv_offset += pos; - bv.bv_len -= pos; +if (unlikely (pos < bv_copy.bv_len)) { + bv_copy.bv_offset += pos; + bv_copy.bv_len -= pos; goto again; } }
Greg Kroah-Hartman
maintainerPATCH 72/75 tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francis Laniel <[email protected]>
commit b022f0c7e404887a7c5229788fc99eff9f9a80d5 upstream.
When a kprobe is attached to a function that's name is not unique (is static and shares the name with other functions in the kernel), the kprobe is attached to the first function it finds. This is a bug as the function that it is attaching to is not necessarily the one that the user wants to attach to.
Instead of blindly picking a function to attach to what is ambiguous, error with EADDRNOTAVAIL to let the user know that this function is not unique, and that the user must use another unique function with an address offset to get to the function they want to attach to.
--- kernel/trace/trace_kprobe.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ kernel/trace/trace_probe.h | 1 2 files changed, 75 insertions(+)
kernel/trace/trace_kprobe.c +74 -0
@@ -715,6 +715,36 @@ static inline void sanitize_event_name(c *name ='_' ; } +struct count_symbols_struct { +const char *func_name; +unsigned int count; +}; + +static int count_symbols (void *data,const char *name,struct module *unused0, +unsigned long unused1) +{ +struct count_symbols_struct *args = data; + +if (strcmp (args->func_name, name)) +return 0 ; + + args->count++; + +return 0 ; +} + +static unsigned int number_of_same_symbols (char *func_name) +{ +struct count_symbols_struct args = { + .func_name = func_name, + .count =0 , + }; + +kallsyms_on_each_symbol (count_symbols, &args); + +return args.count; +} +static int trace_kprobe_create (int argc,const char *argv[]) {/*
@@ -842,6 +872,31 @@ static int trace_kprobe_create(int argc, } } +if (symbol && !strchr (symbol,':' )) { +unsigned int count; + + count =number_of_same_symbols (symbol); +if (count >1 ) { +/* +* Users should use ADDR to remove the ambiguity of +* using KSYM only. +*/ +trace_probe_log_err (0 ,NON_UNIQ_SYMBOL ); + ret = -EADDRNOTAVAIL ; + + goto error; + }else if (count ==0 ) { +/* +* We can return ENOENT earlier than when register the +* kprobe. +*/ +trace_probe_log_err (0 ,BAD_PROBE_ADDR ); + ret = -ENOENT ; + + goto error; + } + } +trace_probe_log_set_index (0 );if (event) { ret = traceprobe_parse_event_name(&event, &group, buf,
@@ -1805,6 +1860,7 @@ static int unregister_kprobe_event(struc }#ifdef CONFIG_PERF_EVENTS +/* create a trace_kprobe, but don't add it to global lists */ struct trace_event_call * create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
@@ -1814,6 +1870,24 @@ create_local_trace_kprobe(char *func, voint ret;char *event; +if (func) { +unsigned int count; + + count =number_of_same_symbols (func); +if (count >1 ) +/* +* Users should use addr to remove the ambiguity of +* using func only. +*/ +return ERR_PTR (-EADDRNOTAVAIL ); +else if (count ==0 ) +/* +* We can return ENOENT earlier than when register the +* kprobe. +*/ +return ERR_PTR (-ENOENT ); + } +/* * local trace_kprobes are not added to dyn_event, so they are never * searched in find_trace_kprobe(). Therefore, there is no concern of
kernel/trace/trace_probe.h +1 -0
@@ -390,6 +390,7 @@ extern int traceprobe_define_arg_fields(C (BAD_MAXACT ,"Invalid maxactive number" ), \C (MAXACT_TOO_BIG ,"Maxactive is too big" ), \C (BAD_PROBE_ADDR ,"Invalid probed address or symbol" ), \ +C (NON_UNIQ_SYMBOL ,"The symbol is not unique" ), \C (BAD_RETPROBE ,"Retprobe address must be an function entry" ), \C (BAD_ADDR_SUFFIX ,"Invalid probed address suffix" ), \ C(NO_GROUP_NAME, "Group name is not specified"), \
Greg Kroah-Hartman
maintainerPATCH 73/75 Revert "MIPS: Loongson64: Enable DMA noncoherent support"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
This reverts commit 3ee7e2faef87594228eb2622f8c25c0495ea50a1 which is commit edc0378eee00200a5bedf1bb9f00ad390e0d1bd4 upstream.
There are reports of this causing build issues, so revert it from the 5.10.y tree for now.
--- arch/mips/Kconfig | 2 -- arch/mips/include/asm/mach-loongson64/boot_param.h | 3 +-- arch/mips/loongson64/env.c | 10 +--------- 3 files changed, 2 insertions(+), 13 deletions(-)
arch/mips/Kconfig +0 -2
@@ -468,7 +468,6 @@ config MACH_LOONGSON2EF config MACH_LOONGSON64 bool "Loongson 64-bit family of machines" - select ARCH_DMA_DEFAULT_COHERENT select ARCH_SPARSEMEM_ENABLE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO
@@ -1380,7 +1379,6 @@ config CPU_LOONGSON64 select CPU_SUPPORTS_MSA select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT select CPU_MIPSR2_IRQ_VI - select DMA_NONCOHERENT select WEAK_ORDERING select WEAK_REORDERING_BEYOND_LLSC select MIPS_ASID_BITS_VARIABLE
arch/mips/include/asm/mach-loongson64/boot_param.h +1 -2
@@ -117,8 +117,7 @@ struct irq_source_routing_table {u64 pci_io_start_addr;u64 pci_io_end_addr;u64 pci_config_addr; -u16 dma_mask_bits; -u16 dma_noncoherent; +u32 dma_mask_bits; } __packed;struct interface_info {
arch/mips/loongson64/env.c +1 -9
@@ -13,8 +13,6 @@* Copyright (C) 2009 Lemote Inc. * Author: Wu Zhangjin, [email protected] */ - -#include <linux/dma-map-ops.h> #include <linux/export.h> #include <linux/pci_ids.h> #include <asm/bootinfo.h>
@@ -133,14 +131,8 @@ void __init prom_init_env(void) loongson_sysconf.pci_io_base = eirq_source->pci_io_start_addr; loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;if (loongson_sysconf.dma_mask_bits <32 || - loongson_sysconf.dma_mask_bits >64 ) { + loongson_sysconf.dma_mask_bits >64 ) loongson_sysconf.dma_mask_bits =32 ; - dma_default_coherent = true; - }else { - dma_default_coherent = !eirq_source->dma_noncoherent; - } - -pr_info ("Firmware: Coherent DMA: %s\n" , dma_default_coherent ?"on" :"off" ); loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm; loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
Greg Kroah-Hartman
maintainerPATCH 74/75 Bluetooth: SMP: Fix crash when receiving new connection when debug is enabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
commit 995fca15b73ff8f92888cc2d5d95f17ffdac74ba upstream.
When receiving a new connection pchan->conn won't be initialized so the code cannot use bt_dev_dbg as the pointer to hci_dev won't be accessible.
--- net/bluetooth/smp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/bluetooth/smp.c +3 -3
@@ -3239,7 +3239,7 @@ static inline struct l2cap_chan *smp_new {struct l2cap_chan *chan; -bt_dev_dbg (pchan->conn->hcon->hdev,"pchan %p" , pchan); +BT_DBG ("pchan %p" , pchan); chan =l2cap_chan_create ();if (!chan)
@@ -3260,7 +3260,7 @@ static inline struct l2cap_chan *smp_new*/ atomic_set (&chan->nesting,L2CAP_NESTING_SMP ); -bt_dev_dbg (pchan->conn->hcon->hdev,"created chan %p" , chan); +BT_DBG ("created chan %p" , chan);return chan; }
@@ -3364,7 +3364,7 @@ static void smp_del_chan(struct l2cap_ch {struct smp_dev *smp; -bt_dev_dbg (chan->conn->hcon->hdev,"chan %p" , chan); +BT_DBG ("chan %p" , chan); smp = chan->data;if (smp) {
Greg Kroah-Hartman
maintainerPATCH 75/75 spi: atmel: Fix PDC transfer setup bug
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Baillie <[email protected]>
commit 75e33c55ae8fb4a177fe07c284665e1d61b02560 upstream.
atmel_spi_dma_map_xfer to never be called in PDC mode. This causes the driver to silently fail.
This patch changes the conditional to match the behaviour of the previous commit before the refactor.
--- drivers/spi/spi-atmel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-atmel.c +2 -2
@@ -1315,7 +1315,7 @@ static int atmel_spi_one_transfer(struct* DMA map early, for performance (empties dcache ASAP) and * better fault reporting. */ -if ((!master->cur_msg_mapped) +if ((!master->cur_msg->is_dma_mapped) && as->use_pdc) {if (atmel_spi_dma_map_xfer (as, xfer) <0 )return -ENOMEM ;
@@ -1394,7 +1394,7 @@ static int atmel_spi_one_transfer(struct } } -if (!master->cur_msg_mapped +if (!master->cur_msg->is_dma_mapped && as->use_pdc)atmel_spi_dma_unmap_xfer (master, xfer);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Greg Kroah-Hartman wrote on Wed, Jan 03, 2024 at 05:54:41PM +0100:
Quoted 5 lines
This is the start of the stable review cycle for the 5.10.206 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Fri, 05 Jan 2024 16:47:49 +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.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Tested 6ed2e58a1d40 ("Linux 5.10.206-rc1") on:
- arm i.MX6ULL (Armadillo 640)
- arm64 i.MX8MP (Armadillo G4)
No obvious regression in dmesg or basic tests:
Signature · 1 line
Dominique Martinet | Asmadeus
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing a kernel warning on:
* Juno-r2
* Dragonboard 410c
* i386
that looks like this:
-----8<-----
------------[ cut here ]------------ [ 968.182348] WARNING: CPU: 2 PID: 16253 at kernel/module.c:261 module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.191666] Modules linked in: x86_pkg_temp_thermal fuse ip_tables [ 968.197876] CPU: 2 PID: 16253 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 968.204786] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.7 12/07/2021 [ 968.212208] EIP: module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.217632] Code: 68 d9 75 a4 31 c0 8d 65 f4 5b 5e 5f 5d c3 8d 74 26 00 90 ba ff ff ff ff b8 38 36 68 d9 e8 e9 61 df 00 85 c0 0f 85 6f ff ff ff 0b e9 68 ff ff ff 8d b4 26 00 00 00 00 8d 76 00 3e 8d 74 26 00 [ 968.236389] EAX: 00000000 EBX: 00000001 ECX: ffffffff EDX: 00000001 [ 968.242700] ESI: c5839d68 EDI: 00025c3b EBP: c5839d54 ESP: c5839d3c [ 968.249008] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010246 [ 968.255845] CR0: 80050033 CR2: 010d9b70 CR3: 05b30000 CR4: 003506d0 [ 968.262138] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 968.268413] DR6: fffe0ff0 DR7: 00000400 [ 968.272278] Call Trace: [ 968.274817] ? show_regs.cold+0x14/0x1a [ 968.278679] ? __warn+0x71/0x100 [ 968.281954] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.287224] ? report_bug+0x7e/0xa0 [ 968.290736] ? exc_overflow+0x40/0x40 [ 968.294452] ? handle_bug+0x2a/0x50 [ 968.297971] ? exc_invalid_op+0x1b/0x60 [ 968.301836] ? handle_exception+0x140/0x140 [ 968.306052] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.311310] ? exc_overflow+0x40/0x40 [ 968.314999] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.320252] ? trace_kprobe_run_command+0x20/0x20 [ 968.324970] ? trace_kprobe_run_command+0x20/0x20 [ 968.329720] kallsyms_on_each_symbol+0xc1/0xd0 [ 968.334195] ? trace_kprobe_run_command+0x20/0x20 [ 968.338939] trace_kprobe_create+0x5fd/0xb20 [ 968.343243] ? alloc_trace_kprobe+0x130/0x130 [ 968.347628] create_dyn_event+0x57/0xc0 [ 968.351495] ? dyn_event_release+0x140/0x140 [ 968.355791] trace_run_command+0x69/0x80 [ 968.359754] trace_parse_run_command+0x97/0x130 [ 968.364339] ? dyn_event_seq_next+0x20/0x20 [ 968.368549] dyn_event_write+0x10/0x20 [ 968.372328] ? dyn_event_release+0x140/0x140 [ 968.376611] vfs_write+0xe5/0x500 [ 968.379973] ? lock_acquire+0x8c/0x230 [ 968.383752] ? __might_fault+0x31/0x70 [ 968.387545] ? find_held_lock+0x24/0x80 [ 968.391414] ksys_write+0x72/0xf0 [ 968.394759] __ia32_sys_write+0x15/0x20 [ 968.398621] __do_fast_syscall_32+0x54/0xa0 [ 968.402838] do_fast_syscall_32+0x29/0x60 [ 968.406868] do_SYSENTER_32+0x15/0x20 [ 968.410547] entry_SYSENTER_32+0x9f/0xf2 [ 968.414497] EIP: 0xb7f85549 [ 968.417309] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 968.436081] EAX: ffffffda EBX: 00000001 ECX: 010ccdc0 EDX: 00000018 [ 968.442371] ESI: b7f6aff4 EDI: 010ccdc0 EBP: 0044c4fc ESP: bfd964c0 [ 968.448664] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000246 [ 968.455478] irq event stamp: 77487 [ 968.458912] hardirqs last enabled at (77497): [] console_unlock+0x589/0x5a0 [ 968.466837] hardirqs last disabled at (77506): [] console_unlock+0x41d/0x5a0 [ 968.474799] softirqs last enabled at (77474): [] call_on_stack+0x45/0x50 [ 968.482480] softirqs last disabled at (77469): [] call_on_stack+0x45/0x50 [ 968.490183] ---[ end trace 444b2433ce3c8b30 ]---
----->8-----
and this:
-----8<-----
------------[ cut here ]------------ [ 418.955406] WARNING: CPU: 1 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 418.963777] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 418.973433] CPU: 1 PID: 10942 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 418.980324] Hardware name: ARM Juno development board (r2) (DT) [ 418.986261] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 418.992284] pc : module_assert_mutex+0x3c/0x50 [ 418.996739] lr : module_assert_mutex+0x38/0x50 [ 419.001192] sp : ffff80001cd03a90 [ 419.004515] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.009853] x27: 0000000000000002 x26: ffff0008324a6f80 [ 419.015189] x25: 0000000000000006 x24: ffff800012819678 [ 419.020525] x23: ffff0008324a6608 x22: ffff800010229bd0 [ 419.025861] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.031196] x19: 0000000000000000 x18: 0000000000000000 [ 419.036531] x17: 0000000000000000 x16: 0000000000000000 [ 419.041867] x15: 0000aaab20142c50 x14: 0000000000000028 [ 419.047202] x13: 0000000000000002 x12: 0000000000000003 [ 419.052538] x11: 0000000000000002 x10: 0101010101010101 [ 419.057873] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.063209] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.068544] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.073880] x3 : 7d95b99001c19d7c x2 : ffff80096cfc9000 [ 419.079215] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.084551] Call trace: [ 419.087005] module_assert_mutex+0x3c/0x50 [ 419.091114] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.096267] kallsyms_on_each_symbol+0xe0/0x120 [ 419.100812] trace_kprobe_create+0x4e4/0x9d0 [ 419.105095] create_dyn_event+0x80/0xf0 [ 419.108943] trace_run_command+0x90/0xac [ 419.112877] trace_parse_run_command+0x120/0x4c0 [ 419.117506] dyn_event_write+0x18/0x24 [ 419.121267] vfs_write+0xec/0x20c [ 419.124592] ksys_write+0x78/0x110 [ 419.128004] __arm64_sys_write+0x24/0x30 [ 419.131939] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.136743] do_el0_svc+0x2c/0xa4 [ 419.140069] el0_svc+0x20/0x30 [ 419.143132] el0_sync_handler+0xe8/0x114 [ 419.147065] el0_sync+0x180/0x1c0 [ 419.150387] irq event stamp: 48184 [ 419.153800] hardirqs last enabled at (48183): [] exit_to_kernel_mode+0x38/0x180 [ 419.162781] hardirqs last disabled at (48184): [] el1_dbg+0x24/0x50 [ 419.170630] softirqs last enabled at (48168): [] __do_softirq+0x4dc/0x564 [ 419.179091] softirqs last disabled at (48153): [] __irq_exit_rcu+0x170/0x194 [ 419.187721] ---[ end trace 2989cd52be73b559 ]--- ------------[ cut here ]------------ [ 419.263431] WARNING: CPU: 2 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 419.271801] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 419.281457] CPU: 2 PID: 10942 Comm: ftracetest Tainted: G W 5.10.206-rc1 #1 [ 419.289740] Hardware name: ARM Juno development board (r2) (DT) [ 419.295676] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 419.301698] pc : module_assert_mutex+0x3c/0x50 [ 419.306154] lr : module_assert_mutex+0x38/0x50 [ 419.310607] sp : ffff80001cd03a90 [ 419.313930] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.319267] x27: 0000000000000002 x26: ffff000831f8d500 [ 419.324603] x25: 0000000000000007 x24: ffff800012819678 [ 419.329939] x23: ffff000831f8d608 x22: ffff800010229bd0 [ 419.335275] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.340610] x19: 0000000000000000 x18: 0000000000000000 [ 419.345946] x17: 0000000000000000 x16: 0000000000000000 [ 419.351281] x15: 0000aaab20142c50 x14: 000000000003fffd [ 419.356616] x13: 0000000000000038 x12: 0000000000000038 [ 419.361951] x11: 0000000000000002 x10: 0101010101010101 [ 419.367287] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.372622] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.377958] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.383293] x3 : 7d95b99001c19d7c x2 : ffff80096cfeb000 [ 419.388628] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.393964] Call trace: [ 419.396419] module_assert_mutex+0x3c/0x50 [ 419.400527] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.405679] kallsyms_on_each_symbol+0xe0/0x120 [ 419.410225] trace_kprobe_create+0x4e4/0x9d0 [ 419.414507] create_dyn_event+0x80/0xf0 [ 419.418355] trace_run_command+0x90/0xac [ 419.422289] trace_parse_run_command+0x120/0x4c0 [ 419.426918] dyn_event_write+0x18/0x24 [ 419.430683] vfs_write+0xec/0x20c [ 419.434007] ksys_write+0x78/0x110 [ 419.437419] __arm64_sys_write+0x24/0x30 [ 419.441354] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.446159] do_el0_svc+0x2c/0xa4 [ 419.449486] el0_svc+0x20/0x30 [ 419.452549] el0_sync_handler+0xe8/0x114 [ 419.456482] el0_sync+0x180/0x1c0 [ 419.459805] irq event stamp: 48666 [ 419.463218] hardirqs last enabled at (48665): [] exit_to_kernel_mode+0x38/0x180 [ 419.472199] hardirqs last disabled at (48666): [] el1_dbg+0x24/0x50 [ 419.480048] softirqs last enabled at (48664): [] __do_softirq+0x4dc/0x564 [ 419.488508] softirqs last disabled at (48659): [] __irq_exit_rcu+0x170/0x194 [ 419.497139] ---[ end trace 2989cd52be73b55a ]---
----->8-----
Test execution:
https://lkft.validation.linaro.org/scheduler/job/7142331
Bisections (Arm64 and x86) point to:
commit 47808d93a0cd0bb7358d9ef141e85216a4b86ef4
Author: Francis Laniel <[email protected]>
Date: Fri Oct 20 13:42:49 2023 +0300
tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
commit b022f0c7e404887a7c5229788fc99eff9f9a80d5 upstream.
Reverting made the warning disappear on both Arm64 and i386.
Greetings!
Daniel Díaz
[email protected]
Greg Kroah-Hartman
maintainerQuoted 199 lines · Daniel Díaz
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing a kernel warning on:
* Juno-r2
* Dragonboard 410c
* i386that looks like this:
-----8<-----
------------[ cut here ]------------ [ 968.182348] WARNING: CPU: 2 PID: 16253 at kernel/module.c:261 module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.191666] Modules linked in: x86_pkg_temp_thermal fuse ip_tables [ 968.197876] CPU: 2 PID: 16253 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 968.204786] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.7 12/07/2021 [ 968.212208] EIP: module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.217632] Code: 68 d9 75 a4 31 c0 8d 65 f4 5b 5e 5f 5d c3 8d 74 26 00 90 ba ff ff ff ff b8 38 36 68 d9 e8 e9 61 df 00 85 c0 0f 85 6f ff ff ff 0b e9 68 ff ff ff 8d b4 26 00 00 00 00 8d 76 00 3e 8d 74 26 00 [ 968.236389] EAX: 00000000 EBX: 00000001 ECX: ffffffff EDX: 00000001 [ 968.242700] ESI: c5839d68 EDI: 00025c3b EBP: c5839d54 ESP: c5839d3c [ 968.249008] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010246 [ 968.255845] CR0: 80050033 CR2: 010d9b70 CR3: 05b30000 CR4: 003506d0 [ 968.262138] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 968.268413] DR6: fffe0ff0 DR7: 00000400 [ 968.272278] Call Trace: [ 968.274817] ? show_regs.cold+0x14/0x1a [ 968.278679] ? __warn+0x71/0x100 [ 968.281954] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.287224] ? report_bug+0x7e/0xa0 [ 968.290736] ? exc_overflow+0x40/0x40 [ 968.294452] ? handle_bug+0x2a/0x50 [ 968.297971] ? exc_invalid_op+0x1b/0x60 [ 968.301836] ? handle_exception+0x140/0x140 [ 968.306052] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.311310] ? exc_overflow+0x40/0x40 [ 968.314999] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.320252] ? trace_kprobe_run_command+0x20/0x20 [ 968.324970] ? trace_kprobe_run_command+0x20/0x20 [ 968.329720] kallsyms_on_each_symbol+0xc1/0xd0 [ 968.334195] ? trace_kprobe_run_command+0x20/0x20 [ 968.338939] trace_kprobe_create+0x5fd/0xb20 [ 968.343243] ? alloc_trace_kprobe+0x130/0x130 [ 968.347628] create_dyn_event+0x57/0xc0 [ 968.351495] ? dyn_event_release+0x140/0x140 [ 968.355791] trace_run_command+0x69/0x80 [ 968.359754] trace_parse_run_command+0x97/0x130 [ 968.364339] ? dyn_event_seq_next+0x20/0x20 [ 968.368549] dyn_event_write+0x10/0x20 [ 968.372328] ? dyn_event_release+0x140/0x140 [ 968.376611] vfs_write+0xe5/0x500 [ 968.379973] ? lock_acquire+0x8c/0x230 [ 968.383752] ? __might_fault+0x31/0x70 [ 968.387545] ? find_held_lock+0x24/0x80 [ 968.391414] ksys_write+0x72/0xf0 [ 968.394759] __ia32_sys_write+0x15/0x20 [ 968.398621] __do_fast_syscall_32+0x54/0xa0 [ 968.402838] do_fast_syscall_32+0x29/0x60 [ 968.406868] do_SYSENTER_32+0x15/0x20 [ 968.410547] entry_SYSENTER_32+0x9f/0xf2 [ 968.414497] EIP: 0xb7f85549 [ 968.417309] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 968.436081] EAX: ffffffda EBX: 00000001 ECX: 010ccdc0 EDX: 00000018 [ 968.442371] ESI: b7f6aff4 EDI: 010ccdc0 EBP: 0044c4fc ESP: bfd964c0 [ 968.448664] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000246 [ 968.455478] irq event stamp: 77487 [ 968.458912] hardirqs last enabled at (77497): [] console_unlock+0x589/0x5a0 [ 968.466837] hardirqs last disabled at (77506): [] console_unlock+0x41d/0x5a0 [ 968.474799] softirqs last enabled at (77474): [] call_on_stack+0x45/0x50 [ 968.482480] softirqs last disabled at (77469): [] call_on_stack+0x45/0x50 [ 968.490183] ---[ end trace 444b2433ce3c8b30 ]-------->8-----
and this:
-----8<-----
------------[ cut here ]------------ [ 418.955406] WARNING: CPU: 1 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 418.963777] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 418.973433] CPU: 1 PID: 10942 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 418.980324] Hardware name: ARM Juno development board (r2) (DT) [ 418.986261] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 418.992284] pc : module_assert_mutex+0x3c/0x50 [ 418.996739] lr : module_assert_mutex+0x38/0x50 [ 419.001192] sp : ffff80001cd03a90 [ 419.004515] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.009853] x27: 0000000000000002 x26: ffff0008324a6f80 [ 419.015189] x25: 0000000000000006 x24: ffff800012819678 [ 419.020525] x23: ffff0008324a6608 x22: ffff800010229bd0 [ 419.025861] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.031196] x19: 0000000000000000 x18: 0000000000000000 [ 419.036531] x17: 0000000000000000 x16: 0000000000000000 [ 419.041867] x15: 0000aaab20142c50 x14: 0000000000000028 [ 419.047202] x13: 0000000000000002 x12: 0000000000000003 [ 419.052538] x11: 0000000000000002 x10: 0101010101010101 [ 419.057873] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.063209] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.068544] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.073880] x3 : 7d95b99001c19d7c x2 : ffff80096cfc9000 [ 419.079215] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.084551] Call trace: [ 419.087005] module_assert_mutex+0x3c/0x50 [ 419.091114] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.096267] kallsyms_on_each_symbol+0xe0/0x120 [ 419.100812] trace_kprobe_create+0x4e4/0x9d0 [ 419.105095] create_dyn_event+0x80/0xf0 [ 419.108943] trace_run_command+0x90/0xac [ 419.112877] trace_parse_run_command+0x120/0x4c0 [ 419.117506] dyn_event_write+0x18/0x24 [ 419.121267] vfs_write+0xec/0x20c [ 419.124592] ksys_write+0x78/0x110 [ 419.128004] __arm64_sys_write+0x24/0x30 [ 419.131939] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.136743] do_el0_svc+0x2c/0xa4 [ 419.140069] el0_svc+0x20/0x30 [ 419.143132] el0_sync_handler+0xe8/0x114 [ 419.147065] el0_sync+0x180/0x1c0 [ 419.150387] irq event stamp: 48184 [ 419.153800] hardirqs last enabled at (48183): [] exit_to_kernel_mode+0x38/0x180 [ 419.162781] hardirqs last disabled at (48184): [] el1_dbg+0x24/0x50 [ 419.170630] softirqs last enabled at (48168): [] __do_softirq+0x4dc/0x564 [ 419.179091] softirqs last disabled at (48153): [] __irq_exit_rcu+0x170/0x194 [ 419.187721] ---[ end trace 2989cd52be73b559 ]--- ------------[ cut here ]------------ [ 419.263431] WARNING: CPU: 2 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 419.271801] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 419.281457] CPU: 2 PID: 10942 Comm: ftracetest Tainted: G W 5.10.206-rc1 #1 [ 419.289740] Hardware name: ARM Juno development board (r2) (DT) [ 419.295676] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 419.301698] pc : module_assert_mutex+0x3c/0x50 [ 419.306154] lr : module_assert_mutex+0x38/0x50 [ 419.310607] sp : ffff80001cd03a90 [ 419.313930] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.319267] x27: 0000000000000002 x26: ffff000831f8d500 [ 419.324603] x25: 0000000000000007 x24: ffff800012819678 [ 419.329939] x23: ffff000831f8d608 x22: ffff800010229bd0 [ 419.335275] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.340610] x19: 0000000000000000 x18: 0000000000000000 [ 419.345946] x17: 0000000000000000 x16: 0000000000000000 [ 419.351281] x15: 0000aaab20142c50 x14: 000000000003fffd [ 419.356616] x13: 0000000000000038 x12: 0000000000000038 [ 419.361951] x11: 0000000000000002 x10: 0101010101010101 [ 419.367287] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.372622] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.377958] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.383293] x3 : 7d95b99001c19d7c x2 : ffff80096cfeb000 [ 419.388628] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.393964] Call trace: [ 419.396419] module_assert_mutex+0x3c/0x50 [ 419.400527] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.405679] kallsyms_on_each_symbol+0xe0/0x120 [ 419.410225] trace_kprobe_create+0x4e4/0x9d0 [ 419.414507] create_dyn_event+0x80/0xf0 [ 419.418355] trace_run_command+0x90/0xac [ 419.422289] trace_parse_run_command+0x120/0x4c0 [ 419.426918] dyn_event_write+0x18/0x24 [ 419.430683] vfs_write+0xec/0x20c [ 419.434007] ksys_write+0x78/0x110 [ 419.437419] __arm64_sys_write+0x24/0x30 [ 419.441354] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.446159] do_el0_svc+0x2c/0xa4 [ 419.449486] el0_svc+0x20/0x30 [ 419.452549] el0_sync_handler+0xe8/0x114 [ 419.456482] el0_sync+0x180/0x1c0 [ 419.459805] irq event stamp: 48666 [ 419.463218] hardirqs last enabled at (48665): [] exit_to_kernel_mode+0x38/0x180 [ 419.472199] hardirqs last disabled at (48666): [] el1_dbg+0x24/0x50 [ 419.480048] softirqs last enabled at (48664): [] __do_softirq+0x4dc/0x564 [ 419.488508] softirqs last disabled at (48659): [] __irq_exit_rcu+0x170/0x194 [ 419.497139] ---[ end trace 2989cd52be73b55a ]-------->8-----
Test execution:
https://lkft.validation.linaro.org/scheduler/job/7142331
Bisections (Arm64 and x86) point to:
commit
47808d93a0cd0bb7358d9ef141e85216a4b86ef4
Author: Francis Laniel <[email protected]>
Date: Fri Oct 20 13:42:49 2023 +0300
Quoted 7 lines
tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols commit
b022f0c7e404887a7c5229788fc99eff9f9a80d5upstream.Reverting made the warning disappear on both Arm64 and i386.
These patches are just flat out not worth it anymore, we have had more problems with them over the past few months than I can remember ever having for any other backport.
Francis, I'm sorry, but I give up here, I'm dropping these from all queues again, and if you feel they need to get into an older kernel tree like these, please submit the needed changes to the device/vendor/whomever trees as they can deal with the fallout, this has caused too many problems for the LTS kernels...
thanks,
greg k-h
Hi!
Quoted 9 lines · Le jeudi 4 janvier 2024, 10:25:13 CET Greg Kroah-Hartman a écrit :
Quoted 8 lines · Daniel Díaz
Hello!
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Responses should be made by Fri, 05 Jan 2024 16:47:49 +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.10.2
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
06-rc1.gz> >or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-
rc.gi
Quoted 209 lines
Quoted 197 lines
Quoted 6 lines
t linux-5.10.y> >and the diffstat can be found below.
thanks,
greg k-h
We're seeing a kernel warning on:
* Juno-r2
* Dragonboard 410c
* i386that looks like this:
-----8<-----
------------[ cut here ]------------ [ 968.182348] WARNING: CPU: 2 PID: 16253 at kernel/module.c:261 module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.191666] Modules linked in: x86_pkg_temp_thermal fuse ip_tables [ 968.197876] CPU: 2 PID: 16253 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 968.204786] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.7 12/07/2021 [ 968.212208] EIP: module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.217632] Code: 68 d9 75 a4 31 c0 8d 65 f4 5b 5e 5f 5d c3 8d 74 26 00 90 ba ff ff ff ff b8 38 36 68 d9 e8 e9 61 df 00 85 c0 0f 85 6f ff ff ff 0b e9 68 ff ff ff 8d b4 26 00 00 00 00 8d 76 00 3e 8d 74 26 00 [ 968.236389] EAX: 00000000 EBX: 00000001 ECX: ffffffff EDX: 00000001 [ 968.242700] ESI: c5839d68 EDI: 00025c3b EBP: c5839d54 ESP: c5839d3c [ 968.249008] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010246 [ 968.255845] CR0: 80050033 CR2: 010d9b70 CR3: 05b30000 CR4: 003506d0 [ 968.262138] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 968.268413] DR6: fffe0ff0 DR7: 00000400 [ 968.272278] Call Trace: [ 968.274817] ? show_regs.cold+0x14/0x1a [ 968.278679] ? __warn+0x71/0x100 [ 968.281954] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.287224] ? report_bug+0x7e/0xa0 [ 968.290736] ? exc_overflow+0x40/0x40 [ 968.294452] ? handle_bug+0x2a/0x50 [ 968.297971] ? exc_invalid_op+0x1b/0x60 [ 968.301836] ? handle_exception+0x140/0x140 [ 968.306052] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.311310] ? exc_overflow+0x40/0x40 [ 968.314999] ? module_kallsyms_on_each_symbol+0xaf/0xc0 [ 968.320252] ? trace_kprobe_run_command+0x20/0x20 [ 968.324970] ? trace_kprobe_run_command+0x20/0x20 [ 968.329720] kallsyms_on_each_symbol+0xc1/0xd0 [ 968.334195] ? trace_kprobe_run_command+0x20/0x20 [ 968.338939] trace_kprobe_create+0x5fd/0xb20 [ 968.343243] ? alloc_trace_kprobe+0x130/0x130 [ 968.347628] create_dyn_event+0x57/0xc0 [ 968.351495] ? dyn_event_release+0x140/0x140 [ 968.355791] trace_run_command+0x69/0x80 [ 968.359754] trace_parse_run_command+0x97/0x130 [ 968.364339] ? dyn_event_seq_next+0x20/0x20 [ 968.368549] dyn_event_write+0x10/0x20 [ 968.372328] ? dyn_event_release+0x140/0x140 [ 968.376611] vfs_write+0xe5/0x500 [ 968.379973] ? lock_acquire+0x8c/0x230 [ 968.383752] ? __might_fault+0x31/0x70 [ 968.387545] ? find_held_lock+0x24/0x80 [ 968.391414] ksys_write+0x72/0xf0 [ 968.394759] __ia32_sys_write+0x15/0x20 [ 968.398621] __do_fast_syscall_32+0x54/0xa0 [ 968.402838] do_fast_syscall_32+0x29/0x60 [ 968.406868] do_SYSENTER_32+0x15/0x20 [ 968.410547] entry_SYSENTER_32+0x9f/0xf2 [ 968.414497] EIP: 0xb7f85549 [ 968.417309] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 968.436081] EAX: ffffffda EBX: 00000001 ECX: 010ccdc0 EDX: 00000018 [ 968.442371] ESI: b7f6aff4 EDI: 010ccdc0 EBP: 0044c4fc ESP: bfd964c0 [ 968.448664] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000246 [ 968.455478] irq event stamp: 77487 [ 968.458912] hardirqs last enabled at (77497): [] console_unlock+0x589/0x5a0 [ 968.466837] hardirqs last disabled at (77506): [] console_unlock+0x41d/0x5a0 [ 968.474799] softirqs last enabled at (77474): [] call_on_stack+0x45/0x50 [ 968.482480] softirqs last disabled at (77469): [] call_on_stack+0x45/0x50 [ 968.490183] ---[ end trace 444b2433ce3c8b30 ]-------->8-----
and this:
-----8<-----
------------[ cut here ]------------ [ 418.955406] WARNING: CPU: 1 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 418.963777] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 418.973433] CPU: 1 PID: 10942 Comm: ftracetest Not tainted 5.10.206-rc1 #1 [ 418.980324] Hardware name: ARM Juno development board (r2) (DT) [ 418.986261] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 418.992284] pc : module_assert_mutex+0x3c/0x50 [ 418.996739] lr : module_assert_mutex+0x38/0x50 [ 419.001192] sp : ffff80001cd03a90 [ 419.004515] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.009853] x27: 0000000000000002 x26: ffff0008324a6f80 [ 419.015189] x25: 0000000000000006 x24: ffff800012819678 [ 419.020525] x23: ffff0008324a6608 x22: ffff800010229bd0 [ 419.025861] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.031196] x19: 0000000000000000 x18: 0000000000000000 [ 419.036531] x17: 0000000000000000 x16: 0000000000000000 [ 419.041867] x15: 0000aaab20142c50 x14: 0000000000000028 [ 419.047202] x13: 0000000000000002 x12: 0000000000000003 [ 419.052538] x11: 0000000000000002 x10: 0101010101010101 [ 419.057873] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.063209] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.068544] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.073880] x3 : 7d95b99001c19d7c x2 : ffff80096cfc9000 [ 419.079215] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.084551] Call trace: [ 419.087005] module_assert_mutex+0x3c/0x50 [ 419.091114] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.096267] kallsyms_on_each_symbol+0xe0/0x120 [ 419.100812] trace_kprobe_create+0x4e4/0x9d0 [ 419.105095] create_dyn_event+0x80/0xf0 [ 419.108943] trace_run_command+0x90/0xac [ 419.112877] trace_parse_run_command+0x120/0x4c0 [ 419.117506] dyn_event_write+0x18/0x24 [ 419.121267] vfs_write+0xec/0x20c [ 419.124592] ksys_write+0x78/0x110 [ 419.128004] __arm64_sys_write+0x24/0x30 [ 419.131939] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.136743] do_el0_svc+0x2c/0xa4 [ 419.140069] el0_svc+0x20/0x30 [ 419.143132] el0_sync_handler+0xe8/0x114 [ 419.147065] el0_sync+0x180/0x1c0 [ 419.150387] irq event stamp: 48184 [ 419.153800] hardirqs last enabled at (48183): [] exit_to_kernel_mode+0x38/0x180 [ 419.162781] hardirqs last disabled at (48184): [] el1_dbg+0x24/0x50 [ 419.170630] softirqs last enabled at (48168): [] __do_softirq+0x4dc/0x564 [ 419.179091] softirqs last disabled at (48153): [] __irq_exit_rcu+0x170/0x194 [ 419.187721] ---[ end trace 2989cd52be73b559 ]--- ------------[ cut here ]------------ [ 419.263431] WARNING: CPU: 2 PID: 10942 at kernel/module.c:261 module_assert_mutex+0x3c/0x50 [ 419.271801] Modules linked in: tda998x cec drm_kms_helper crct10dif_ce fuse drm dm_mod ip_tables x_tables [ 419.281457] CPU: 2 PID: 10942 Comm: ftracetest Tainted: G W 5.10.206-rc1 #1 [ 419.289740] Hardware name: ARM Juno development board (r2) (DT) [ 419.295676] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 419.301698] pc : module_assert_mutex+0x3c/0x50 [ 419.306154] lr : module_assert_mutex+0x38/0x50 [ 419.310607] sp : ffff80001cd03a90 [ 419.313930] x29: ffff80001cd03a90 x28: 0000000000000018 [ 419.319267] x27: 0000000000000002 x26: ffff000831f8d500 [ 419.324603] x25: 0000000000000007 x24: ffff800012819678 [ 419.329939] x23: ffff000831f8d608 x22: ffff800010229bd0 [ 419.335275] x21: ffff800010229bd0 x20: ffff80001cd03c68 [ 419.340610] x19: 0000000000000000 x18: 0000000000000000 [ 419.345946] x17: 0000000000000000 x16: 0000000000000000 [ 419.351281] x15: 0000aaab20142c50 x14: 000000000003fffd [ 419.356616] x13: 0000000000000038 x12: 0000000000000038 [ 419.361951] x11: 0000000000000002 x10: 0101010101010101 [ 419.367287] x9 : ffff80001019b11c x8 : 7f7f7f7f7f7f7f7f [ 419.372622] x7 : 625e6b646d71646a x6 : 34001c0a651c383c [ 419.377958] x5 : 3c381c650a1c0034 x4 : 0000000000000000 [ 419.383293] x3 : 7d95b99001c19d7c x2 : ffff80096cfeb000 [ 419.388628] x1 : 0000000000000000 x0 : 0000000000000000 [ 419.393964] Call trace: [ 419.396419] module_assert_mutex+0x3c/0x50 [ 419.400527] module_kallsyms_on_each_symbol+0x2c/0x100 [ 419.405679] kallsyms_on_each_symbol+0xe0/0x120 [ 419.410225] trace_kprobe_create+0x4e4/0x9d0 [ 419.414507] create_dyn_event+0x80/0xf0 [ 419.418355] trace_run_command+0x90/0xac [ 419.422289] trace_parse_run_command+0x120/0x4c0 [ 419.426918] dyn_event_write+0x18/0x24 [ 419.430683] vfs_write+0xec/0x20c [ 419.434007] ksys_write+0x78/0x110 [ 419.437419] __arm64_sys_write+0x24/0x30 [ 419.441354] el0_svc_common.constprop.0+0x84/0x1e0 [ 419.446159] do_el0_svc+0x2c/0xa4 [ 419.449486] el0_svc+0x20/0x30 [ 419.452549] el0_sync_handler+0xe8/0x114 [ 419.456482] el0_sync+0x180/0x1c0 [ 419.459805] irq event stamp: 48666 [ 419.463218] hardirqs last enabled at (48665): [] exit_to_kernel_mode+0x38/0x180 [ 419.472199] hardirqs last disabled at (48666): [] el1_dbg+0x24/0x50 [ 419.480048] softirqs last enabled at (48664): [] __do_softirq+0x4dc/0x564 [ 419.488508] softirqs last disabled at (48659): [] __irq_exit_rcu+0x170/0x194 [ 419.497139] ---[ end trace 2989cd52be73b55a ]-------->8-----
Test execution:
https://lkft.validation.linaro.org/scheduler/job/7142331Bisections (Arm64 and x86) point to:
commit47808d93a0cd0bb7358d9ef141e85216a4b86ef4
Author: Francis Laniel <[email protected]>
Date: Fri Oct 20 13:42:49 2023 +0300Quoted 7 lines
tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
commitb022f0c7e404887a7c5229788fc99eff9f9a80d5upstream.Reverting made the warning disappear on both Arm64 and i386.
These patches are just flat out not worth it anymore, we have had more problems with them over the past few months than I can remember ever having for any other backport.
Quoted 5 lines
Francis, I'm sorry, but I give up here, I'm dropping these from all queues again, and if you feel they need to get into an older kernel tree like these, please submit the needed changes to the device/vendor/whomever trees as they can deal with the fallout, this has caused too many problems for the LTS kernels...
I understand you and you do not have to be sorry.
Actually, this is rather me who have to apologize for the time taken by this bad patch... Sorry about it.
Regarding the problem, maybe the following patch may solve the troublesome patch:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?
id=926fe783c8a64b33997fec405cf1af3e61aed441
I will investigate, but for curiosity purpose only and I totally understand your decision.
I will definitely be more cautious in the future!
Quoted 3 lines
thanks,
greg k-h
Best regards.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
68 tests: 68 pass, 0 failLinux version: 5.10.206-rc1-g6ed2e58a1d40
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 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 Fri, 05 Jan 2024 16:47:49 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 495 pass: 495 fail: 0
Guenter
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.206 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Fri, 05 Jan 2024 16:47:49 +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.10.206-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
KernelCI report for stable-rc/linux-5.10.y for this week :-
## stable-rc HEAD for linux-5.10.y:
Date: 2024-01-02
5.10: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/log/?h=ca4427ebc6269ed2c255db88dc6e7bd2036c3103
## Build failures:
No build failures seen for the stable-rc/linux-5.10.y commit head \o/
## Boot failures:
No **new** boot failures seen for the stable-rc/linux-5.10.y commit head \o/
Thanks,
Shreeya Patel