5.15.179-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 549/620 block: fix conversion of GPT partition name to 7-bit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olivier Gayot <[email protected]>
commit e06472bab2a5393430cc2fbc3211cd3602422c1e upstream.
The utf16_le_to_7bit function claims to, naively, convert a UTF-16 string to a 7-bit ASCII string. By naively, we mean that it:
* drops the first byte of every character in the original UTF-16 string
* checks if all characters are printable, and otherwise replaces them by exclamation mark "!".
This means that theoretically, all characters outside the 7-bit ASCII range should be replaced by another character. Examples:
* lower-case alpha (ɒ) 0x0252 becomes 0x52 (R)
* ligature OE (œ) 0x0153 becomes 0x53 (S)
* hangul letter pieup (ㅂ) 0x3142 becomes 0x42 (B)
* upper-case gamma (Ɣ) 0x0194 becomes 0x94 (not printable) so gets replaced by "!"
The result of this conversion for the GPT partition name is passed to user-space as PARTNAME via udev, which is confusing and feels questionable.
However, there is a flaw in the conversion function itself. By dropping one byte of each character and using isprint() to check if the remaining byte corresponds to a printable character, we do not actually guarantee that the resulting character is 7-bit ASCII.
This happens because we pass 8-bit characters to isprint(), which in the kernel returns 1 for many values > 0x7f - as defined in ctype.c.
This results in many values which should be replaced by "!" to be kept as-is, despite not being valid 7-bit ASCII. Examples:
* e with acute accent (é) 0x00E9 becomes 0xE9 - kept as-is because isprint(0xE9) returns 1.
* euro sign (€) 0x20AC becomes 0xAC - kept as-is because isprint(0xAC) returns 1.
This way has broken pyudev utility[1], fixes it by using a mask of 7 bits instead of 8 bits before calling isprint.
--- block/partitions/efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/partitions/efi.c +1 -1
@@ -682,7 +682,7 @@ static void utf16_le_to_7bit(const __le1 out[size] =0 ;while (i < size) { -u8 c =le16_to_cpu (in[i]) &0xff ; +u8 c =le16_to_cpu (in[i]) &0x7f ;if (c && !isprint (c)) c ='!' ;
Greg Kroah-Hartman
maintainerPATCH 550/620 mm/page_alloc: fix uninitialized variable
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hao Zhang <[email protected]>
commit 8fe9ed44dc29fba0786b7e956d2e87179e407582 upstream.
The variable "compact_result" is not initialized in function __alloc_pages_slowpath(). It causes should_compact_retry() to use an uninitialized value.
Initialize variable "compact_result" with the value COMPACT_SKIPPED.
BUG: KMSAN: uninit-value in __alloc_pages_slowpath+0xee8/0x16c0 mm/page_alloc.c:4416 __alloc_pages_slowpath+0xee8/0x16c0 mm/page_alloc.c:4416 __alloc_frozen_pages_noprof+0xa4c/0xe00 mm/page_alloc.c:4752 alloc_pages_mpol+0x4cd/0x890 mm/mempolicy.c:2270 alloc_frozen_pages_noprof mm/mempolicy.c:2341 [inline] alloc_pages_noprof mm/mempolicy.c:2361 [inline] folio_alloc_noprof+0x1dc/0x350 mm/mempolicy.c:2371 filemap_alloc_folio_noprof+0xa6/0x440 mm/filemap.c:1019 __filemap_get_folio+0xb9a/0x1840 mm/filemap.c:1970 grow_dev_folio fs/buffer.c:1039 [inline] grow_buffers fs/buffer.c:1105 [inline] __getblk_slow fs/buffer.c:1131 [inline] bdev_getblk+0x2c9/0xab0 fs/buffer.c:1431 getblk_unmovable include/linux/buffer_head.h:369 [inline] ext4_getblk+0x3b7/0xe50 fs/ext4/inode.c:864 ext4_bread_batch+0x9f/0x7d0 fs/ext4/inode.c:933 __ext4_find_entry+0x1ebb/0x36c0 fs/ext4/namei.c:1627 ext4_lookup_entry fs/ext4/namei.c:1729 [inline] ext4_lookup+0x189/0xb40 fs/ext4/namei.c:1797 __lookup_slow+0x538/0x710 fs/namei.c:1793 lookup_slow+0x6a/0xd0 fs/namei.c:1810 walk_component fs/namei.c:2114 [inline] link_path_walk+0xf29/0x1420 fs/namei.c:2479 path_openat+0x30f/0x6250 fs/namei.c:3985 do_filp_open+0x268/0x600 fs/namei.c:4016 do_sys_openat2+0x1bf/0x2f0 fs/open.c:1428 do_sys_open fs/open.c:1443 [inline] __do_sys_openat fs/open.c:1459 [inline] __se_sys_openat fs/open.c:1454 [inline] __x64_sys_openat+0x2a1/0x310 fs/open.c:1454 x64_sys_call+0x36f5/0x3c30 arch/x86/include/generated/asm/syscalls_64.h:258 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xcd/0x1e0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Local variable compact_result created at:
__alloc_pages_slowpath+0x66/0x16c0 mm/page_alloc.c:4218 __alloc_frozen_pages_noprof+0xa4c/0xe00 mm/page_alloc.c:4752
--- mm/page_alloc.c | 1 + 1 file changed, 1 insertion(+)
mm/page_alloc.c +1 -0
@@ -4967,6 +4967,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, u restart: compaction_retries =0 ; no_progress_loops =0 ; + compact_result =COMPACT_SKIPPED ; compact_priority =DEF_COMPACT_PRIORITY ; cpuset_mems_cookie =read_mems_allowed_begin (); zonelist_iter_cookie =zonelist_iter_begin ();
Greg Kroah-Hartman
maintainerPATCH 551/620 mm: dont skip arch_sync_kernel_mappings() in error paths
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Roberts <[email protected]>
commit 3685024edd270f7c791f993157d65d3c928f3d6e upstream.
Fix callers that previously skipped calling arch_sync_kernel_mappings() if an error occurred during a pgtable update. The call is still required to sync any pgtable updates that may have occurred prior to hitting the error condition.
These are theoretical bugs discovered during code review.
--- mm/memory.c | 6 ++++-- mm/vmalloc.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
mm/memory.c +4 -2
@@ -2713,8 +2713,10 @@ static int __apply_to_page_range(struct next =pgd_addr_end (addr, end);if (pgd_none (*pgd) && !create)continue ; -if (WARN_ON_ONCE (pgd_leaf (*pgd))) -return -EINVAL ; +if (WARN_ON_ONCE (pgd_leaf (*pgd))) { + err = -EINVAL ; +break ; + }if (!pgd_none (*pgd) &&WARN_ON_ONCE (pgd_bad (*pgd))) {if (!create)continue ;
mm/vmalloc.c +2 -2
@@ -556,13 +556,13 @@ static int vmap_small_pages_range_noflus mask |=PGTBL_PGD_MODIFIED ; err =vmap_pages_p4d_range (pgd, addr, next, prot, pages, &nr, &mask);if (err) -return err; +break ; }while (pgd++, addr = next, addr != end);if (mask &ARCH_PAGE_TABLE_SYNC_MASK )arch_sync_kernel_mappings (start, end); -return 0 ; +return err; }/*
Greg Kroah-Hartman
maintainerPATCH 552/620 wifi: iwlwifi: limit printed string from FW file
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit e0dc2c1bef722cbf16ae557690861e5f91208129 ]
There's no guarantee here that the file is always with a NUL-termination, so reading the string may read beyond the end of the TLV. If that's the last TLV in the file, it can perhaps even read beyond the end of the file buffer.
Fix that by limiting the print format to the size of the buffer we have.
--- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +1 -1
@@ -1071,7 +1071,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,if (tlv_len !=sizeof (*fseq_ver)) goto invalid_tlv_len; -IWL_INFO (drv,"TLV_FW_FSEQ_VERSION: %s\n" , +IWL_INFO (drv,"TLV_FW_FSEQ_VERSION: %.32s\n" , fseq_ver->version); }break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 553/620 HID: google: fix unused variable warning under !CONFIG_ACPI
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu-Chun Lin <[email protected]>
[ Upstream commit 4bd0725c09f377ffaf22b834241f6c050742e4fc ]
As reported by the kernel test robot, the following warning occurs:
Quoted 1 line
Quoted 1 line
drivers/hid/hid-google-hammer.c:261:36: warning: 'cbas_ec_acpi_ids' defined but not used [-Wunused-const-variable=]
261 | static const struct acpi_device_id cbas_ec_acpi_ids[] = {
| ^~~~~~~~~~~~~~~~The 'cbas_ec_acpi_ids' array is only used when CONFIG_ACPI is enabled. Wrapping its definition and 'MODULE_DEVICE_TABLE' in '#ifdef CONFIG_ACPI' prevents a compiler warning when ACPI is disabled.
--- drivers/hid/hid-google-hammer.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/hid-google-hammer.c +2 -0
@@ -267,11 +267,13 @@ static int cbas_ec_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_ACPI static const struct acpi_device_id cbas_ec_acpi_ids[] = { {"GOOG000B" ,0 }, { } };MODULE_DEVICE_TABLE (acpi, cbas_ec_acpi_ids); +#endif #ifdef CONFIG_OF static const struct of_device_id cbas_ec_of_match[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 554/620 HID: intel-ish-hid: Fix use-after-free issue in ishtp_hid_remove()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Lixu <[email protected]>
[ Upstream commit 07583a0010696a17fb0942e0b499a62785c5fc9f ]
The system can experience a random crash a few minutes after the driver is removed. This issue occurs due to improper handling of memory freeing in the ishtp_hid_remove() function.
The function currently frees the driver_data directly within the loop that destroys the HID devices, which can lead to accessing freed memory. Specifically, hid_destroy_device() uses driver_data when it calls hid_ishtp_set_feature() to power off the sensor, so freeing driver_data beforehand can result in accessing invalid memory.
This patch resolves the issue by storing the driver_data in a temporary variable before calling hid_destroy_device(), and then freeing the driver_data after the device is destroyed.
--- drivers/hid/intel-ish-hid/ishtp-hid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/intel-ish-hid/ishtp-hid.c +3 -1
@@ -261,12 +261,14 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,*/ void ishtp_hid_remove (struct ishtp_cl_data *client_data) { +void *data;int i;for (i =0 ; i < client_data->num_hid_devices; ++i) {if (client_data->hid_sensor_hubs[i]) { -kfree (client_data->hid_sensor_hubs[i]->driver_data); + data = client_data->hid_sensor_hubs[i]->driver_data;hid_destroy_device (client_data->hid_sensor_hubs[i]); +kfree (data); client_data->hid_sensor_hubs[i] =NULL ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 555/620 nvmet-tcp: Fix a possible sporadic response drops in weakly ordered arch
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meir Elisha <[email protected]>
[ Upstream commit a16f88964c647103dad7743a484b216d488a6352 ]
The order in which queue->cmd and rcv_state are updated is crucial. If these assignments are reordered by the compiler, the worker might not get queued in nvmet_tcp_queue_response(), hanging the IO. to enforce the the correct reordering, set rcv_state using smp_store_release().
--- drivers/nvme/target/tcp.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/nvme/target/tcp.c +11 -4
@@ -539,10 +539,16 @@ static void nvmet_tcp_queue_response(struct nvmet_req *req)struct nvmet_tcp_cmd *cmd = container_of(req, struct nvmet_tcp_cmd, req);struct nvmet_tcp_queue *queue = cmd->queue; +enum nvmet_tcp_recv_state queue_state; +struct nvmet_tcp_cmd *queue_cmd;struct nvme_sgl_desc *sgl;u32 len; -if (unlikely (cmd == queue->cmd)) { +/* Pairs with store_release in nvmet_prepare_receive_pdu() */ + queue_state =smp_load_acquire (&queue->rcv_state); + queue_cmd =READ_ONCE (queue->cmd); + +if (unlikely (cmd == queue_cmd)) { sgl = &cmd->req.cmd->common.dptr.sgl; len =le32_to_cpu (sgl->length);
@@ -551,7 +557,7 @@ static void nvmet_tcp_queue_response(struct nvmet_req *req)* Avoid using helpers, this might happen before * nvmet_req_init is completed. */ -if (queue->rcv_state ==NVMET_TCP_RECV_PDU && +if (queue_state ==NVMET_TCP_RECV_PDU && len && len <= cmd->req.port->inline_data_size &&nvme_is_write (cmd->req.cmd))return ;
@@ -806,8 +812,9 @@ static void nvmet_prepare_receive_pdu(struct nvmet_tcp_queue *queue) { queue->offset =0 ; queue->left =sizeof (struct nvme_tcp_hdr ); - queue->cmd =NULL ; - queue->rcv_state =NVMET_TCP_RECV_PDU ; +WRITE_ONCE (queue->cmd,NULL ); +/* Ensure rcv_state is visible only after queue->cmd is set */ +smp_store_release (&queue->rcv_state,NVMET_TCP_RECV_PDU ); }static void nvmet_tcp_free_crypto (struct nvmet_tcp_queue *queue)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 556/620 net: gso: fix ownership in __udp_gso_segment
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoine Tenart <[email protected]>
[ Upstream commit ee01b2f2d7d0010787c2343463965bbc283a497f ]
In __udp_gso_segment the skb destructor is removed before segmenting the skb but the socket reference is kept as-is. This is an issue if the original skb is later orphaned as we can hit the following bug:
kernel BUG at ./include/linux/skbuff.h:3312! (skb_orphan)
RIP: 0010:ip_rcv_core+0x8b2/0xca0 Call Trace: ip_rcv+0xab/0x6e0 __netif_receive_skb_one_core+0x168/0x1b0 process_backlog+0x384/0x1100 __napi_poll.constprop.0+0xa1/0x370 net_rx_action+0x925/0xe50
The above can happen following a sequence of events when using OpenVSwitch, when an OVS_ACTION_ATTR_USERSPACE action precedes an OVS_ACTION_ATTR_OUTPUT action:
1. OVS_ACTION_ATTR_USERSPACE is handled (in do_execute_actions): the skb goes through queue_gso_packets and then __udp_gso_segment, where its destructor is removed.
2. The segments' data are copied and sent to userspace.
3. OVS_ACTION_ATTR_OUTPUT is handled (in do_execute_actions) and the same original skb is sent to its path.
4. If it later hits skb_orphan, we hit the bug.
Fix this by also removing the reference to the socket in __udp_gso_segment.
--- net/ipv4/udp_offload.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/ipv4/udp_offload.c +6 -2
@@ -295,13 +295,17 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,/* clear destructor to avoid skb_segment assigning it to tail */ copy_dtor = gso_skb->destructor == sock_wfree; -if (copy_dtor) +if (copy_dtor) { gso_skb->destructor =NULL ; + gso_skb->sk =NULL ; + } segs =skb_segment (gso_skb, features);if (IS_ERR_OR_NULL (segs)) { -if (copy_dtor) +if (copy_dtor) { gso_skb->destructor = sock_wfree; + gso_skb->sk = sk; + }return segs; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 557/620 caif_virtio: fix wrong pointer check in cfv_probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaliy Shevtsov <[email protected]>
[ Upstream commit a466fd7e9fafd975949e5945e2f70c33a94b1a70 ]
del_vqs() frees virtqueues, therefore cfv->vq_tx pointer should be checked for NULL before calling it, not cfv->vdev. Also the current implementation is redundant because the pointer cfv->vdev is dereferenced before it is checked for NULL.
Fix this by checking cfv->vq_tx for NULL instead of cfv->vdev before calling del_vqs().
--- drivers/net/caif/caif_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/caif/caif_virtio.c +1 -1
@@ -744,7 +744,7 @@ static int cfv_probe(struct virtio_device *vdev)if (cfv->vr_rx) vdev->vringh_config->del_vrhs (cfv->vdev); -if (cfv->vdev) +if (cfv->vq_tx) vdev->config->del_vqs (cfv->vdev);free_netdev (netdev);return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 558/620 hwmon: (pmbus) Initialise page count in pmbus_identify()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Titus Rwantare <[email protected]>
[ Upstream commit 6b6e2e8fd0de3fa7c6f4f8fe6841b01770b2e7bc ]
The pmbus_identify() function fails to correctly determine the number of supported pages on PMBus devices. This occurs because info->pages is implicitly zero-initialised, and pmbus_set_page() does not perform writes to the page register if info->pages is not yet initialised. Without this patch, info->pages is always set to the maximum after scanning.
This patch initialises info->pages to PMBUS_PAGES before the probing loop, enabling pmbus_set_page() writes to make it out onto the bus correctly identifying the number of pages. PMBUS_PAGES seemed like a reasonable non-zero number because that's the current result of the identification process.
Testing was done with a PMBus device in QEMU.
--- drivers/hwmon/pmbus/pmbus.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwmon/pmbus/pmbus.c +2 -0
@@ -103,6 +103,8 @@ static int pmbus_identify(struct i2c_client *client,if (pmbus_check_byte_register (client,0 ,PMBUS_PAGE )) {int page; + info->pages =PMBUS_PAGES ; +for (page =1 ; page <PMBUS_PAGES ; page++) {if (pmbus_set_page (client, page,0xff ) <0 )break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 559/620 hwmon: (ntc_thermistor) Fix the ncpXXxh103 sensor table
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maud Spierings <[email protected]>
[ Upstream commit 1c7932d5ae0f5c22fa52ac811b4c427bbca5aff5 ]
I could not find a single table that has the values currently present in the table, change it to the actual values that can be found in [1]/[2] and [3] (page 15 column 2)
[1]: https://www.murata.com/products/productdetail?partno=NCP15XH103F03RC
[2]: https://www.murata.com/products/productdata/8796836626462/NTHCG83.txt?1437969843000
[3]: https://nl.mouser.com/datasheet/2/281/r44e-522712.pdf
--- drivers/hwmon/ntc_thermistor.c | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-)
drivers/hwmon/ntc_thermistor.c +33 -33
@@ -174,40 +174,40 @@ static const struct ntc_compensation ncpXXwf104[] = { };static const struct ntc_compensation ncpXXxh103[] = { - { .temp_c =-40 , .ohm =247565 }, - { .temp_c =-35 , .ohm =181742 }, - { .temp_c =-30 , .ohm =135128 }, - { .temp_c =-25 , .ohm =101678 }, - { .temp_c =-20 , .ohm =77373 }, - { .temp_c =-15 , .ohm =59504 }, - { .temp_c =-10 , .ohm =46222 }, - { .temp_c =-5 , .ohm =36244 }, - { .temp_c =0 , .ohm =28674 }, - { .temp_c =5 , .ohm =22878 }, - { .temp_c =10 , .ohm =18399 }, - { .temp_c =15 , .ohm =14910 }, - { .temp_c =20 , .ohm =12169 }, + { .temp_c =-40 , .ohm =195652 }, + { .temp_c =-35 , .ohm =148171 }, + { .temp_c =-30 , .ohm =113347 }, + { .temp_c =-25 , .ohm =87559 }, + { .temp_c =-20 , .ohm =68237 }, + { .temp_c =-15 , .ohm =53650 }, + { .temp_c =-10 , .ohm =42506 }, + { .temp_c =-5 , .ohm =33892 }, + { .temp_c =0 , .ohm =27219 }, + { .temp_c =5 , .ohm =22021 }, + { .temp_c =10 , .ohm =17926 }, + { .temp_c =15 , .ohm =14674 }, + { .temp_c =20 , .ohm =12081 }, { .temp_c =25 , .ohm =10000 }, - { .temp_c =30 , .ohm =8271 }, - { .temp_c =35 , .ohm =6883 }, - { .temp_c =40 , .ohm =5762 }, - { .temp_c =45 , .ohm =4851 }, - { .temp_c =50 , .ohm =4105 }, - { .temp_c =55 , .ohm =3492 }, - { .temp_c =60 , .ohm =2985 }, - { .temp_c =65 , .ohm =2563 }, - { .temp_c =70 , .ohm =2211 }, - { .temp_c =75 , .ohm =1915 }, - { .temp_c =80 , .ohm =1666 }, - { .temp_c =85 , .ohm =1454 }, - { .temp_c =90 , .ohm =1275 }, - { .temp_c =95 , .ohm =1121 }, - { .temp_c =100 , .ohm =990 }, - { .temp_c =105 , .ohm =876 }, - { .temp_c =110 , .ohm =779 }, - { .temp_c =115 , .ohm =694 }, - { .temp_c =120 , .ohm =620 }, - { .temp_c =125 , .ohm =556 }, + { .temp_c =30 , .ohm =8315 }, + { .temp_c =35 , .ohm =6948 }, + { .temp_c =40 , .ohm =5834 }, + { .temp_c =45 , .ohm =4917 }, + { .temp_c =50 , .ohm =4161 }, + { .temp_c =55 , .ohm =3535 }, + { .temp_c =60 , .ohm =3014 }, + { .temp_c =65 , .ohm =2586 }, + { .temp_c =70 , .ohm =2228 }, + { .temp_c =75 , .ohm =1925 }, + { .temp_c =80 , .ohm =1669 }, + { .temp_c =85 , .ohm =1452 }, + { .temp_c =90 , .ohm =1268 }, + { .temp_c =95 , .ohm =1110 }, + { .temp_c =100 , .ohm =974 }, + { .temp_c =105 , .ohm =858 }, + { .temp_c =110 , .ohm =758 }, + { .temp_c =115 , .ohm =672 }, + { .temp_c =120 , .ohm =596 }, + { .temp_c =125 , .ohm =531 }, };/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 560/620 hwmon: (ad7314) Validate leading zero bits and return error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Erik Schumacher <[email protected]>
[ Upstream commit e278d5e8aef4c0a1d9a9fa8b8910d713a89aa800 ]
Leading zero bits are sent on the bus before the temperature value is transmitted. If any of these bits are high, the connection might be unstable or there could be no AD7314 / ADT730x (or compatible) at all. Return -EIO in that case.
--- drivers/hwmon/ad7314.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hwmon/ad7314.c +10 -0
@@ -22,11 +22,13 @@*/ #define AD7314_TEMP_MASK 0x7FE0#define AD7314_TEMP_SHIFT 5 +#define AD7314_LEADING_ZEROS_MASK BIT(15)/* * ADT7301 and ADT7302 temperature masks */ #define ADT7301_TEMP_MASK 0x3FFF +#define ADT7301_LEADING_ZEROS_MASK (BIT(15) | BIT(14))enum ad7314_variant { adt7301,
@@ -65,12 +67,20 @@ static ssize_t ad7314_temperature_show(struct device *dev,return ret;switch (spi_get_device_id (chip->spi_dev)->driver_data) {case ad7314: +if (ret &AD7314_LEADING_ZEROS_MASK ) { +/* Invalid read-out, leading zero part is missing */ +return -EIO ; + } data = (ret &AD7314_TEMP_MASK ) >>AD7314_TEMP_SHIFT ; data =sign_extend32 (data,9 );return sprintf (buf,"%d\n" ,250 * data);case adt7301:case adt7302: +if (ret &ADT7301_LEADING_ZEROS_MASK ) { +/* Invalid read-out, leading zero part is missing */ +return -EIO ; + }/* * Documented as a 13 bit twos complement register * with a sign bit - which is a 14 bit 2's complement
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 561/620 ALSA: usx2y: validate nrpacks module parameter on probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Murad Masimov <[email protected]>
[ Upstream commit 172a0f509723fe4741d4b8e9190cf434b18320d8 ]
The module parameter defines number of iso packets per one URB. User is allowed to set any value to the parameter of type int, which can lead to various kinds of weird and incorrect behavior like integer overflows, truncations, etc. Number of packets should be a small non-negative number.
Since this parameter is read-only, its value can be validated on driver probe.
--- sound/usb/usx2y/usbusx2y.c | 11 +++++++++++ sound/usb/usx2y/usbusx2y.h | 26 ++++++++++++++++++++++++++ sound/usb/usx2y/usbusx2yaudio.c | 27 --------------------------- 3 files changed, 37 insertions(+), 27 deletions(-)
sound/usb/usx2y/usbusx2y.c +11 -0
@@ -151,6 +151,12 @@ static int snd_usx2y_card_used[SNDRV_CARDS];static void snd_usx2y_card_private_free (struct snd_card *card);static void usx2y_unlinkseq (struct snd_usx2y_async_seq *s); +#ifdef USX2Y_NRPACKS_VARIABLE +int nrpacks =USX2Y_NRPACKS ;/* number of packets per urb */ +module_param (nrpacks, int,0444 ); +MODULE_PARM_DESC (nrpacks,"Number of packets per URB." ); +#endif +/* * pipe 4 is used for switching the lamps, setting samplerate, volumes .... */
@@ -433,6 +439,11 @@ static int snd_usx2y_probe(struct usb_interface *intf,struct snd_card *card;int err; +#ifdef USX2Y_NRPACKS_VARIABLE +if (nrpacks <0 || nrpacks >USX2Y_NRPACKS_MAX ) +return -EINVAL ; +#endif + if (le16_to_cpu(device->descriptor.idVendor) != 0x1604 || (le16_to_cpu(device->descriptor.idProduct) != USB_ID_US122 && le16_to_cpu(device->descriptor.idProduct) != USB_ID_US224 &&
sound/usb/usx2y/usbusx2y.h +26 -0
@@ -7,6 +7,32 @@#define NRURBS 2 +/* Default value used for nr of packs per urb. +* 1 to 4 have been tested ok on uhci. +* To use 3 on ohci, you'd need a patch: +* look for "0000425-linux-2.6.9-rc4-mm1_ohci-hcd.patch.gz" on +* "https://bugtrack.alsa-project.org/alsa-bug/bug_view_page.php?bug_id=0000425" +* +* 1, 2 and 4 work out of the box on ohci, if I recall correctly. +* Bigger is safer operation, smaller gives lower latencies. +*/ +#define USX2Y_NRPACKS 4 + +#define USX2Y_NRPACKS_MAX 1024 + +/* If your system works ok with this module's parameter +* nrpacks set to 1, you might as well comment +* this define out, and thereby produce smaller, faster code. +* You'd also set USX2Y_NRPACKS to 1 then. +*/ +#define USX2Y_NRPACKS_VARIABLE 1 + +#ifdef USX2Y_NRPACKS_VARIABLE +extern int nrpacks; +#define nr_of_packs () nrpacks +#else +#define nr_of_packs () USX2Y_NRPACKS +#endif #define URBS_ASYNC_SEQ 10#define URB_DATA_LEN_ASYNC_SEQ 32
sound/usb/usx2y/usbusx2yaudio.c +0 -27
@@ -28,33 +28,6 @@#include "usx2y.h" #include "usbusx2y.h" -/* Default value used for nr of packs per urb. -* 1 to 4 have been tested ok on uhci. -* To use 3 on ohci, you'd need a patch: -* look for "0000425-linux-2.6.9-rc4-mm1_ohci-hcd.patch.gz" on -* "https://bugtrack.alsa-project.org/alsa-bug/bug_view_page.php?bug_id=0000425" -* -* 1, 2 and 4 work out of the box on ohci, if I recall correctly. -* Bigger is safer operation, smaller gives lower latencies. -*/ -#define USX2Y_NRPACKS 4 - -/* If your system works ok with this module's parameter -* nrpacks set to 1, you might as well comment -* this define out, and thereby produce smaller, faster code. -* You'd also set USX2Y_NRPACKS to 1 then. -*/ -#define USX2Y_NRPACKS_VARIABLE 1 - -#ifdef USX2Y_NRPACKS_VARIABLE -static int nrpacks =USX2Y_NRPACKS ;/* number of packets per urb */ -#define nr_of_packs () nrpacks -module_param (nrpacks, int,0444 ); -MODULE_PARM_DESC (nrpacks,"Number of packets per URB." ); -#else -#define nr_of_packs () USX2Y_NRPACKS -#endif -static int usx2y_urb_capt_retire (struct snd_usx2y_substream *subs) {struct urb *urb = subs->completed_urb;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 562/620 llc: do not use skb_get() before dev_queue_xmit()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 64e6a754d33d31aa844b3ee66fb93ac84ca1565e ]
syzbot is able to crash hosts [1], using llc and devices not supporting IFF_TX_SKB_SHARING.
In this case, e1000 driver calls eth_skb_pad(), while the skb is shared.
Simply replace skb_get() by skb_clone() in net/llc/llc_s_ac.c
Note that e1000 driver might have an issue with pktgen, because it does not clear IFF_TX_SKB_SHARING, this is an orthogonal change.
We need to audit other skb_get() uses in net/llc.
[1]
kernel BUG at net/core/skbuff.c:2178 !
Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN NOPTI CPU: 0 UID: 0 PID: 16371 Comm: syz.2.2764 Not tainted 6.14.0-rc4-syzkaller-00052-gac9c34d1e45a #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 RIP: 0010:pskb_expand_head+0x6ce/0x1240 net/core/skbuff.c:2178 Call Trace: <TASK> __skb_pad+0x18a/0x610 net/core/skbuff.c:2466 __skb_put_padto include/linux/skbuff.h:3843 [inline] skb_put_padto include/linux/skbuff.h:3862 [inline] eth_skb_pad include/linux/etherdevice.h:656 [inline] e1000_xmit_frame+0x2d99/0x5800 drivers/net/ethernet/intel/e1000/e1000_main.c:3128 __netdev_start_xmit include/linux/netdevice.h:5151 [inline] netdev_start_xmit include/linux/netdevice.h:5160 [inline] xmit_one net/core/dev.c:3806 [inline] dev_hard_start_xmit+0x9a/0x7b0 net/core/dev.c:3822 sch_direct_xmit+0x1ae/0xc30 net/sched/sch_generic.c:343 __dev_xmit_skb net/core/dev.c:4045 [inline] __dev_queue_xmit+0x13d4/0x43e0 net/core/dev.c:4621 dev_queue_xmit include/linux/netdevice.h:3313 [inline] llc_sap_action_send_test_c+0x268/0x320 net/llc/llc_s_ac.c:144 llc_exec_sap_trans_actions net/llc/llc_sap.c:153 [inline] llc_sap_next_state net/llc/llc_sap.c:182 [inline] llc_sap_state_process+0x239/0x510 net/llc/llc_sap.c:209 llc_ui_sendmsg+0xd0d/0x14e0 net/llc/af_llc.c:993 sock_sendmsg_nosec net/socket.c:718 [inline]
--- net/llc/llc_s_ac.c | 49 +++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
net/llc/llc_s_ac.c +27 -22
@@ -24,7 +24,7 @@#include <net/llc_s_ac.h> #include <net/llc_s_ev.h> #include <net/llc_sap.h> - +#include <net/sock.h> /** * llc_sap_action_unitdata_ind - forward UI PDU to network layer
@@ -40,6 +40,26 @@ int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb)return 0 ; } +static int llc_prepare_and_xmit (struct sk_buff *skb) +{ +struct llc_sap_state_ev *ev =llc_sap_ev (skb); +struct sk_buff *nskb; +int rc; + + rc =llc_mac_hdr_init (skb, ev->saddr.mac, ev->daddr.mac); +if (rc) +return rc; + + nskb =skb_clone (skb,GFP_ATOMIC ); +if (!nskb) +return -ENOMEM ; + +if (skb->sk) +skb_set_owner_w (nskb, skb->sk); + +return dev_queue_xmit (nskb); +} +/** * llc_sap_action_send_ui - sends UI PDU resp to UNITDATA REQ to MAC layer * @sap: SAP
@@ -52,17 +72,12 @@ int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb)int llc_sap_action_send_ui (struct llc_sap *sap,struct sk_buff *skb) {struct llc_sap_state_ev *ev =llc_sap_ev (skb); -int rc;llc_pdu_header_init (skb,LLC_PDU_TYPE_U , ev->saddr.lsap, ev->daddr.lsap,LLC_PDU_CMD );llc_pdu_init_as_ui_cmd (skb); - rc =llc_mac_hdr_init (skb, ev->saddr.mac, ev->daddr.mac); -if (likely (!rc)) { -skb_get (skb); - rc =dev_queue_xmit (skb); - } -return rc; + +return llc_prepare_and_xmit (skb); }/**
@@ -77,17 +92,12 @@ int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb)int llc_sap_action_send_xid_c (struct llc_sap *sap,struct sk_buff *skb) {struct llc_sap_state_ev *ev =llc_sap_ev (skb); -int rc;llc_pdu_header_init (skb,LLC_PDU_TYPE_U_XID , ev->saddr.lsap, ev->daddr.lsap,LLC_PDU_CMD );llc_pdu_init_as_xid_cmd (skb,LLC_XID_NULL_CLASS_2 ,0 ); - rc =llc_mac_hdr_init (skb, ev->saddr.mac, ev->daddr.mac); -if (likely (!rc)) { -skb_get (skb); - rc =dev_queue_xmit (skb); - } -return rc; + +return llc_prepare_and_xmit (skb); }/**
@@ -133,17 +143,12 @@ int llc_sap_action_send_xid_r(struct llc_sap *sap, struct sk_buff *skb)int llc_sap_action_send_test_c (struct llc_sap *sap,struct sk_buff *skb) {struct llc_sap_state_ev *ev =llc_sap_ev (skb); -int rc;llc_pdu_header_init (skb,LLC_PDU_TYPE_U , ev->saddr.lsap, ev->daddr.lsap,LLC_PDU_CMD );llc_pdu_init_as_test_cmd (skb); - rc =llc_mac_hdr_init (skb, ev->saddr.mac, ev->daddr.mac); -if (likely (!rc)) { -skb_get (skb); - rc =dev_queue_xmit (skb); - } -return rc; + +return llc_prepare_and_xmit (skb); }int llc_sap_action_send_test_r (struct llc_sap *sap,struct sk_buff *skb)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 563/620 hwmon: fix a NULL vs IS_ERR_OR_NULL() check in xgene_hwmon_probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xinghuo Chen <[email protected]>
[ Upstream commit 10fce7ebe888fa8c97eee7e317a47e7603e5e78d ]
The devm_memremap() function returns error pointers on error, it doesn't return NULL.
--- drivers/hwmon/xgene-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/xgene-hwmon.c +1 -1
@@ -719,7 +719,7 @@ static int xgene_hwmon_probe(struct platform_device *pdev) goto out; } -if (!ctx->pcc_comm_addr) { +if (IS_ERR_OR_NULL (ctx->pcc_comm_addr)) {dev_err (&pdev->dev,"Failed to ioremap PCC comm region\n" ); rc = -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 564/620 drm/sched: Fix preprocessor guard
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Stanner <[email protected]>
[ Upstream commit 23e0832d6d7be2d3c713f9390c060b6f1c48bf36 ]
When writing the header guard for gpu_scheduler_trace.h, a typo, apparently, occurred.
Fix the typo and document the scope of the guard.
--- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +2 -2
@@ -21,7 +21,7 @@* */ -#if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ ) +#if !defined(_GPU_SCHED_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ )#define _GPU_SCHED_TRACE_H_#include <linux/stringify.h>
@@ -123,7 +123,7 @@ TRACE_EVENT(drm_sched_job_wait_dep, __entry->seqno) ); -#endif +#endif /* _GPU_SCHED_TRACE_H_ */ /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 565/620 be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 1a82d19ca2d6835904ee71e2d40fd331098f94a0 ]
Partially revert commit b71724147e73 ("be2net: replace polling with sleeping in the FW completion path") w.r.t mcc mutex it introduces and the use of usleep_range. The be2net be_ndo_bridge_getlink() callback is called with rcu_read_lock, so this code has been broken for a long time. Both the mutex_lock and the usleep_range can cause the issue Ian Kumlien reported[1]. The call path is:be_ndo_bridge_getlink -> be_cmd_get_hsw_config -> be_mcc_notify_wait -> be_mcc_wait_compl -> usleep_range()
[1] https://lore.kernel.org/netdev/CAA85sZveppNgEVa_FD+qhOMtG_AavK9_mFiU+jWrMtXmwqefGA@mail.gmail.com/
--- drivers/net/ethernet/emulex/benet/be.h | 2 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 197 ++++++++++---------- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- 3 files changed, 100 insertions(+), 101 deletions(-)
drivers/net/ethernet/emulex/benet/be.h +1 -1
@@ -563,7 +563,7 @@ struct be_adapter {struct be_dma_mem mbox_mem_alloced;struct be_mcc_obj mcc_obj; -struct mutex mcc_lock;/* For serializing mcc cmds to BE card */ +spinlock_t mcc_lock;/* For serializing mcc cmds to BE card */ spinlock_t mcc_cq_lock;u16 cfg_num_rx_irqs;/* configured via set-channels */
drivers/net/ethernet/emulex/benet/be_cmds.c +98 -99
787 lines not on this page · raw message
drivers/net/ethernet/emulex/benet/be_main.c +1 -1
@@ -5673,8 +5673,8 @@ static int be_drv_init(struct be_adapter *adapter) }mutex_init (&adapter->mbox_lock); -mutex_init (&adapter->mcc_lock);mutex_init (&adapter->rx_filter_lock); +spin_lock_init (&adapter->mcc_lock);spin_lock_init (&adapter->mcc_cq_lock);init_completion (&adapter->et_cmd_compl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 566/620 net: hns3: make sure ptp clock is unregister and freed if hclge_ptp_get_cycle returns an error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peiyang Wang <[email protected]>
[ Upstream commit b7365eab39831487a84e63a9638209b68dc54008 ]
During the initialization of ptp, hclge_ptp_get_cycle might return an error and returned directly without unregister clock and free it. To avoid that, call hclge_ptp_destroy_clock to unregist and free clock if hclge_ptp_get_cycle failed.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +1 -1
@@ -496,7 +496,7 @@ int hclge_ptp_init(struct hclge_dev *hdev) ret =hclge_ptp_get_cycle (hdev);if (ret) -return ret; + goto out; } ret =hclge_ptp_int_en (hdev, true);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 567/620 ppp: Fix KMSAN uninit-value warning with bpf
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 4c2d14c40a68678d885eab4008a0129646805bae ]
Syzbot caught an "KMSAN: uninit-value" warning [1], which is caused by the ppp driver not initializing a 2-byte header when using socket filter.
The following code can generate a PPP filter BPF program:
'''
struct bpf_program fp;pcap_t *handle;
handle = pcap_open_dead(DLT_PPP_PPPD, 65535); pcap_compile(handle, &fp, "ip and outbound", 0, 0); bpf_dump(&fp, 1);
'''
Its output is:
'''
(000) ldh [2]
(001) jeq #0x21 jt 2 jf 5
(002) ldb [0]
(003) jeq #0x1 jt 4 jf 5
(004) ret #65535
(005) ret #0
'''
Wen can find similar code at the following link:
https://github.com/ppp-project/ppp/blob/master/pppd/options.c#L1680
The maintainer of this code repository is also the original maintainer of the ppp driver.
As you can see the BPF program skips 2 bytes of data and then reads the 'Protocol' field to determine if it's an IP packet. Then it read the first byte of the first 2 bytes to determine the direction.
The issue is that only the first byte indicating direction is initialized in current ppp driver code while the second byte is not initialized.
For normal BPF programs generated by libpcap, uninitialized data won't be used, so it's not a problem. However, for carefully crafted BPF programs, such as those generated by syzkaller [2], which start reading from offset 0, the uninitialized data will be used and caught by KMSAN.
[1] https://syzkaller.appspot.com/bug?extid=853242d9c9917165d791
[2] https://syzkaller.appspot.com/text?tag=ReproC&x=11994913980000
--- drivers/net/ppp/ppp_generic.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/net/ppp/ppp_generic.c +19 -9
@@ -72,6 +72,17 @@#define PPP_PROTO_LEN 2#define PPP_LCP_HDRLEN 4 +/* The filter instructions generated by libpcap are constructed +* assuming a four-byte PPP header on each packet, where the last +* 2 bytes are the protocol field defined in the RFC and the first +* byte of the first 2 bytes indicates the direction. +* The second byte is currently unused, but we still need to initialize +* it to prevent crafted BPF programs from reading them which would +* cause reading of uninitialized data. +*/ +#define PPP_FILTER_OUTBOUND_TAG 0x0100 +#define PPP_FILTER_INBOUND_TAG 0x0000 +/* * An instance of /dev/ppp can be associated with either a ppp * interface unit or a ppp channel. In both cases, file->private_data
@@ -1761,10 +1772,10 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)if (proto <0x8000 ) {#ifdef CONFIG_PPP_FILTER -/* check if we should pass this packet */ -/* the filter instructions are constructed assuming -a four-byte PPP header on each packet */ - *(u8 *)skb_push (skb,2 ) =1 ; +/* check if the packet passes the pass and active filters. +* See comment for PPP_FILTER_OUTBOUND_TAG above. +*/ + *(__be16 *)skb_push (skb,2 ) =htons (PPP_FILTER_OUTBOUND_TAG );if (ppp->pass_filter &&bpf_prog_run (ppp->pass_filter, skb) ==0 ) {if (ppp->debug &1 )
@@ -2481,14 +2492,13 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)/* network protocol frame - give it to the kernel */ #ifdef CONFIG_PPP_FILTER -/* check if the packet passes the pass and active filters */ -/* the filter instructions are constructed assuming -a four-byte PPP header on each packet */ if (ppp->pass_filter || ppp->active_filter) {if (skb_unclone (skb,GFP_ATOMIC )) goto err; - - *(u8 *)skb_push (skb,2 ) =0 ; +/* Check if the packet passes the pass and active filters. +* See comment for PPP_FILTER_INBOUND_TAG above. +*/ + *(__be16 *)skb_push (skb,2 ) =htons (PPP_FILTER_INBOUND_TAG );if (ppp->pass_filter &&bpf_prog_run (ppp->pass_filter, skb) ==0 ) {if (ppp->debug &1 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 568/620 vlan: enforce underlying device type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oscar Maes <[email protected]>
[ Upstream commit b33a534610067ade2bdaf2052900aaad99701353 ]
Currently, VLAN devices can be created on top of non-ethernet devices.
Besides the fact that it doesn't make much sense, this also causes a bug which leaks the address of a kernel function to usermode.
When creating a VLAN device, we initialize GARP (garp_init_applicant) and MRP (mrp_init_applicant) for the underlying device.
As part of the initialization process, we add the multicast address of each applicant to the underlying device, by calling dev_mc_add.
__dev_mc_add uses dev->addr_len to determine the length of the new multicast address.
This causes an out-of-bounds read if dev->addr_len is greater than 6, since the multicast addresses provided by GARP and MRP are only 6 bytes long.
This behaviour can be reproduced using the following commands:
ip tunnel add gretest mode ip6gre local ::1 remote ::2 dev lo ip l set up dev gretest
ip link add link gretest name vlantest type vlan id 100
Then, the following command will display the address of garp_pdu_rcv:
ip maddr show | grep 01:80:c2:00:00:21
Fix the bug by enforcing the type of the underlying device during VLAN device initialization.
--- net/8021q/vlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/8021q/vlan.c +2 -1
@@ -131,7 +131,8 @@ int vlan_check_real_dev(struct net_device *real_dev, {const char *name = real_dev->name; -if (real_dev->features &NETIF_F_VLAN_CHALLENGED ) { +if (real_dev->features &NETIF_F_VLAN_CHALLENGED || + real_dev->type !=ARPHRD_ETHER ) {pr_info ("VLANs not supported on %s\n" , name);NL_SET_ERR_MSG_MOD (extack,"VLANs not supported on device" );return -EOPNOTSUPP ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 569/620 x86/sgx: Support loading enclave page without VMA permissions check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit b3fb517dc6020fec85c82171a909da10c6a6f90a ]
sgx_encl_load_page() is used to find and load an enclave page into enclave (EPC) memory, potentially loading it from the backing storage. Both usages of sgx_encl_load_page() are during an access to the enclave page from a VMA and thus the permissions of the VMA are considered before the enclave page is loaded.
SGX2 functions operating on enclave pages belonging to an initialized enclave requiring the page to be in EPC. It is thus required to support loading enclave pages into the EPC independent from a VMA.
Split the current sgx_encl_load_page() to support the two usages:
A new call, sgx_encl_load_page_in_vma(), behaves exactly like the current sgx_encl_load_page() that takes VMA permissions into account, while sgx_encl_load_page() just loads an enclave page into EPC.
VMA, PTE, and EPCM permissions continue to dictate whether the pages can be accessed from within an enclave.
Stable-dep-of: 0d3e0dfd68fb ("x86/sgx: Fix size overflows in sgx_encl_create()")
--- arch/x86/kernel/cpu/sgx/encl.c | 57 ++++++++++++++++++++++------------ arch/x86/kernel/cpu/sgx/encl.h | 2 ++ 2 files changed, 40 insertions(+), 19 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +38 -19
@@ -232,25 +232,10 @@ static struct sgx_epc_page *sgx_encl_eldu(struct sgx_encl_page *encl_page,return epc_page; } -static struct sgx_encl_page *sgx_encl_load_page (struct sgx_encl *encl, -unsigned long addr, -unsigned long vm_flags) +static struct sgx_encl_page *__sgx_encl_load_page (struct sgx_encl *encl, +struct sgx_encl_page *entry) { -unsigned long vm_prot_bits = vm_flags & (VM_READ |VM_WRITE |VM_EXEC );struct sgx_epc_page *epc_page; -struct sgx_encl_page *entry; - - entry =xa_load (&encl->page_array,PFN_DOWN (addr)); -if (!entry) -return ERR_PTR (-EFAULT ); - -/* -* Verify that the faulted page has equal or higher build time -* permissions than the VMA permissions (i.e. the subset of {VM_READ, -* VM_WRITE, VM_EXECUTE} in vma->vm_flags). -*/ -if ((entry->vm_max_prot_bits & vm_prot_bits) != vm_prot_bits) -return ERR_PTR (-EFAULT );/* Entry successfully located. */ if (entry->epc_page) {
@@ -276,6 +261,40 @@ static struct sgx_encl_page *sgx_encl_load_page(struct sgx_encl *encl,return entry; } +static struct sgx_encl_page *sgx_encl_load_page_in_vma (struct sgx_encl *encl, +unsigned long addr, +unsigned long vm_flags) +{ +unsigned long vm_prot_bits = vm_flags & (VM_READ |VM_WRITE |VM_EXEC ); +struct sgx_encl_page *entry; + + entry =xa_load (&encl->page_array,PFN_DOWN (addr)); +if (!entry) +return ERR_PTR (-EFAULT ); + +/* +* Verify that the page has equal or higher build time +* permissions than the VMA permissions (i.e. the subset of {VM_READ, +* VM_WRITE, VM_EXECUTE} in vma->vm_flags). +*/ +if ((entry->vm_max_prot_bits & vm_prot_bits) != vm_prot_bits) +return ERR_PTR (-EFAULT ); + +return __sgx_encl_load_page (encl, entry); +} + +struct sgx_encl_page *sgx_encl_load_page (struct sgx_encl *encl, +unsigned long addr) +{ +struct sgx_encl_page *entry; + + entry =xa_load (&encl->page_array,PFN_DOWN (addr)); +if (!entry) +return ERR_PTR (-EFAULT ); + +return __sgx_encl_load_page (encl, entry); +} +static vm_fault_t sgx_vma_fault (struct vm_fault *vmf) {unsigned long addr = (unsigned long )vmf->address;
@@ -297,7 +316,7 @@ static vm_fault_t sgx_vma_fault(struct vm_fault *vmf)mutex_lock (&encl->lock); - entry =sgx_encl_load_page (encl, addr, vma->vm_flags); + entry =sgx_encl_load_page_in_vma (encl, addr, vma->vm_flags);if (IS_ERR (entry)) {mutex_unlock (&encl->lock);
@@ -445,7 +464,7 @@ static struct sgx_encl_page *sgx_encl_reserve_page(struct sgx_encl *encl,for ( ; ; ) {mutex_lock (&encl->lock); - entry =sgx_encl_load_page (encl, addr, vm_flags); + entry =sgx_encl_load_page_in_vma (encl, addr, vm_flags);if (PTR_ERR (entry) != -EBUSY )break ;
arch/x86/kernel/cpu/sgx/encl.h +2 -0
@@ -119,5 +119,7 @@ unsigned int sgx_alloc_va_slot(struct sgx_va_page *va_page);void sgx_free_va_slot (struct sgx_va_page *va_page,unsigned int offset);bool sgx_va_page_full (struct sgx_va_page *va_page);void sgx_encl_free_epc_page (struct sgx_epc_page *page); +struct sgx_encl_page *sgx_encl_load_page (struct sgx_encl *encl, +unsigned long addr);#endif /* _X86_ENCL_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 570/620 x86/sgx: Move PTE zap code to new sgx_zap_enclave_ptes()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit f89c2f9bf5a64f619de06ded4349dff5a35da860 ]
The SGX reclaimer removes page table entries pointing to pages that are moved to swap.
SGX2 enables changes to pages belonging to an initialized enclave, thus enclave pages may have their permission or type changed while the page is being accessed by an enclave. Supporting SGX2 requires page table entries to be removed so that any cached mappings to changed pages are removed. For example, with the ability to change enclave page types a regular enclave page may be changed to a Thread Control Structure (TCS) page that may not be accessed by an enclave.
Factor out the code removing page table entries to a separate function sgx_zap_enclave_ptes(), fixing accuracy of comments in the process, and make it available to the upcoming SGX2 code.
Place sgx_zap_enclave_ptes() with the rest of the enclave code in encl.c interacting with the page table since this code is no longer unique to the reclaimer.
Stable-dep-of: 0d3e0dfd68fb ("x86/sgx: Fix size overflows in sgx_encl_create()")
--- arch/x86/kernel/cpu/sgx/encl.c | 45 +++++++++++++++++++++++++++++++++- arch/x86/kernel/cpu/sgx/encl.h | 2 +- arch/x86/kernel/cpu/sgx/main.c | 31 ++--------------------- 3 files changed, 47 insertions(+), 31 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +44 -1
@@ -721,7 +721,7 @@ int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm)spin_lock (&encl->mm_lock);list_add_rcu (&encl_mm->list, &encl->mm_list); -/* Pairs with smp_rmb() in sgx_reclaimer_block(). */ +/* Pairs with smp_rmb() in sgx_zap_enclave_ptes(). */ smp_wmb (); encl->mm_list_version++;spin_unlock (&encl->mm_lock);
@@ -936,6 +936,49 @@ int sgx_encl_test_and_clear_young(struct mm_struct *mm,return ret; } +/** +* sgx_zap_enclave_ptes() - remove PTEs mapping the address from enclave +* @encl: the enclave +* @addr: page aligned pointer to single page for which PTEs will be removed +* +* Multiple VMAs may have an enclave page mapped. Remove the PTE mapping +* @addr from each VMA. Ensure that page fault handler is ready to handle +* new mappings of @addr before calling this function. +*/ +void sgx_zap_enclave_ptes (struct sgx_encl *encl,unsigned long addr) +{ +unsigned long mm_list_version; +struct sgx_encl_mm *encl_mm; +struct vm_area_struct *vma; +int idx, ret; + +do { + mm_list_version = encl->mm_list_version; + +/* Pairs with smp_wmb() in sgx_encl_mm_add(). */ +smp_rmb (); + + idx =srcu_read_lock (&encl->srcu); + +list_for_each_entry_rcu (encl_mm, &encl->mm_list, list) { +if (!mmget_not_zero (encl_mm->mm)) +continue ; + +mmap_read_lock (encl_mm->mm); + + ret =sgx_encl_find (encl_mm->mm, addr, &vma); +if (!ret && encl == vma->vm_private_data) +zap_vma_ptes (vma, addr,PAGE_SIZE ); + +mmap_read_unlock (encl_mm->mm); + +mmput_async (encl_mm->mm); + } + +srcu_read_unlock (&encl->srcu, idx); + }while (unlikely (encl->mm_list_version != mm_list_version)); +} +/** * sgx_alloc_va_page() - Allocate a Version Array (VA) page *
arch/x86/kernel/cpu/sgx/encl.h +1 -1
@@ -113,7 +113,7 @@ int sgx_encl_alloc_backing(struct sgx_encl *encl, unsigned long page_index,void sgx_encl_put_backing (struct sgx_backing *backing);int sgx_encl_test_and_clear_young (struct mm_struct *mm,struct sgx_encl_page *page); - +void sgx_zap_enclave_ptes (struct sgx_encl *encl,unsigned long addr);struct sgx_epc_page *sgx_alloc_va_page (void );unsigned int sgx_alloc_va_slot (struct sgx_va_page *va_page);void sgx_free_va_slot (struct sgx_va_page *va_page,unsigned int offset);
arch/x86/kernel/cpu/sgx/main.c +2 -29
@@ -122,36 +122,9 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page)struct sgx_encl_page *page = epc_page->owner;unsigned long addr = page->desc &PAGE_MASK ;struct sgx_encl *encl = page->encl; -unsigned long mm_list_version; -struct sgx_encl_mm *encl_mm; -struct vm_area_struct *vma; -int idx, ret; - -do { - mm_list_version = encl->mm_list_version; - -/* Pairs with smp_rmb() in sgx_encl_mm_add(). */ -smp_rmb (); - - idx =srcu_read_lock (&encl->srcu); - -list_for_each_entry_rcu (encl_mm, &encl->mm_list, list) { -if (!mmget_not_zero (encl_mm->mm)) -continue ; - -mmap_read_lock (encl_mm->mm); - - ret =sgx_encl_find (encl_mm->mm, addr, &vma); -if (!ret && encl == vma->vm_private_data) -zap_vma_ptes (vma, addr,PAGE_SIZE ); - -mmap_read_unlock (encl_mm->mm); - -mmput_async (encl_mm->mm); - } +int ret; -srcu_read_unlock (&encl->srcu, idx); - }while (unlikely (encl->mm_list_version != mm_list_version)); +sgx_zap_enclave_ptes (encl, addr);mutex_lock (&encl->lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 571/620 x86/sgx: Export sgx_encl_{grow,shrink}()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit 3a5351415228d06c988a1e610e71d3889f707ac9 ]
In order to use sgx_encl_{grow,shrink}() in the page augmentation code located in encl.c, export these functions.
Stable-dep-of: 0d3e0dfd68fb ("x86/sgx: Fix size overflows in sgx_encl_create()")
--- arch/x86/kernel/cpu/sgx/encl.h | 2 ++ arch/x86/kernel/cpu/sgx/ioctl.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.h +2 -0
@@ -121,5 +121,7 @@ bool sgx_va_page_full(struct sgx_va_page *va_page);void sgx_encl_free_epc_page (struct sgx_epc_page *page);struct sgx_encl_page *sgx_encl_load_page (struct sgx_encl *encl,unsigned long addr); +struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl); +void sgx_encl_shrink (struct sgx_encl *encl,struct sgx_va_page *va_page);#endif /* _X86_ENCL_H */
arch/x86/kernel/cpu/sgx/ioctl.c +2 -2
@@ -17,7 +17,7 @@#include "encl.h" #include "encls.h" -static struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl) +struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl) {struct sgx_va_page *va_page =NULL ;void *err;
@@ -43,7 +43,7 @@ static struct sgx_va_page *sgx_encl_grow(struct sgx_encl *encl)return va_page; } -static void sgx_encl_shrink (struct sgx_encl *encl,struct sgx_va_page *va_page) +void sgx_encl_shrink (struct sgx_encl *encl,struct sgx_va_page *va_page) { encl->page_cnt--;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 572/620 x86/sgx: Support VA page allocation without reclaiming
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit a76e7f1f18884a94998ca82862c0a4e6d0fd2933 ]
struct sgx_encl should be protected with the mutex sgx_encl->lock. One exception is sgx_encl->page_cnt that is incremented (in sgx_encl_grow()) when an enclave page is added to the enclave. The reason the mutex is not held is to allow the reclaimer to be called directly if there are no EPC pages (in support of a new VA page) available at the time.
Incrementing sgx_encl->page_cnt without sgc_encl->lock held is currently (before SGX2) safe from concurrent updates because all paths in which sgx_encl_grow() is called occur before enclave initialization and are protected with an atomic operation on SGX_ENCL_IOCTL.
SGX2 includes support for dynamically adding pages after enclave initialization where the protection of SGX_ENCL_IOCTL is not available.
Make direct reclaim of EPC pages optional when new VA pages are added to the enclave. Essentially the existing "reclaim" flag used when regular EPC pages are added to an enclave becomes available to the caller when used to allocate VA pages instead of always being "true".
When adding pages without invoking the reclaimer it is possible to do so with sgx_encl->lock held, gaining its protection against concurrent updates to sgx_encl->page_cnt after enclave initialization.
No functional change.
Stable-dep-of: 0d3e0dfd68fb ("x86/sgx: Fix size overflows in sgx_encl_create()")
--- arch/x86/kernel/cpu/sgx/encl.c | 6 ++++-- arch/x86/kernel/cpu/sgx/encl.h | 4 ++-- arch/x86/kernel/cpu/sgx/ioctl.c | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +4 -2
@@ -981,6 +981,8 @@ void sgx_zap_enclave_ptes(struct sgx_encl *encl, unsigned long addr)/** * sgx_alloc_va_page() - Allocate a Version Array (VA) page +* @reclaim: Reclaim EPC pages directly if none available. Enclave +* mutex should not be held if this is set. * * Allocate a free EPC page and convert it to a Version Array (VA) page. *
@@ -988,12 +990,12 @@ void sgx_zap_enclave_ptes(struct sgx_encl *encl, unsigned long addr)* a VA page, * -errno otherwise */ -struct sgx_epc_page *sgx_alloc_va_page (void ) +struct sgx_epc_page *sgx_alloc_va_page (bool reclaim) {struct sgx_epc_page *epc_page;int ret; - epc_page =sgx_alloc_epc_page (NULL , true); + epc_page =sgx_alloc_epc_page (NULL , reclaim);if (IS_ERR (epc_page))return ERR_CAST (epc_page);
arch/x86/kernel/cpu/sgx/encl.h +2 -2
@@ -114,14 +114,14 @@ void sgx_encl_put_backing(struct sgx_backing *backing);int sgx_encl_test_and_clear_young (struct mm_struct *mm,struct sgx_encl_page *page);void sgx_zap_enclave_ptes (struct sgx_encl *encl,unsigned long addr); -struct sgx_epc_page *sgx_alloc_va_page (void ); +struct sgx_epc_page *sgx_alloc_va_page (bool reclaim);unsigned int sgx_alloc_va_slot (struct sgx_va_page *va_page);void sgx_free_va_slot (struct sgx_va_page *va_page,unsigned int offset);bool sgx_va_page_full (struct sgx_va_page *va_page);void sgx_encl_free_epc_page (struct sgx_epc_page *page);struct sgx_encl_page *sgx_encl_load_page (struct sgx_encl *encl,unsigned long addr); -struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl); +struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl,bool reclaim);void sgx_encl_shrink (struct sgx_encl *encl,struct sgx_va_page *va_page);#endif /* _X86_ENCL_H */
arch/x86/kernel/cpu/sgx/ioctl.c +4 -4
@@ -17,7 +17,7 @@#include "encl.h" #include "encls.h" -struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl) +struct sgx_va_page *sgx_encl_grow (struct sgx_encl *encl,bool reclaim) {struct sgx_va_page *va_page =NULL ;void *err;
@@ -30,7 +30,7 @@ struct sgx_va_page *sgx_encl_grow(struct sgx_encl *encl)if (!va_page)return ERR_PTR (-ENOMEM ); - va_page->epc_page =sgx_alloc_va_page (); + va_page->epc_page =sgx_alloc_va_page (reclaim);if (IS_ERR (va_page->epc_page)) { err =ERR_CAST (va_page->epc_page);kfree (va_page);
@@ -64,7 +64,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)struct file *backing;long ret; - va_page =sgx_encl_grow (encl); + va_page =sgx_encl_grow (encl, true);if (IS_ERR (va_page))return PTR_ERR (va_page);else if (va_page)
@@ -306,7 +306,7 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long src,return PTR_ERR (epc_page); } - va_page =sgx_encl_grow (encl); + va_page =sgx_encl_grow (encl, true);if (IS_ERR (va_page)) { ret =PTR_ERR (va_page); goto err_out_free;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 573/620 x86/sgx: Fix size overflows in sgx_encl_create()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jarkko Sakkinen <[email protected]>
[ Upstream commit 0d3e0dfd68fb9e6b0ec865be9f3377cc3ff55733 ]
The total size calculated for EPC can overflow u64 given the added up page for SECS. Further, the total size calculated for shmem can overflow even when the EPC size stays within limits of u64, given that it adds the extra space for 128 byte PCMD structures (one for each page).
Address this by pre-evaluating the micro-architectural requirement of
SGX: the address space size must be power of two. This is eventually checked up by ECREATE but the pre-check has the additional benefit of making sure that there is some space for additional data.
--- arch/x86/kernel/cpu/sgx/ioctl.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/cpu/sgx/ioctl.c +7 -0
@@ -64,6 +64,13 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)struct file *backing;long ret; +/* +* ECREATE would detect this too, but checking here also ensures +* that the 'encl_size' calculations below can never overflow. +*/ +if (!is_power_of_2 (secs->size)) +return -EINVAL ; + va_page =sgx_encl_grow (encl, true);if (IS_ERR (va_page))return PTR_ERR (va_page);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 574/620 exfat: fix soft lockup in exfat_clear_bitmap
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 9da33619e0ca53627641bc97d1b93ec741299111 ]
bitmap clear loop will take long time in __exfat_free_cluster() if data size of file/dir enty is invalid.
If cluster bit in bitmap is already clear, stop clearing bitmap go to out of loop.
--- fs/exfat/balloc.c | 10 ++++++++-- fs/exfat/exfat_fs.h | 2 +- fs/exfat/fatent.c | 11 +++++++---- 3 files changed, 16 insertions(+), 7 deletions(-)
fs/exfat/balloc.c +8 -2
@@ -160,7 +160,7 @@ int exfat_set_bitmap(struct inode *inode, unsigned int clu, bool sync)return 0 ; } -void exfat_clear_bitmap (struct inode *inode,unsigned int clu,bool sync) +int exfat_clear_bitmap (struct inode *inode,unsigned int clu,bool sync) {int i, b;unsigned int ent_idx;
@@ -169,13 +169,17 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu, bool sync)struct exfat_mount_options *opts = &sbi->options;if (!is_valid_cluster (sbi, clu)) -return ; +return -EIO ; ent_idx =CLUSTER_TO_BITMAP_ENT (clu); i =BITMAP_OFFSET_SECTOR_INDEX (sb, ent_idx); b =BITMAP_OFFSET_BIT_IN_SECTOR (sb, ent_idx); +if (!test_bit_le (b, sbi->vol_amap[i]->b_data)) +return -EIO ; +clear_bit_le (b, sbi->vol_amap[i]->b_data); +exfat_update_bh (sbi->vol_amap[i], sync);if (opts->discard) {
@@ -190,6 +194,8 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu, bool sync) opts->discard =0 ; } } + +return 0 ; }/*
fs/exfat/exfat_fs.h +1 -1
@@ -420,7 +420,7 @@ int exfat_count_num_clusters(struct super_block *sb,int exfat_load_bitmap (struct super_block *sb);void exfat_free_bitmap (struct exfat_sb_info *sbi);int exfat_set_bitmap (struct inode *inode,unsigned int clu,bool sync); -void exfat_clear_bitmap (struct inode *inode,unsigned int clu,bool sync); +int exfat_clear_bitmap (struct inode *inode,unsigned int clu,bool sync);unsigned int exfat_find_free_bitmap (struct super_block *sb,unsigned int clu);int exfat_count_used_clusters (struct super_block *sb,unsigned int *ret_count);int exfat_trim_fs (struct inode *inode,struct fstrim_range *range);
fs/exfat/fatent.c +7 -4
@@ -174,6 +174,7 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chainBITMAP_OFFSET_SECTOR_INDEX (sb,CLUSTER_TO_BITMAP_ENT (clu));if (p_chain->flags ==ALLOC_NO_FAT_CHAIN ) { +int err;unsigned int last_cluster = p_chain->dir + p_chain->size -1 ; do { bool sync = false;
@@ -188,7 +189,9 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain cur_cmap_i = next_cmap_i; } -exfat_clear_bitmap (inode, clu, (sync &&IS_DIRSYNC (inode))); + err =exfat_clear_bitmap (inode, clu, (sync &&IS_DIRSYNC (inode))); +if (err) +break ; clu++; num_clusters++; }while (num_clusters < p_chain->size);
@@ -209,12 +212,13 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain cur_cmap_i = next_cmap_i; } -exfat_clear_bitmap (inode, clu, (sync &&IS_DIRSYNC (inode))); +if (exfat_clear_bitmap (inode, clu, (sync &&IS_DIRSYNC (inode)))) +break ; clu = n_clu; num_clusters++;if (err) - goto dec_used_clus; +break ;if (num_clusters >= sbi->num_clusters -EXFAT_FIRST_CLUSTER ) {/*
@@ -228,7 +232,6 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain }while (clu !=EXFAT_EOF_CLUSTER ); } -dec_used_clus: sbi->used_clusters -= num_clusters;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 575/620 net-timestamp: support TCP GSO case for a few missing flags
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit 3c9231ea6497dfc50ac0ef69fff484da27d0df66 ]
When I read through the TSO codes, I found out that we probably miss initializing the tx_flags of last seg when TSO is turned off, which means at the following points no more timestamp (for this last one) will be generated. There are three flags to be handled in this patch:
1. SKBTX_HW_TSTAMP
2. SKBTX_BPF
3. SKBTX_SCHED_TSTAMP
Note that SKBTX_BPF[1] was added in 6.14.0-rc2 by commit 6b98ec7e882af ("bpf: Add BPF_SOCK_OPS_TSTAMP_SCHED_CB callback") and only belongs to net-next branch material for now. The common issue of the above three flags can be fixed by this single patch.
This patch initializes the tx_flags to SKBTX_ANY_TSTAMP like what the UDP GSO does to make the newly segmented last skb inherit the tx_flags so that requested timestamp will be generated in each certain layer, or else that last one has zero value of tx_flags which leads to no timestamp at all.
--- net/ipv4/tcp_offload.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/ipv4/tcp_offload.c +7 -4
@@ -11,12 +11,15 @@#include <net/tcp.h> #include <net/protocol.h> -static void tcp_gso_tstamp (struct sk_buff *skb,unsigned int ts_seq, +static void tcp_gso_tstamp (struct sk_buff *skb,struct sk_buff *gso_skb,unsigned int seq,unsigned int mss) { +u32 flags =skb_shinfo (gso_skb)->tx_flags &SKBTX_ANY_TSTAMP ; +u32 ts_seq =skb_shinfo (gso_skb)->tskey; +while (skb) {if (before (ts_seq, seq + mss)) { -skb_shinfo (skb)->tx_flags |=SKBTX_SW_TSTAMP ; +skb_shinfo (skb)->tx_flags |= flags;skb_shinfo (skb)->tskey = ts_seq;return ; }
@@ -118,8 +121,8 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, th =tcp_hdr (skb); seq =ntohl (th->seq); -if (unlikely (skb_shinfo (gso_skb)->tx_flags &SKBTX_SW_TSTAMP )) -tcp_gso_tstamp (segs,skb_shinfo (gso_skb)->tskey, seq, mss); +if (unlikely (skb_shinfo (gso_skb)->tx_flags &SKBTX_ANY_TSTAMP )) +tcp_gso_tstamp (segs, gso_skb, seq, mss); newcheck = ~csum_fold ((__force __wsum)((__force u32 )th->check + (__force u32 )delta));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 576/620 sched/fair: Fix potential memory corruption in child_cfs_rq_on_list
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zecheng Li <[email protected]>
[ Upstream commit 3b4035ddbfc8e4521f85569998a7569668cccf51 ]
child_cfs_rq_on_list attempts to convert a 'prev' pointer to a cfs_rq. This 'prev' pointer can originate from struct rq's leaf_cfs_rq_list, making the conversion invalid and potentially leading to memory corruption. Depending on the relative positions of leaf_cfs_rq_list and the task group (tg) pointer within the struct, this can cause a memory fault or access garbage data.
The issue arises in list_add_leaf_cfs_rq, where both cfs_rq->leaf_cfs_rq_list and rq->leaf_cfs_rq_list are added to the same leaf list. Also, rq->tmp_alone_branch can be set to rq->leaf_cfs_rq_list.
This adds a check if (prev == &rq->leaf_cfs_rq_list) after the main conditional in child_cfs_rq_on_list. This ensures that the container_of operation will convert a correct cfs_rq struct.
This check is sufficient because only cfs_rqs on the same CPU are added to the list, so verifying the 'prev' pointer against the current rq's list head is enough.
Fixes a potential memory corruption issue that due to current struct layout might not be manifesting as a crash but could lead to unpredictable behavior when the layout changes.
--- kernel/sched/fair.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/sched/fair.c +4 -2
@@ -3303,15 +3303,17 @@ static inline bool child_cfs_rq_on_list(struct cfs_rq *cfs_rq) {struct cfs_rq *prev_cfs_rq;struct list_head *prev; +struct rq *rq =rq_of (cfs_rq);if (cfs_rq->on_list) { prev = cfs_rq->leaf_cfs_rq_list.prev; }else { -struct rq *rq =rq_of (cfs_rq); - prev = rq->tmp_alone_branch; } +if (prev == &rq->leaf_cfs_rq_list) +return false; + prev_cfs_rq = container_of(prev, struct cfs_rq, leaf_cfs_rq_list);return (prev_cfs_rq->tg->parent == cfs_rq->tg);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 577/620 net: ipv6: fix dst ref loop in ila lwtunnel
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit 0e7633d7b95b67f1758aea19f8e85621c5f506a3 ]
This patch follows commit 92191dd10730 ("net: ipv6: fix dst ref loops in rpl, seg6 and ioam6 lwtunnels") and, on a second thought, the same patch is also needed for ila (even though the config that triggered the issue was pathological, but still, we don't want that to happen).
--- net/ipv6/ila/ila_lwt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ila/ila_lwt.c +2 -1
@@ -88,7 +88,8 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) goto drop; } -if (ilwt->connected) { +/* cache only if we don't create a dst reference loop */ +if (ilwt->connected && orig_dst->lwtstate != dst->lwtstate) {local_bh_disable ();dst_cache_set_ip6 (&ilwt->dst_cache, dst, &fl6.saddr);local_bh_enable ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 578/620 net: ipv6: fix missing dst ref drop in ila lwtunnel
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit 5da15a9c11c1c47ef573e6805b60a7d8a1687a2a ]
Add missing skb_dst_drop() to drop reference to the old dst before adding the new dst to the skb.
--- net/ipv6/ila/ila_lwt.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/ila/ila_lwt.c +1 -0
@@ -96,6 +96,7 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) } } +skb_dst_drop (skb);skb_dst_set (skb, dst);return dst_output (net, sk, skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 579/620 gpio: rcar: Fix missing of_node_put() call
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabrizio Castro <[email protected]>
[ Upstream commit 391b41f983bf7ff853de44704d8e14e7cc648a9b ]
of_parse_phandle_with_fixed_args() requires its caller to call into of_node_put() on the node pointer from the output structure, but such a call is currently missing.
Call into of_node_put() to rectify that.
--- drivers/gpio/gpio-rcar.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpio/gpio-rcar.c +6 -1
@@ -452,7 +452,12 @@ static int gpio_rcar_parse_dt(struct gpio_rcar_priv *p, unsigned int *npins) p->info = *info; ret =of_parse_phandle_with_fixed_args (np,"gpio-ranges" ,3 ,0 , &args); - *npins = ret ==0 ? args.args[2 ] :RCAR_MAX_GPIO_PER_BANK ; +if (ret) { + *npins =RCAR_MAX_GPIO_PER_BANK ; + }else { + *npins = args.args[2 ]; +of_node_put (args.np); + }if (*npins ==0 || *npins >RCAR_MAX_GPIO_PER_BANK ) { dev_warn(p->dev, "Invalid number of gpio lines %u, using %u\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 580/620 Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Heusel <[email protected]>
commit 2397d61ee45cddb8f3bd3a3a9840ef0f0b5aa843 upstream.
This reverts commit 235b630eda072d7e7b102ab346d6b8a2c028a772.
This commit was found responsible for issues with SD card recognition, as users had to re-insert their cards in the readers and wait for a while. As for some people the SD card was involved in the boot process it also caused boot failures.
--- drivers/misc/cardreader/rtsx_usb.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/misc/cardreader/rtsx_usb.c +0 -15
@@ -286,7 +286,6 @@ static int rtsx_usb_get_status_with_bulkint rtsx_usb_get_card_status (struct rtsx_ucr *ucr,u16 *status) {int ret; -u8 interrupt_val =0 ;u16 *buf;if (!status)
@@ -309,20 +308,6 @@ int rtsx_usb_get_card_status(struct rtsx ret =rtsx_usb_get_status_with_bulk (ucr, status); } -rtsx_usb_read_register (ucr,CARD_INT_PEND , &interrupt_val); -/* Cross check presence with interrupts */ -if (*status &XD_CD ) -if (!(interrupt_val &XD_INT )) - *status &= ~XD_CD ; - -if (*status &SD_CD ) -if (!(interrupt_val &SD_INT )) - *status &= ~SD_CD ; - -if (*status &MS_CD ) -if (!(interrupt_val &MS_INT )) - *status &= ~MS_CD ; -/* usb_control_msg may return positive when success */ if (ret <0 )return ret;
Greg Kroah-Hartman
maintainerPATCH 581/620 usb: renesas_usbhs: Call clk_put()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
commit b5ea08aa883da05106fcc683d12489a4292d1122 upstream.
Clocks acquired with of_clk_get() need to be freed with clk_put(). Call clk_put() on priv->clks[0] on error path.
--- drivers/usb/renesas_usbhs/common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/renesas_usbhs/common.c +3 -1
@@ -312,8 +312,10 @@ static int usbhsc_clk_get(struct device priv->clks[1 ] =of_clk_get (dev_of_node (dev),1 );if (PTR_ERR (priv->clks[1 ]) == -ENOENT ) priv->clks[1 ] =NULL ; -else if (IS_ERR (priv->clks[1 ])) +else if (IS_ERR (priv->clks[1 ])) { +clk_put (priv->clks[0 ]);return PTR_ERR (priv->clks[1 ]); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 582/620 usb: renesas_usbhs: Use devm_usb_get_phy()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
commit e0c92440938930e7fa7aa6362780d39cdea34449 upstream.
The gpriv->transceiver is retrieved in probe() through usb_get_phy() but never released. Use devm_usb_get_phy() to handle this scenario.
This issue was identified through code investigation. No issue was found without this change.
--- drivers/usb/renesas_usbhs/mod_gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/renesas_usbhs/mod_gadget.c +1 -1
@@ -1094,7 +1094,7 @@ int usbhs_mod_gadget_probe(struct usbhs_ goto usbhs_mod_gadget_probe_err_gpriv; } - gpriv->transceiver =usb_get_phy (USB_PHY_TYPE_UNDEFINED ); + gpriv->transceiver =devm_usb_get_phy (dev,USB_PHY_TYPE_UNDEFINED );dev_info (dev,"%stransceiver found\n" , !IS_ERR (gpriv->transceiver) ?"" :"no " );
Greg Kroah-Hartman
maintainerPATCH 583/620 usb: hub: lack of clearing xHC resources
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Laszczak <[email protected]>
commit 2b66ef84d0d2a0ea955b40bd306f5e3abbc5cf9c upstream.
The xHC resources allocated for USB devices are not released in correct order after resuming in case when while suspend device was reconnected.
This issue has been detected during the fallowing scenario:
- connect hub HS to root port
- connect LS/FS device to hub port
- wait for enumeration to finish
- force host to suspend
- reconnect hub attached to root port
- wake host
For this scenario during enumeration of USB LS/FS device the Cadence xHC reports completion error code for xHC commands because the xHC resources used for devices has not been properly released.
XHCI specification doesn't mention that device can be reset in any order so, we should not treat this issue as Cadence xHC controller bug. Similar as during disconnecting in this case the device resources should be cleared starting form the last usb device in tree toward the root hub. To fix this issue usbcore driver should call hcd->driver->reset_device for all USB devices connected to hub which was reconnected while suspending.
--- drivers/usb/core/hub.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/usb/core/hub.c +33 -0
@@ -5971,6 +5971,36 @@ void usb_hub_cleanup(void) }/* usb_hub_cleanup() */ /** +* hub_hc_release_resources - clear resources used by host controller +* @udev: pointer to device being released +* +* Context: task context, might sleep +* +* Function releases the host controller resources in correct order before +* making any operation on resuming usb device. The host controller resources +* allocated for devices in tree should be released starting from the last +* usb device in tree toward the root hub. This function is used only during +* resuming device when usb device require reinitialization – that is, when +* flag udev->reset_resume is set. +* +* This call is synchronous, and may not be used in an interrupt context. +*/ +static void hub_hc_release_resources (struct usb_device *udev) +{ +struct usb_hub *hub =usb_hub_to_struct_hub (udev); +struct usb_hcd *hcd =bus_to_hcd (udev->bus); +int i; + +/* Release up resources for all children before this device */ +for (i =0 ; i < udev->maxchild; i++) +if (hub->ports[i]->child) +hub_hc_release_resources (hub->ports[i]->child); + +if (hcd->driver->reset_device) + hcd->driver->reset_device (hcd, udev); +} + +/** * usb_reset_and_verify_device - perform a USB port reset to reinitialize a device * @udev: device to reset (not in SUSPENDED or NOTATTACHED state) *
@@ -6044,6 +6074,9 @@ static int usb_reset_and_verify_device(s bos = udev->bos; udev->bos =NULL ; +if (udev->reset_resume) +hub_hc_release_resources (udev); +mutex_lock (hcd->address0_mutex);for (i =0 ; i <PORT_INIT_TRIES ; ++i) {
Greg Kroah-Hartman
maintainerPATCH 584/620 usb: quirks: Add DELAY_INIT and NO_LPM for Prolific Mass Storage Card Reader
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit ff712188daa3fe3ce7e11e530b4dca3826dae14a upstream.
When used on Huawei hisi platforms, Prolific Mass Storage Card Reader which the VID:PID is in 067b:2731 might fail to enumerate at boot time and doesn't work well with LPM enabled, combination quirks:
USB_QUIRK_DELAY_INIT + USB_QUIRK_NO_LPM
fixed the problems.
--- drivers/usb/core/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/core/quirks.c +4 -0
@@ -338,6 +338,10 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0638, 0x0a13), .driver_info = USB_QUIRK_STRING_FETCH_255 }, + /* Prolific Single-LUN Mass Storage Card Reader */ + { USB_DEVICE(0x067b, 0x2731), .driver_info = USB_QUIRK_DELAY_INIT | + USB_QUIRK_NO_LPM }, + /* Saitek Cyborg Gold Joystick */ { USB_DEVICE(0x06a3, 0x0006), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS },
Greg Kroah-Hartman
maintainerPATCH 585/620 usb: renesas_usbhs: Flush the notify_hotplug_work
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
commit 552ca6b87e3778f3dd5b87842f95138162e16c82 upstream.
When performing continuous unbind/bind operations on the USB drivers available on the Renesas RZ/G2L SoC, a kernel crash with the message "Unable to handle kernel NULL pointer dereference at virtual address" may occur. This issue points to the usbhsc_notify_hotplug() function.
Flush the delayed work to avoid its execution when driver resources are unavailable.
--- drivers/usb/renesas_usbhs/common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/renesas_usbhs/common.c +2 -0
@@ -774,6 +774,8 @@ static int usbhs_remove(struct platform_dev_dbg (&pdev->dev,"usb remove\n" ); +flush_delayed_work (&priv->notify_hotplug_work); +/* power off */ if (!usbhs_get_dparam (priv, runtime_pwctrl))usbhsc_power_ctrl (priv,0 );
Greg Kroah-Hartman
maintainerPATCH 586/620 usb: atm: cxacru: fix a flaw in existing endpoint checks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
commit c90aad369899a607cfbc002bebeafd51e31900cd upstream.
Syzbot once again identified a flaw in usb endpoint checking, see [1]. This time the issue stems from a commit authored by me (2eabb655a968 ("usb: atm: cxacru: fix endpoint checking in cxacru_bind()")).
While using usb_find_common_endpoints() may usually be enough to discard devices with wrong endpoints, in this case one needs more than just finding and identifying the sufficient number of endpoints of correct types - one needs to check the endpoint's address as well.
Since cxacru_bind() fills URBs with CXACRU_EP_CMD address in mind, switch the endpoint verification approach to usb_check_XXX_endpoints() instead to fix incomplete ep testing.
[1] Syzbot report:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 0 PID: 1378 at drivers/usb/core/urb.c:504 usb_submit_urb+0xc4e/0x18c0 drivers/usb/core/urb.c:503 ... RIP: 0010:usb_submit_urb+0xc4e/0x18c0 drivers/usb/core/urb.c:503 ... Call Trace: <TASK> cxacru_cm+0x3c8/0xe50 drivers/usb/atm/cxacru.c:649 cxacru_card_status drivers/usb/atm/cxacru.c:760 [inline] cxacru_bind+0xcf9/0x1150 drivers/usb/atm/cxacru.c:1223 usbatm_usb_probe+0x314/0x1d30 drivers/usb/atm/usbatm.c:1058 cxacru_usb_probe+0x184/0x220 drivers/usb/atm/cxacru.c:1377 usb_probe_interface+0x641/0xbb0 drivers/usb/core/driver.c:396 really_probe+0x2b9/0xad0 drivers/base/dd.c:658 __driver_probe_device+0x1a2/0x390 drivers/base/dd.c:800 driver_probe_device+0x50/0x430 drivers/base/dd.c:830
...
--- drivers/usb/atm/cxacru.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/usb/atm/cxacru.c +7 -6
@@ -1131,7 +1131,10 @@ static int cxacru_bind(struct usbatm_datstruct cxacru_data *instance;struct usb_device *usb_dev =interface_to_usbdev (intf);struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD ]; -struct usb_endpoint_descriptor *in, *out; +static const u8 ep_addrs[] = { +CXACRU_EP_CMD +USB_DIR_IN , +CXACRU_EP_CMD +USB_DIR_OUT , +0 };int ret;/* instance init */
@@ -1179,13 +1182,11 @@ static int cxacru_bind(struct usbatm_dat }if (usb_endpoint_xfer_int (&cmd_ep->desc)) - ret =usb_find_common_endpoints (intf->cur_altsetting, -NULL ,NULL , &in, &out); + ret =usb_check_int_endpoints (intf, ep_addrs);else - ret =usb_find_common_endpoints (intf->cur_altsetting, - &in, &out,NULL ,NULL ); + ret =usb_check_bulk_endpoints (intf, ep_addrs); -if (ret) { +if (!ret) {usb_err (usbatm_instance,"cxacru_bind: interface has incorrect endpoints\n" ); ret = -ENODEV ; goto fail;
Greg Kroah-Hartman
maintainerPATCH 587/620 usb: dwc3: Set SUSPENDENABLE soon after phy init
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit cc5bfc4e16fc1d1c520cd7bb28646e82b6e69217 upstream.
After phy initialization, some phy operations can only be executed while in lower P states. Ensure GUSB3PIPECTL.SUSPENDENABLE and GUSB2PHYCFG.SUSPHY are set soon after initialization to avoid blocking phy ops.
Previously the SUSPENDENABLE bits are only set after the controller initialization, which may not happen right away if there's no gadget driver or xhci driver bound. Revise this to clear SUSPENDENABLE bits only when there's mode switching (change in GCTL.PRTCAPDIR).
--- drivers/usb/dwc3/core.c | 69 +++++++++++++++++++++++++++++------------------- drivers/usb/dwc3/core.h | 2 - drivers/usb/dwc3/drd.c | 4 +- 3 files changed, 45 insertions(+), 30 deletions(-)
drivers/usb/dwc3/core.c +42 -27
@@ -123,11 +123,24 @@ void dwc3_enable_susphy(struct dwc3 *dwcdwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); } -void dwc3_set_prtcap (struct dwc3 *dwc,u32 mode) +void dwc3_set_prtcap (struct dwc3 *dwc,u32 mode,bool ignore_susphy) { +unsigned int hw_mode;u32 reg; reg =dwc3_readl (dwc->regs,DWC3_GCTL ); + +/* +* For DRD controllers, GUSB3PIPECTL.SUSPENDENABLE and +* GUSB2PHYCFG.SUSPHY should be cleared during mode switching, +* and they can be set after core initialization. +*/ + hw_mode =DWC3_GHWPARAMS0_MODE (dwc->hwparams.hwparams0); +if (hw_mode ==DWC3_GHWPARAMS0_MODE_DRD && !ignore_susphy) { +if (DWC3_GCTL_PRTCAP (reg) != mode) +dwc3_enable_susphy (dwc, false); + } + reg &= ~(DWC3_GCTL_PRTCAPDIR (DWC3_GCTL_PRTCAP_OTG )); reg |=DWC3_GCTL_PRTCAPDIR (mode);dwc3_writel (dwc->regs,DWC3_GCTL , reg);
@@ -207,7 +220,7 @@ static void __dwc3_set_mode(struct work_spin_lock_irqsave (&dwc->lock, flags); -dwc3_set_prtcap (dwc, desired_dr_role); +dwc3_set_prtcap (dwc, desired_dr_role, false);spin_unlock_irqrestore (&dwc->lock, flags);
@@ -651,16 +664,7 @@ static int dwc3_phy_setup(struct dwc3 *d*/ reg &= ~DWC3_GUSB3PIPECTL_UX_EXIT_PX ; -/* -* Above DWC_usb3.0 1.94a, it is recommended to set -* DWC3_GUSB3PIPECTL_SUSPHY to '0' during coreConsultant configuration. -* So default value will be '0' when the core is reset. Application -* needs to set it to '1' after the core initialization is completed. -* -* Similarly for DRD controllers, GUSB3PIPECTL.SUSPENDENABLE must be -* cleared after power-on reset, and it can be set after core -* initialization. -*/ +/* Ensure the GUSB3PIPECTL.SUSPENDENABLE is cleared prior to phy init. */ reg &= ~DWC3_GUSB3PIPECTL_SUSPHY ;if (dwc->u2ss_inp3_quirk)
@@ -733,15 +737,7 @@ static int dwc3_phy_setup(struct dwc3 *dbreak ; } -/* -* Above DWC_usb3.0 1.94a, it is recommended to set -* DWC3_GUSB2PHYCFG_SUSPHY to '0' during coreConsultant configuration. -* So default value will be '0' when the core is reset. Application -* needs to set it to '1' after the core initialization is completed. -* -* Similarly for DRD controllers, GUSB2PHYCFG.SUSPHY must be cleared -* after power-on reset, and it can be set after core initialization. -*/ +/* Ensure the GUSB2PHYCFG.SUSPHY is cleared prior to phy init. */ reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ;if (dwc->dis_enblslpm_quirk)
@@ -1158,6 +1154,25 @@ static int dwc3_core_init(struct dwc3 *d } } +/* +* Above DWC_usb3.0 1.94a, it is recommended to set +* DWC3_GUSB3PIPECTL_SUSPHY and DWC3_GUSB2PHYCFG_SUSPHY to '0' during +* coreConsultant configuration. So default value will be '0' when the +* core is reset. Application needs to set it to '1' after the core +* initialization is completed. +* +* Certain phy requires to be in P0 power state during initialization. +* Make sure GUSB3PIPECTL.SUSPENDENABLE and GUSB2PHYCFG.SUSPHY are clear +* prior to phy init to maintain in the P0 state. +* +* After phy initialization, some phy operations can only be executed +* while in lower P states. Ensure GUSB3PIPECTL.SUSPENDENABLE and +* GUSB2PHYCFG.SUSPHY are set soon after initialization to avoid +* blocking phy ops. +*/ + if (!DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) +dwc3_enable_susphy (dwc, true); +return 0 ; err4:
@@ -1245,7 +1260,7 @@ static int dwc3_core_init_mode(struct dwswitch (dwc->dr_mode) {case USB_DR_MODE_PERIPHERAL : -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE , false);if (dwc->usb2_phy)otg_set_vbus (dwc->usb2_phy->otg, false);
@@ -1257,7 +1272,7 @@ static int dwc3_core_init_mode(struct dwreturn dev_err_probe (dev, ret,"failed to initialize gadget\n" );break ;case USB_DR_MODE_HOST : -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST , false);if (dwc->usb2_phy)otg_set_vbus (dwc->usb2_phy->otg, true);
@@ -1300,7 +1315,7 @@ static void dwc3_core_exit_mode(struct d }/* de-assert DRVVBUS for HOST and OTG mode */ -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE , true); }static void dwc3_get_properties (struct dwc3 *dwc)
@@ -1882,7 +1897,7 @@ static int dwc3_resume_common(struct dwcif (ret)return ret; -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_DEVICE , true);dwc3_gadget_resume (dwc);break ;case DWC3_GCTL_PRTCAP_HOST :
@@ -1890,7 +1905,7 @@ static int dwc3_resume_common(struct dwc ret =dwc3_core_init_for_resume (dwc);if (ret)return ret; -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST , true);break ; }/* Restore GUSB2PHYCFG bits that were modified in suspend */
@@ -1915,7 +1930,7 @@ static int dwc3_resume_common(struct dwcif (ret)return ret; -dwc3_set_prtcap (dwc, dwc->current_dr_role); +dwc3_set_prtcap (dwc, dwc->current_dr_role, true);dwc3_otg_init (dwc);if (dwc->current_otg_role ==DWC3_OTG_ROLE_HOST ) {
drivers/usb/dwc3/core.h +1 -1
@@ -1475,7 +1475,7 @@ struct dwc3_gadget_ep_cmd_params {#define DWC3_HAS_OTG BIT(3)/* prototypes */ -void dwc3_set_prtcap (struct dwc3 *dwc,u32 mode); +void dwc3_set_prtcap (struct dwc3 *dwc,u32 mode,bool ignore_susphy);void dwc3_set_mode (struct dwc3 *dwc,u32 mode);u32 dwc3_core_fifo_space (struct dwc3_ep *dep,u8 type);
drivers/usb/dwc3/drd.c +2 -2
@@ -173,7 +173,7 @@ void dwc3_otg_init(struct dwc3 *dwc)* block "Initialize GCTL for OTG operation". */ /* GCTL.PrtCapDir=2'b11 */ -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_OTG ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_OTG , true);/* GUSB2PHYCFG0.SusPHY=0 */ reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ;
@@ -585,7 +585,7 @@ int dwc3_drd_init(struct dwc3 *dwc)dwc3_drd_update (dwc); }else { -dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_OTG ); +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_OTG , true);/* use OTG block to get ID event */ irq =dwc3_otg_get_irq (dwc);
Greg Kroah-Hartman
maintainerPATCH 588/620 usb: dwc3: gadget: Prevent irq storm when TH re-executes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Badhri Jagan Sridharan <[email protected]>
commit 69c58deec19628c8a686030102176484eb94fed4 upstream.
While commit d325a1de49d6 ("usb: dwc3: gadget: Prevent losing events in event cache") makes sure that top half(TH) does not end up overwriting the cached events before processing them when the TH gets invoked more than one time, returning IRQ_HANDLED results in occasional irq storm where the TH hogs the CPU. The irq storm can be prevented by the flag before event handler busy is cleared. Default enable interrupt moderation in all versions which support them.
ftrace event stub during dwc3 irq storm:
irq/504_dwc3-1111 ( 1111) [000] .... 70.000866: irq_handler_exit: irq=14 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000872: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000874: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000881: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000883: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000889: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000892: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000898: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000901: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000907: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000909: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000915: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000918: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000924: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000927: irq_handler_exit: irq=504 ret=handled
irq/504_dwc3-1111 ( 1111) [000] .... 70.000933: irq_handler_entry: irq=504 name=dwc3
irq/504_dwc3-1111 ( 1111) [000] .... 70.000935: irq_handler_exit: irq=504 ret=handled
....--- drivers/usb/dwc3/core.c | 16 ++++++---------- drivers/usb/dwc3/gadget.c | 10 +++++++--- 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/usb/dwc3/core.c +6 -10
@@ -1456,8 +1456,6 @@ static void dwc3_get_properties(struct d dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd; dwc->tx_max_burst_prd = tx_max_burst_prd; - dwc->imod_interval =0 ; - dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num; }
@@ -1475,21 +1473,19 @@ static void dwc3_check_params(struct dwcunsigned int hwparam_gen =DWC3_GHWPARAMS3_SSPHY_IFC (dwc->hwparams.hwparams3); -/* Check for proper value of imod_interval */ -if (dwc->imod_interval && !dwc3_has_imod (dwc)) { -dev_warn (dwc->dev,"Interrupt moderation not supported\n" ); - dwc->imod_interval =0 ; - } -/* +* Enable IMOD for all supporting controllers. +* +* Particularly, DWC_usb3 v3.00a must enable this feature for +* the following reason: +* * Workaround for STAR 9000961433 which affects only version * 3.00a of the DWC_usb3 core. This prevents the controller * interrupt from being masked while handling events. IMOD * allows us to work around this issue. Enable it for the * affected version. */ -if (!dwc->imod_interval && - DWC3_VER_IS(DWC3, 300A)) +if (dwc3_has_imod ((dwc))) dwc->imod_interval =1 ;/* Check the maximum_speed parameter */
drivers/usb/dwc3/gadget.c +7 -3
@@ -4297,14 +4297,18 @@ static irqreturn_t dwc3_process_event_bu reg &= ~DWC3_GEVNTSIZ_INTMASK ;dwc3_writel (dwc->regs,DWC3_GEVNTSIZ (0 ), reg); + evt->flags &= ~DWC3_EVENT_PENDING ; +/* +* Add an explicit write memory barrier to make sure that the update of +* clearing DWC3_EVENT_PENDING is observed in dwc3_check_event_buf() +*/ +wmb (); +if (dwc->imod_interval) {dwc3_writel (dwc->regs,DWC3_GEVNTCOUNT (0 ),DWC3_GEVNTCOUNT_EHB );dwc3_writel (dwc->regs,DWC3_DEV_IMOD (0 ), dwc->imod_interval); } -/* Keep the clearing of DWC3_EVENT_PENDING at the end */ - evt->flags &= ~DWC3_EVENT_PENDING ; -return ret; }
Greg Kroah-Hartman
maintainerPATCH 589/620 usb: typec: ucsi: increase timeout for PPM reset operations
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit bf4f9ae1cb08ccaafbe6874be6c46f59b83ae778 upstream.
It is observed that on some systems an initial PPM reset during the boot phase can trigger a timeout:
[ 6.482546] ucsi_acpi USBC000:00: failed to reset PPM! [ 6.482551] ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failed
Still, increasing the timeout value, albeit being the most straightforward solution, eliminates the problem: the initial PPM reset may take up to ~8000-10000ms on some Lenovo laptops. When it is reset after the above period of time (or even if ucsi_reset_ppm() is not called overall), UCSI works as expected.
Moreover, if the ucsi_acpi module is loaded/unloaded manually after the system has booted, reading the CCI values and resetting the PPM works perfectly, without any timeout. Thus it's only a boot-time issue.
The reason for this behavior is not clear but it may be the consequence of some tricks that the firmware performs or be an actual firmware bug. As a workaround, increase the timeout to avoid failing the UCSI initialization prematurely.
--- drivers/usb/typec/ucsi/ucsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/ucsi/ucsi.c +1 -1
@@ -25,7 +25,7 @@* difficult to estimate the time it takes for the system to process the command * before it is actually passed to the PPM. */ -#define UCSI_TIMEOUT_MS 5000 +#define UCSI_TIMEOUT_MS 10000/* * UCSI_SWAP_TIMEOUT_MS - Timeout for role swap requests
Greg Kroah-Hartman
maintainerPATCH 590/620 usb: typec: tcpci_rt1711h: Unmask alert interrupts to fix functionality
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
commit d6b82dafd17db0658f089b9cdec573982ca82bc5 upstream.
During probe, the TCPC alert interrupts are getting masked to avoid unwanted interrupts during chip setup: this is ok to do but there is no unmasking happening at any later time, which means that the chip will not raise any interrupt, essentially making it not functional as, while internally it does perform all of the intended functions, it won't signal anything to the outside.
Unmask the alert interrupts to fix functionality.
--- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/usb/typec/tcpm/tcpci_rt1711h.c +11 -0
@@ -217,6 +217,11 @@ static int rt1711h_probe(struct i2c_clie {int ret;struct rt1711h_chip *chip; +const u16 alert_mask =TCPC_ALERT_TX_SUCCESS |TCPC_ALERT_TX_DISCARDED | +TCPC_ALERT_TX_FAILED |TCPC_ALERT_RX_HARD_RST | +TCPC_ALERT_RX_STATUS |TCPC_ALERT_POWER_STATUS | +TCPC_ALERT_CC_STATUS |TCPC_ALERT_RX_BUF_OVF | +TCPC_ALERT_FAULT ; ret =rt1711h_check_revision (client);if (ret <0 ) {
@@ -258,6 +263,12 @@ static int rt1711h_probe(struct i2c_clie dev_name(chip->dev), chip);if (ret <0 )return ret; + +/* Enable alert interrupts */ + ret =rt1711h_write16 (chip,TCPC_ALERT_MASK , alert_mask); +if (ret <0 ) +return ret; +enable_irq_wake (client->irq);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 591/620 usb: gadget: Set self-powered based on MaxPower and bmAttributes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prashanth K <[email protected]>
commit 40e89ff5750fca2c1d6da93f98a2038716bba86c upstream.
Currently the USB gadget will be set as bus-powered based solely on whether its bMaxPower is greater than 100mA, but this may miss devices that may legitimately draw less than 100mA but still want to report as bus-powered. Similarly during suspend & resume, USB gadget is incorrectly marked as bus/self powered without checking the bmAttributes field. Fix these by configuring the USB gadget as self or bus powered based on bmAttributes, and explicitly set it as bus-powered if it draws more than 100mA.
--- drivers/usb/gadget/composite.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/usb/gadget/composite.c +11 -5
@@ -1004,10 +1004,11 @@ static int set_config(struct usb_composielse usb_gadget_set_remote_wakeup (gadget,0 ); done: -if (power <=USB_SELF_POWER_VBUS_MAX_DRAW ) -usb_gadget_set_selfpowered (gadget); -else +if (power >USB_SELF_POWER_VBUS_MAX_DRAW || + !(c->bmAttributes &USB_CONFIG_ATT_SELFPOWER ))usb_gadget_clear_selfpowered (gadget); +else +usb_gadget_set_selfpowered (gadget);usb_gadget_vbus_draw (gadget, power);if (result >=0 && cdev->delayed_status)
@@ -2475,7 +2476,9 @@ void composite_suspend(struct usb_gadget cdev->suspended =1 ; -usb_gadget_set_selfpowered (gadget); +if (cdev->config->bmAttributes &USB_CONFIG_ATT_SELFPOWER ) +usb_gadget_set_selfpowered (gadget); +usb_gadget_vbus_draw (gadget,2 ); }
@@ -2504,8 +2507,11 @@ void composite_resume(struct usb_gadgetelse maxpower =min (maxpower,900U ); -if (maxpower >USB_SELF_POWER_VBUS_MAX_DRAW ) +if (maxpower >USB_SELF_POWER_VBUS_MAX_DRAW || + !(cdev->config->bmAttributes &USB_CONFIG_ATT_SELFPOWER ))usb_gadget_clear_selfpowered (gadget); +else +usb_gadget_set_selfpowered (gadget);usb_gadget_vbus_draw (gadget, maxpower); }
Greg Kroah-Hartman
maintainerPATCH 592/620 usb: gadget: Fix setting self-powered state on suspend
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
commit c783e1258f29c5caac9eea0aea6b172870f1baf8 upstream.
cdev->config might be NULL, so check it before dereferencing.
--- drivers/usb/gadget/composite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/composite.c +2 -1
@@ -2476,7 +2476,8 @@ void composite_suspend(struct usb_gadget cdev->suspended =1 ; -if (cdev->config->bmAttributes &USB_CONFIG_ATT_SELFPOWER ) +if (cdev->config && + cdev->config->bmAttributes &USB_CONFIG_ATT_SELFPOWER )usb_gadget_set_selfpowered (gadget);usb_gadget_vbus_draw (gadget,2 );
Greg Kroah-Hartman
maintainerPATCH 593/620 usb: gadget: Check bmAttributes only if configuration is valid
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prashanth K <[email protected]>
commit 8e812e9355a6f14dffd54a33d951ca403b9732f5 upstream.
If the USB configuration is not valid, then avoid checking for bmAttributes to prevent null pointer deference.
--- drivers/usb/gadget/composite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/composite.c +1 -1
@@ -1005,7 +1005,7 @@ static int set_config(struct usb_composiusb_gadget_set_remote_wakeup (gadget,0 ); done:if (power >USB_SELF_POWER_VBUS_MAX_DRAW || - !(c->bmAttributes &USB_CONFIG_ATT_SELFPOWER )) + (c && !(c->bmAttributes &USB_CONFIG_ATT_SELFPOWER )))usb_gadget_clear_selfpowered (gadget);else usb_gadget_set_selfpowered (gadget);
Greg Kroah-Hartman
maintainerPATCH 594/620 xhci: pci: Fix indentation in the PCI device ID definitions
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 0309ed83791c079f239c13e0c605210425cd1a61 upstream.
Some of the definitions are missing the one TAB, add it to them.
--- drivers/usb/host/xhci-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-pci.c +4 -4
@@ -28,8 +28,8 @@#define SPARSE_CNTL_ENABLE 0xC12C/* Device for a quirk */ -#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 -#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 +#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 +#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1009 0x1009#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1100 0x1100#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400 0x1400
@@ -38,8 +38,8 @@#define PCI_DEVICE_ID_EJ168 0x7023#define PCI_DEVICE_ID_EJ188 0x7052 -#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31 -#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31 +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI 0x9cb1#define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI 0xa12f
Greg Kroah-Hartman
maintainerPATCH 595/620 usb: xhci: Enable the TRB overfetch quirk on VIA VL805
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
commit c133ec0e5717868c9967fa3df92a55e537b1aead upstream.
Raspberry Pi is a major user of those chips and they discovered a bug - when the end of a transfer ring segment is reached, up to four TRBs can be prefetched from the next page even if the segment ends with link TRB and on page boundary (the chip claims to support standard 4KB pages).
It also appears that if the prefetched TRBs belong to a different ring whose doorbell is later rung, they may be used without refreshing from system RAM and the endpoint will stay idle if their cycle bit is stale.
Other users complain about IOMMU faults on x86 systems, unsurprisingly.
Deal with it by using existing quirk which allocates a dummy page after each transfer ring segment. This was seen to resolve both problems. RPi came up with a more efficient solution, shortening each segment by four TRBs, but it complicated the driver and they ditched it for this quirk.
Also rename the quirk and add VL805 device ID macro.
--- drivers/usb/host/xhci-mem.c | 3 ++- drivers/usb/host/xhci-pci.c | 10 +++++++--- drivers/usb/host/xhci.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-mem.c +2 -1
@@ -2406,7 +2406,8 @@ int xhci_mem_init(struct xhci_hcd *xhci,* and our use of dma addresses in the trb_address_map radix tree needs * TRB_SEGMENT_SIZE alignment, so we pick the greater alignment need. */ -if (xhci->quirks &XHCI_ZHAOXIN_TRB_FETCH ) +if (xhci->quirks &XHCI_TRB_OVERFETCH ) +/* Buggy HC prefetches beyond segment bounds - allocate dummy space at the end */ xhci->segment_pool =dma_pool_create ("xHCI ring segments" , dev,TRB_SEGMENT_SIZE *2 ,TRB_SEGMENT_SIZE *2 , xhci->page_size *2 );else
drivers/usb/host/xhci-pci.c +7 -3
@@ -38,6 +38,8 @@#define PCI_DEVICE_ID_EJ168 0x7023#define PCI_DEVICE_ID_EJ188 0x7052 +#define PCI_DEVICE_ID_VIA_VL805 0x3483 +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI 0x9cb1
@@ -305,8 +307,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |=XHCI_BROKEN_STREAMS ; -if (pdev->vendor ==PCI_VENDOR_ID_VIA && pdev->device ==0x3483 ) +if (pdev->vendor ==PCI_VENDOR_ID_VIA && pdev->device ==PCI_DEVICE_ID_VIA_VL805 ) { xhci->quirks |=XHCI_LPM_SUPPORT ; + xhci->quirks |=XHCI_TRB_OVERFETCH ; + }if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042_XHCI ) {
@@ -354,11 +358,11 @@ static void xhci_pci_quirks(struct devicif (pdev->device ==0x9202 ) { xhci->quirks |=XHCI_RESET_ON_RESUME ; - xhci->quirks |=XHCI_ZHAOXIN_TRB_FETCH ; + xhci->quirks |=XHCI_TRB_OVERFETCH ; }if (pdev->device ==0x9203 ) - xhci->quirks |=XHCI_ZHAOXIN_TRB_FETCH ; + xhci->quirks |=XHCI_TRB_OVERFETCH ; } if (pdev->vendor == PCI_DEVICE_ID_CADENCE &&
drivers/usb/host/xhci.h +1 -1
@@ -1665,7 +1665,7 @@ struct xhci_hcd {#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)#define XHCI_RESET_TO_DEFAULT BIT_ULL(44) -#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45) +#define XHCI_TRB_OVERFETCH BIT_ULL(45)#define XHCI_ZHAOXIN_HOST BIT_ULL(46)#define XHCI_WRITE_64_HI_LO BIT_ULL(47)#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48)
Greg Kroah-Hartman
maintainerPATCH 596/620 Squashfs: check the inode number is not the invalid value of zero
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phillip Lougher <[email protected]>
commit 9253c54e01b6505d348afbc02abaa4d9f8a01395 upstream.
Syskiller has produced an out of bounds access in fill_meta_index().
That out of bounds access is ultimately caused because the inode has an inode number with the invalid value of zero, which was not checked.
The reason this causes the out of bounds access is due to following sequence of events:
1. Fill_meta_index() is called to allocate (via empty_meta_index()) and fill a metadata index. It however suffers a data read error and aborts, invalidating the newly returned empty metadata index. It does this by setting the inode number of the index to zero, which means unused (zero is not a valid inode number).
2. When fill_meta_index() is subsequently called again on another read operation, locate_meta_index() returns the previous index because it matches the inode number of 0. Because this index has been returned it is expected to have been filled, and because it hasn't been, an out of bounds access is performed.
This patch adds a sanity check which checks that the inode number is not zero when the inode is created and returns -EINVAL if it is.
--- fs/squashfs/inode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/squashfs/inode.c +4 -1
@@ -48,6 +48,10 @@ static int squashfs_new_inode(struct supgid_t i_gid;int err; + inode->i_ino =le32_to_cpu (sqsh_ino->inode_number); +if (inode->i_ino ==0 ) +return -EINVAL ; + err =squashfs_get_id (sb,le16_to_cpu (sqsh_ino->uid), &i_uid);if (err)return err;
@@ -58,7 +62,6 @@ static int squashfs_new_inode(struct supi_uid_write (inode, i_uid);i_gid_write (inode, i_gid); - inode->i_ino =le32_to_cpu (sqsh_ino->inode_number); inode->i_mtime.tv_sec =le32_to_cpu (sqsh_ino->mtime); inode->i_atime.tv_sec = inode->i_mtime.tv_sec; inode->i_ctime.tv_sec = inode->i_mtime.tv_sec;
Greg Kroah-Hartman
maintainerPATCH 597/620 mei: me: add panther lake P DID
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Usyskin <[email protected]>
commit a8e8ffcc3afce2ee5fb70162aeaef3f03573ee1e upstream.
Add Panther Lake P device id.
--- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -117,6 +117,8 @@#define MEI_DEV_ID_LNL_M 0xA870/* Lunar Lake Point M */ +#define MEI_DEV_ID_PTL_P 0xE470/* Panther Lake P */ +/* * MEI HW Section */
drivers/misc/mei/pci-me.c +2 -0
@@ -123,6 +123,8 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)}, +/* required last entry */ {0, } };
Greg Kroah-Hartman
maintainerPATCH 598/620 intel_th: pci: Add Arrow Lake support
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Chmielewski <[email protected]>
commit b5edccae9f447a92d475267d94c33f4926963eec upstream.
Add support for the Trace Hub in Arrow Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -330,6 +330,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Arrow Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7724), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 599/620 intel_th: pci: Add Panther Lake-H support
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit a70034d6c0d5f3cdee40bb00a578e17fd2ebe426 upstream.
Add support for the Trace Hub in Panther Lake-H.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -335,6 +335,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Panther Lake-H */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe324), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 600/620 intel_th: pci: Add Panther Lake-P/U support
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit 49114ff05770264ae233f50023fc64a719a9dcf9 upstream.
Add support for the Trace Hub in Panther Lake-P/U.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -340,6 +340,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Panther Lake-P/U */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe424), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 601/620 slimbus: messaging: Free transaction ID in delayed interrupt scenario
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Visweswara Tanuku <[email protected]>
commit dcb0d43ba8eb9517e70b1a0e4b0ae0ab657a0e5a upstream.
In case of interrupt delay for any reason, slim_do_transfer() returns timeout error but the transaction ID (TID) is not freed. This results into invalid memory access inside qcom_slim_ngd_rx_msgq_cb() due to invalid TID.
Fix the issue by freeing the TID in slim_do_transfer() before returning timeout error to avoid invalid memory access.
Call trace: __memcpy_fromio+0x20/0x190 qcom_slim_ngd_rx_msgq_cb+0x130/0x290 [slim_qcom_ngd_ctrl] vchan_complete+0x2a0/0x4a0 tasklet_action_common+0x274/0x700 tasklet_action+0x28/0x3c _stext+0x188/0x620 run_ksoftirqd+0x34/0x74 smpboot_thread_fn+0x1d8/0x464 kthread+0x178/0x238 ret_from_fork+0x10/0x20 Code: aa0003e8 91000429 f100044a 3940002b (3800150b) ---[ end trace 0fe00bec2b975c99 ]--- Kernel panic - not syncing: Oops: Fatal exception in interrupt.
--- drivers/slimbus/messaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/slimbus/messaging.c +3 -2
@@ -147,8 +147,9 @@ int slim_do_transfer(struct slim_control } ret = ctrl->xfer_msg (ctrl, txn); - -if (!ret && need_tid && !txn->msg->comp) { +if (ret == -ETIMEDOUT ) { +slim_free_txn_tid (ctrl, txn); + }else if (!ret && need_tid && !txn->msg->comp) {unsigned long ms = txn->rl +HZ ; timeout = wait_for_completion_timeout(txn->comp,
Greg Kroah-Hartman
maintainerPATCH 602/620 bus: mhi: host: pci_generic: Use pci_try_reset_function() to avoid deadlock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
commit a321d163de3d8aa38a6449ab2becf4b1581aed96 upstream.
There are multiple places from where the recovery work gets scheduled asynchronously. Also, there are multiple places where the caller waits synchronously for the recovery to be completed. One such place is during the PM shutdown() callback.
If the device is not alive during recovery_work, it will try to reset the device using pci_reset_function(). This function internally will take the device_lock() first before resetting the device. By this time, if the lock has already been acquired, then recovery_work will get stalled while waiting for the lock. And if the lock was already acquired by the caller which waits for the recovery_work to be completed, it will lead to deadlock.
This is what happened on the X1E80100 CRD device when the device died before shutdown() callback. Driver core calls the driver's shutdown() callback while holding the device_lock() leading to deadlock.
And this deadlock scenario can occur on other paths as well, like during the PM suspend() callback, where the driver core would hold the device_lock() before calling driver's suspend() callback. And if the recovery_work was already started, it could lead to deadlock. This is also observed on the X1E80100 CRD.
So to fix both issues, use pci_try_reset_function() in recovery_work. This function first checks for the availability of the device_lock() before trying to reset the device. If the lock is available, it will acquire it and reset the device. Otherwise, it will return -EAGAIN. If that happens, recovery_work will fail with the error message "Recovery failed" as not much could be done.
--- drivers/bus/mhi/host/pci_generic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/mhi/host/pci_generic.c +3 -2
@@ -732,8 +732,9 @@ static void mhi_pci_recovery_work(struct err_unprepare:mhi_unprepare_after_power_down (mhi_cntrl); err_try_reset: -if (pci_reset_function (pdev)) -dev_err (&pdev->dev,"Recovery failed\n" ); + err =pci_try_reset_function (pdev); +if (err) +dev_err (&pdev->dev,"Recovery failed: %d\n" , err); }static void health_check (struct timer_list *t)
Greg Kroah-Hartman
maintainerPATCH 603/620 eeprom: digsy_mtc: Make GPIO lookup table match the device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 038ef0754aae76f79b147b8867f9250e6a976872 upstream.
The dev_id value in the GPIO lookup table must match to the device instance name, which in this case is combined of name and platform device ID, i.e. "spi_gpio.1". But the table assumed that there was no platform device ID defined, which is wrong. Fix the dev_id value accordingly.
--- drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/eeprom/digsy_mtc_eeprom.c +1 -1
@@ -60,7 +60,7 @@ static struct platform_device digsy_mtc_ };static struct gpiod_lookup_table eeprom_spi_gpiod_table = { - .dev_id ="spi_gpio" , + .dev_id ="spi_gpio.1" , .table = {GPIO_LOOKUP ("gpio@b00" ,GPIO_EEPROM_CLK ,"sck" ,GPIO_ACTIVE_HIGH ),
Greg Kroah-Hartman
maintainerPATCH 604/620 drivers: virt: acrn: hsm: Use kzalloc to avoid info leak in pmcmd_ioctl
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoyu Li <[email protected]>
commit 819cec1dc47cdeac8f5dd6ba81c1dbee2a68c3bb upstream.
In the "pmcmd_ioctl" function, three memory objects allocated by kmalloc are initialized by "hcall_get_cpu_state", which are then copied to user space. The initializer is indeed implemented in "acrn_hypercall2" (arch/x86/include/asm/acrn.h). There is a risk of information leakage due to uninitialized bytes.
--- drivers/virt/acrn/hsm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/virt/acrn/hsm.c +3 -3
@@ -49,7 +49,7 @@ static int pmcmd_ioctl(u64 cmd, void __uswitch (cmd &PMCMD_TYPE_MASK ) {case ACRN_PMCMD_GET_PX_CNT :case ACRN_PMCMD_GET_CX_CNT : - pm_info =kmalloc (sizeof (u64),GFP_KERNEL ); + pm_info =kzalloc (sizeof (u64),GFP_KERNEL );if (!pm_info)return -ENOMEM ;
@@ -64,7 +64,7 @@ static int pmcmd_ioctl(u64 cmd, void __ukfree (pm_info);break ;case ACRN_PMCMD_GET_PX_DATA : - px_data =kmalloc (sizeof (*px_data),GFP_KERNEL ); + px_data =kzalloc (sizeof (*px_data),GFP_KERNEL );if (!px_data)return -ENOMEM ;
@@ -79,7 +79,7 @@ static int pmcmd_ioctl(u64 cmd, void __ukfree (px_data);break ;case ACRN_PMCMD_GET_CX_DATA : - cx_data =kmalloc (sizeof (*cx_data),GFP_KERNEL ); + cx_data =kzalloc (sizeof (*cx_data),GFP_KERNEL );if (!cx_data)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 605/620 media: uvcvideo: Avoid invalid memory access
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit f0577b1b6394f954903fcc67e12fe9e7001dafd6 upstream.
If mappings points to an invalid memory, we will be invalid accessing it. Solve it by initializing the value of the variable mapping and by changing the order in the conditional statement (to avoid accessing mapping->id if not needed).
Fix:
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN NOPTI
--- drivers/media/usb/uvc/uvc_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +1 -1
@@ -1708,7 +1708,7 @@ static int uvc_ctrl_find_ctrl_idx(structstruct v4l2_ext_controls *ctrls, struct uvc_control *uvc_control) { - struct uvc_control_mapping *mapping; + struct uvc_control_mapping *mapping = NULL;struct uvc_control *ctrl_found;unsigned int i;
Greg Kroah-Hartman
maintainerPATCH 606/620 media: uvcvideo: Avoid returning invalid controls
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit 414d3b49d9fd4a0bb16a13d929027847fd094f3f upstream.
If the memory where ctrl_found is placed has the value of uvc_ctrl and __uvc_find_control does not find the control we will return an invalid index.
--- drivers/media/usb/uvc/uvc_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +1 -1
@@ -1709,7 +1709,7 @@ static int uvc_ctrl_find_ctrl_idx(struct struct uvc_control *uvc_control) {struct uvc_control_mapping *mapping =NULL ; -struct uvc_control *ctrl_found; +struct uvc_control *ctrl_found =NULL ;unsigned int i;if (!entity)
Greg Kroah-Hartman
maintainerPATCH 607/620 md: select BLOCK_LEGACY_AUTOLOAD
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit 6c0f5898836c05c6d850a750ed7940ba29e4e6c5 upstream.
When BLOCK_LEGACY_AUTOLOAD is not enable, mdadm is not able to activate new arrays unless "CREATE names=yes" appears in mdadm.conf
As this is a regression we need to always enable BLOCK_LEGACY_AUTOLOAD for when MD is selected - at least until mdadm is updated and the updates widely available.
--- drivers/md/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/md/Kconfig +4 -0
@@ -16,6 +16,10 @@ if MD config BLK_DEV_MD tristate "RAID support" select BLOCK_HOLDER_DEPRECATED if SYSFS + # BLOCK_LEGACY_AUTOLOAD requirement should be removed + # after relevant mdadm enhancements - to make "names=yes" + # the default - are widely available. + select BLOCK_LEGACY_AUTOLOAD help This driver lets you combine several hard disk partitions into one logical block device. This can be used to simply append one
Greg Kroah-Hartman
maintainerPATCH 608/620 mtd: rawnand: cadence: fix unchecked dereference
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niravkumar L Rabara <[email protected]>
commit 60255f3704fde70ed3c4d62f919aa4b46f841f70 upstream.
Add NULL check before variable dereference to fix static checker warning.
--- drivers/mtd/nand/raw/cadence-nand-controller.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +4 -2
@@ -2934,8 +2934,10 @@ free_buf_desc:static void cadence_nand_remove (struct cdns_nand_ctrl *cdns_ctrl) {cadence_nand_chips_cleanup (cdns_ctrl); -dma_unmap_resource (cdns_ctrl->dmac->device->dev, cdns_ctrl->io.iova_dma, - cdns_ctrl->io.size,DMA_BIDIRECTIONAL ,0 ); +if (cdns_ctrl->dmac) +dma_unmap_resource (cdns_ctrl->dmac->device->dev, + cdns_ctrl->io.iova_dma, cdns_ctrl->io.size, +DMA_BIDIRECTIONAL ,0 );cadence_nand_irq_cleanup (cdns_ctrl->irq, cdns_ctrl);kfree (cdns_ctrl->buf); dma_free_coherent(cdns_ctrl->dev, sizeof(struct cadence_nand_cdma_desc),
Greg Kroah-Hartman
maintainerPATCH 609/620 spi-mxs: Fix chipselect glitch
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ralf Schlatterbeck <[email protected]>
commit 269e31aecdd0b70f53a05def79480f15cbcc0fd6 upstream.
There was a change in the mxs-dma engine that uses a new custom flag. The change was not applied to the mxs spi driver.
This results in chipselect being deasserted too early.
This fixes the chipselect problem by using the new flag in the mxs-spi driver.
--- drivers/spi/spi-mxs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-mxs.c +2 -1
@@ -39,6 +39,7 @@#include <linux/spi/spi.h> #include <linux/spi/mxs-spi.h> #include <trace/events/spi.h> +#include <linux/dma/mxs-dma.h> #define DRIVER_NAME "mxs-spi"
@@ -252,7 +253,7 @@ static int mxs_spi_txrx_dma(struct mxs_s desc =dmaengine_prep_slave_sg (ssp->dmach, &dma_xfer[sg_count].sg,1 , (flags &TXRX_WRITE ) ?DMA_MEM_TO_DEV :DMA_DEV_TO_MEM , -DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +DMA_PREP_INTERRUPT |MXS_DMA_CTRL_WAIT4END );if (!desc) { dev_err(ssp->dev,
Greg Kroah-Hartman
maintainerPATCH 610/620 nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 584db20c181f5e28c0386d7987406ace7fbd3e49 upstream.
Patch series "nilfs2: Folio conversions for directory paths".
This series applies page->folio conversions to nilfs2 directory operations. This reduces hidden compound_head() calls and also converts deprecated kmap calls to kmap_local in the directory code.
Although nilfs2 does not yet support large folios, Matthew has done his best here to include support for large folios, which will be needed for devices with large block sizes.
This series corresponds to the second half of the original post [1], but with two complementary patches inserted at the beginning and some adjustments, to prevent a kmap_local constraint violation found during testing with highmem mapping.
[1] https://lkml.kernel.org/r/[email protected]
I have reviewed all changes and tested this for regular and small block sizes, both on machines with and without highmem mapping. No issues found.
This patch (of 17):
In a few directory operations, the call to nilfs_put_page() for a page obtained using nilfs_find_entry() or nilfs_dotdot() is hidden in nilfs_set_link() and nilfs_delete_entry(), making it difficult to track page release and preventing change of its call position.
By moving nilfs_put_page() out of these functions, this makes the page get/put correspondence clearer and makes it easier to swap nilfs_put_page() calls (and kunmap calls within them) when modifying multiple directory entries simultaneously in nilfs_rename().
Also, update comments for nilfs_set_link() and nilfs_delete_entry() to reflect changes in their behavior.
To make nilfs_put_page() visible from namei.c, this moves its definition to nilfs.h and replaces existing equivalents to use it, but the exposure of that definition is temporary and will be removed on a later kmap -> kmap_local conversion.
Stable-dep-of: ee70999a988b ("nilfs2: handle errors that nilfs_prepare_chunk() may return")
--- fs/nilfs2/dir.c | 11 +---------- fs/nilfs2/namei.c | 13 +++++++------ fs/nilfs2/nilfs.h | 6 ++++++ 3 files changed, 14 insertions(+), 16 deletions(-)
fs/nilfs2/dir.c +1 -10
@@ -64,12 +64,6 @@ static inline unsigned int nilfs_chunk_sreturn inode->i_sb->s_blocksize; } -static inline void nilfs_put_page (struct page *page) -{ -kunmap (page); -put_page (page); -} -/* * Return the offset into page `page_nr' of the last valid * byte in that page, plus one.
@@ -450,7 +444,6 @@ int nilfs_inode_by_name(struct inode *direturn 0 ; } -/* Releases the page */ void nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de,struct page *page,struct inode *inode) {
@@ -465,7 +458,6 @@ void nilfs_set_link(struct inode *dir, s de->inode =cpu_to_le64 (inode->i_ino);nilfs_set_de_type (de, inode);nilfs_commit_chunk (page, mapping, from, to); -nilfs_put_page (page); dir->i_mtime = dir->i_ctime =current_time (dir); }
@@ -569,7 +561,7 @@ out_unlock:/* * nilfs_delete_entry deletes a directory entry by merging it with the -* previous entry. Page is up-to-date. Releases the page. +* previous entry. Page is up-to-date. */ int nilfs_delete_entry (struct nilfs_dir_entry *dir,struct page *page) {
@@ -605,7 +597,6 @@ int nilfs_delete_entry(struct nilfs_dir_nilfs_commit_chunk (page, mapping, from, to); inode->i_ctime = inode->i_mtime =current_time (inode); out: -nilfs_put_page (page);return err; }
fs/nilfs2/namei.c +7 -6
@@ -297,6 +297,7 @@ static int nilfs_do_unlink(struct inodeset_nlink (inode,1 ); } err =nilfs_delete_entry (de, page); +nilfs_put_page (page);if (err) goto out;
@@ -406,6 +407,7 @@ static int nilfs_rename(struct user_name goto out_dir; }nilfs_set_link (new_dir, new_de, new_page, old_inode); +nilfs_put_page (new_page);nilfs_mark_inode_dirty (new_dir); new_inode->i_ctime =current_time (new_inode);if (dir_de)
@@ -429,9 +431,11 @@ static int nilfs_rename(struct user_name old_inode->i_ctime =current_time (old_inode);nilfs_delete_entry (old_de, old_page); +nilfs_put_page (old_page);if (dir_de) {nilfs_set_link (old_inode, dir_de, dir_page, new_dir); +nilfs_put_page (dir_page);drop_nlink (old_dir); }nilfs_mark_inode_dirty (old_dir);
@@ -441,13 +445,10 @@ static int nilfs_rename(struct user_namereturn err; out_dir: -if (dir_de) { -kunmap (dir_page); -put_page (dir_page); - } +if (dir_de) +nilfs_put_page (dir_page); out_old: -kunmap (old_page); -put_page (old_page); +nilfs_put_page (old_page); out:nilfs_transaction_abort (old_dir->i_sb);return err;
fs/nilfs2/nilfs.h +6 -0
@@ -243,6 +243,12 @@ extern struct nilfs_dir_entry *nilfs_dotextern void nilfs_set_link (struct inode *,struct nilfs_dir_entry *,struct page *,struct inode *); +static inline void nilfs_put_page (struct page *page) +{ +kunmap (page); +put_page (page); +} +/* file.c */ extern int nilfs_sync_file (struct file *,loff_t ,loff_t ,int );
Greg Kroah-Hartman
maintainerPATCH 611/620 nilfs2: eliminate staggered calls to kunmap in nilfs_rename
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 8cf57c6df818f58fdad16a909506be213623a88e upstream.
In nilfs_rename(), calls to nilfs_put_page() to release pages obtained with nilfs_find_entry() or nilfs_dotdot() are alternated in the normal path.
When replacing the kernel memory mapping method from kmap to kmap_local_{page,folio}, this violates the constraint on the calling order of kunmap_local().
Swap the order of nilfs_put_page calls where the kmap sections of multiple pages overlap so that they are nested, allowing direct replacement of nilfs_put_page() -> unmap_and_put_page().
Without this reordering, that replacement will cause a kernel WARNING in kunmap_local_indexed() on architectures with high memory mapping.
Stable-dep-of: ee70999a988b ("nilfs2: handle errors that nilfs_prepare_chunk() may return")
--- fs/nilfs2/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nilfs2/namei.c +2 -1
@@ -431,13 +431,14 @@ static int nilfs_rename(struct user_name old_inode->i_ctime =current_time (old_inode);nilfs_delete_entry (old_de, old_page); -nilfs_put_page (old_page);if (dir_de) {nilfs_set_link (old_inode, dir_de, dir_page, new_dir);nilfs_put_page (dir_page);drop_nlink (old_dir); } +nilfs_put_page (old_page); +nilfs_mark_inode_dirty (old_dir);nilfs_mark_inode_dirty (old_inode);
Greg Kroah-Hartman
maintainerPATCH 612/620 nilfs2: handle errors that nilfs_prepare_chunk() may return
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit ee70999a988b8abc3490609142f50ebaa8344432 upstream.
Patch series "nilfs2: fix issues with rename operations".
This series fixes BUG_ON check failures reported by syzbot around rename operations, and a minor behavioral issue where the mtime of a child directory changes when it is renamed instead of moved.
This patch (of 2):
The directory manipulation routines nilfs_set_link() and nilfs_delete_entry() rewrite the directory entry in the folio/page previously read by nilfs_find_entry(), so error handling is omitted on the assumption that nilfs_prepare_chunk(), which prepares the buffer for rewriting, will always succeed for these. And if an error is returned, it triggers the legacy BUG_ON() checks in each routine.
This assumption is wrong, as proven by syzbot: the buffer layer called by nilfs_prepare_chunk() may call nilfs_get_block() if necessary, which may fail due to metadata corruption or other reasons. This has been there all along, but improved sanity checks and error handling may have made it more reproducible in fuzzing tests.
Fix this issue by adding missing error paths in nilfs_set_link(), nilfs_delete_entry(), and their caller nilfs_rename().
--- fs/nilfs2/dir.c | 13 ++++++++++--- fs/nilfs2/namei.c | 29 +++++++++++++++-------------- fs/nilfs2/nilfs.h | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-)
fs/nilfs2/dir.c +10 -3
@@ -444,7 +444,7 @@ int nilfs_inode_by_name(struct inode *direturn 0 ; } -void nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de, +int nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de,struct page *page,struct inode *inode) {unsigned int from = (char *)de - (char *)page_address (page);
@@ -454,11 +454,15 @@ void nilfs_set_link(struct inode *dir, slock_page (page); err =nilfs_prepare_chunk (page, from, to); -BUG_ON (err); +if (unlikely (err)) { +unlock_page (page); +return err; + } de->inode =cpu_to_le64 (inode->i_ino);nilfs_set_de_type (de, inode);nilfs_commit_chunk (page, mapping, from, to); dir->i_mtime = dir->i_ctime =current_time (dir); +return 0 ; }/*
@@ -590,7 +594,10 @@ int nilfs_delete_entry(struct nilfs_dir_ from = (char *)pde - (char *)page_address (page);lock_page (page); err =nilfs_prepare_chunk (page, from, to); -BUG_ON (err); +if (unlikely (err)) { +unlock_page (page); + goto out; + }if (pde) pde->rec_len =nilfs_rec_len_to_disk (to - from); dir->inode =0 ;
fs/nilfs2/namei.c +15 -14
@@ -406,8 +406,10 @@ static int nilfs_rename(struct user_name err =PTR_ERR (new_de); goto out_dir; } -nilfs_set_link (new_dir, new_de, new_page, old_inode); + err =nilfs_set_link (new_dir, new_de, new_page, old_inode);nilfs_put_page (new_page); +if (unlikely (err)) + goto out_dir;nilfs_mark_inode_dirty (new_dir); new_inode->i_ctime =current_time (new_inode);if (dir_de)
@@ -430,28 +432,27 @@ static int nilfs_rename(struct user_name*/ old_inode->i_ctime =current_time (old_inode); -nilfs_delete_entry (old_de, old_page); - -if (dir_de) { -nilfs_set_link (old_inode, dir_de, dir_page, new_dir); -nilfs_put_page (dir_page); -drop_nlink (old_dir); + err =nilfs_delete_entry (old_de, old_page); +if (likely (!err)) { +if (dir_de) { + err =nilfs_set_link (old_inode, dir_de, dir_page, + new_dir); +drop_nlink (old_dir); + } +nilfs_mark_inode_dirty (old_dir); } -nilfs_put_page (old_page); - -nilfs_mark_inode_dirty (old_dir);nilfs_mark_inode_dirty (old_inode); - err =nilfs_transaction_commit (old_dir->i_sb); -return err; - out_dir:if (dir_de)nilfs_put_page (dir_page); out_old:nilfs_put_page (old_page); out: -nilfs_transaction_abort (old_dir->i_sb); +if (likely (!err)) + err =nilfs_transaction_commit (old_dir->i_sb); +else +nilfs_transaction_abort (old_dir->i_sb);return err; }
fs/nilfs2/nilfs.h +2 -2
@@ -240,8 +240,8 @@ nilfs_find_entry(struct inode *, const sextern int nilfs_delete_entry (struct nilfs_dir_entry *,struct page *);extern int nilfs_empty_dir (struct inode *);extern struct nilfs_dir_entry *nilfs_dotdot (struct inode *,struct page **); -extern void nilfs_set_link (struct inode *,struct nilfs_dir_entry *, -struct page *,struct inode *); +int nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de, +struct page *page,struct inode *inode);static inline void nilfs_put_page (struct page *page) {
Greg Kroah-Hartman
maintainerPATCH 613/620 media: uvcvideo: Fix crash during unbind if gpio unit is in use
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit a9ea1a3d88b7947ce8cadb2afceee7a54872bbc5 upstream.
We used the wrong device for the device managed functions. We used the usb device, when we should be using the interface device.
If we unbind the driver from the usb interface, the cleanup functions are never called. In our case, the IRQ is never disabled.
If an IRQ is triggered, it will try to access memory sections that are already free, causing an OOPS.
We cannot use the function devm_request_threaded_irq here. The devm_* clean functions may be called after the main structure is released by uvc_delete.
Luckily this bug has small impact, as it is only affected by devices with gpio units and the user has to unbind the device, a disconnect will not trigger this error.
--- drivers/media/usb/uvc/uvc_driver.c | 35 +++++++++++++++++++++++------------ drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 24 insertions(+), 12 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +23 -12
@@ -1515,18 +1515,15 @@ static int uvc_gpio_parse(struct uvc_devstruct gpio_desc *gpio_privacy;int irq; - gpio_privacy =devm_gpiod_get_optional (&dev->udev->dev,"privacy" , + gpio_privacy =devm_gpiod_get_optional (&dev->intf->dev,"privacy" ,GPIOD_IN );if (IS_ERR_OR_NULL (gpio_privacy))return PTR_ERR_OR_ZERO (gpio_privacy); irq =gpiod_to_irq (gpio_privacy); -if (irq <0 ) { -if (irq !=EPROBE_DEFER ) -dev_err (&dev->udev->dev, -"No IRQ for privacy GPIO (%d)\n" , irq); -return irq; - } +if (irq <0 ) +return dev_err_probe (&dev->intf->dev, irq, +"No IRQ for privacy GPIO\n" ); unit =uvc_alloc_entity (UVC_EXT_GPIO_UNIT ,UVC_EXT_GPIO_UNIT_ID ,0 ,1 );if (!unit)
@@ -1551,15 +1548,27 @@ static int uvc_gpio_parse(struct uvc_devstatic int uvc_gpio_init_irq (struct uvc_device *dev) {struct uvc_entity *unit = dev->gpio_unit; +int ret;if (!unit || unit->gpio.irq <0 )return 0 ; -return devm_request_threaded_irq (&dev->udev->dev, unit->gpio.irq,NULL , - uvc_gpio_irq, -IRQF_ONESHOT |IRQF_TRIGGER_FALLING | -IRQF_TRIGGER_RISING , -"uvc_privacy_gpio" , dev); + ret =request_threaded_irq (unit->gpio.irq,NULL , uvc_gpio_irq, +IRQF_ONESHOT |IRQF_TRIGGER_FALLING | +IRQF_TRIGGER_RISING , +"uvc_privacy_gpio" , dev); + + unit->gpio.initialized = !ret; + +return ret; +} + +static void uvc_gpio_deinit (struct uvc_device *dev) +{ +if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized) +return ; + +free_irq (dev->gpio_unit->gpio.irq, dev); }/* ------------------------------------------------------------------------
@@ -2152,6 +2161,8 @@ static void uvc_unregister_video(struct {struct uvc_streaming *stream; +uvc_gpio_deinit (dev); +list_for_each_entry (stream, &dev->streams, list) {/* Nothing to do here, continue. */ if (!video_is_registered (&stream->vdev))
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -368,6 +368,7 @@ struct uvc_entity {u8 *bmControls;struct gpio_desc *gpio_privacy;int irq; +bool initialized; } gpio; };
Greg Kroah-Hartman
maintainerPATCH 614/620 media: uvcvideo: Remove dangling pointers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit 221cd51efe4565501a3dbf04cc011b537dcce7fb upstream.
When an async control is written, we copy a pointer to the file handle that started the operation. That pointer will be used when the device is done. Which could be anytime in the future.
If the user closes that file descriptor, its structure will be freed, and there will be one dangling pointer per pending async control, that the driver will try to use.
Clean all the dangling pointers during release().
To avoid adding a performance penalty in the most common case (no async operation), a counter has been introduced with some logic to make sure that it is properly handled.
--- drivers/media/usb/uvc/uvc_ctrl.c | 63 +++++++++++++++++++++++++++++++++++++-- drivers/media/usb/uvc/uvc_v4l2.c | 2 + drivers/media/usb/uvc/uvcvideo.h | 9 ++++- 3 files changed, 71 insertions(+), 3 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +61 -2
@@ -1417,6 +1417,40 @@ static void uvc_ctrl_send_slave_event(stuvc_ctrl_send_event (chain, handle, ctrl, mapping, val, changes); } +static void uvc_ctrl_set_handle (struct uvc_fh *handle,struct uvc_control *ctrl, +struct uvc_fh *new_handle) +{ +lockdep_assert_held (&handle->chain->ctrl_mutex); + +if (new_handle) { +if (ctrl->handle) +dev_warn_ratelimited (&handle->stream->dev->udev->dev, +"UVC non compliance: Setting an async control with a pending operation." ); + +if (new_handle == ctrl->handle) +return ; + +if (ctrl->handle) { +WARN_ON (!ctrl->handle->pending_async_ctrls); +if (ctrl->handle->pending_async_ctrls) + ctrl->handle->pending_async_ctrls--; + } + + ctrl->handle = new_handle; + handle->pending_async_ctrls++; +return ; + } + +/* Cannot clear the handle for a control not owned by us.*/ +if (WARN_ON (ctrl->handle != handle)) +return ; + + ctrl->handle =NULL ; +if (WARN_ON (!handle->pending_async_ctrls)) +return ; + handle->pending_async_ctrls--; +} +void uvc_ctrl_status_event (struct uvc_video_chain *chain,struct uvc_control *ctrl,const u8 *data) {
@@ -1427,7 +1461,8 @@ void uvc_ctrl_status_event(struct uvc_vimutex_lock (&chain->ctrl_mutex); handle = ctrl->handle; - ctrl->handle =NULL ; +if (handle) +uvc_ctrl_set_handle (handle, ctrl,NULL );list_for_each_entry (mapping, &ctrl->info.mappings, list) {s32 value =__uvc_ctrl_get_value (mapping, data);
@@ -1698,7 +1733,7 @@ static int uvc_ctrl_commit_entity(structif (!rollback && handle && ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) - ctrl->handle = handle; +uvc_ctrl_set_handle (handle, ctrl, handle); }return 0 ;
@@ -2552,6 +2587,30 @@ int uvc_ctrl_init_device(struct uvc_devireturn 0 ; } +void uvc_ctrl_cleanup_fh (struct uvc_fh *handle) +{ +struct uvc_entity *entity; + +mutex_lock (&handle->chain->ctrl_mutex); + +if (!handle->pending_async_ctrls) { +mutex_unlock (&handle->chain->ctrl_mutex); +return ; + } + +list_for_each_entry (entity, &handle->chain->dev->entities, list) { +unsigned int i; +for (i =0 ; i < entity->ncontrols; ++i) { +if (entity->controls[i].handle != handle) +continue ; +uvc_ctrl_set_handle (handle, &entity->controls[i],NULL ); + } + } + +WARN_ON (handle->pending_async_ctrls); +mutex_unlock (&handle->chain->ctrl_mutex); +} +/* * Cleanup device controls. */
drivers/media/usb/uvc/uvc_v4l2.c +2 -0
@@ -602,6 +602,8 @@ static int uvc_v4l2_release(struct fileuvc_dbg (stream->dev,CALLS ,"%s\n" , __func__); +uvc_ctrl_cleanup_fh (handle); +/* Only free resources if this is a privileged handle. */ if (uvc_has_privileges (handle))uvc_queue_release (&stream->queue);
drivers/media/usb/uvc/uvcvideo.h +8 -1
@@ -472,7 +472,11 @@ struct uvc_video_chain {struct uvc_entity *processing;/* Processing unit */ struct uvc_entity *selector;/* Selector unit */ -struct mutex ctrl_mutex;/* Protects ctrl.info */ +struct mutex ctrl_mutex;/* +* Protects ctrl.info, +* ctrl.handle and +* uvc_fh.pending_async_ctrls +*/ struct v4l2_prio_state prio;/* V4L2 priority state */ u32 caps;/* V4L2 chain-wide caps */
@@ -724,6 +728,7 @@ struct uvc_fh {struct uvc_video_chain *chain;struct uvc_streaming *stream;enum uvc_handle_state state; +unsigned int pending_async_ctrls; };struct uvc_driver {
@@ -907,6 +912,8 @@ int uvc_ctrl_is_accessible(struct uvc_viint uvc_xu_ctrl_query (struct uvc_video_chain *chain,struct uvc_xu_control_query *xqry); +void uvc_ctrl_cleanup_fh (struct uvc_fh *handle); +/* Utility functions */ void uvc_simplify_fraction (u32 *numerator,u32 *denominator,unsigned int n_terms,unsigned int threshold);
Greg Kroah-Hartman
maintainerPATCH 615/620 bpf, vsock: Invoke proto::close on close()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
commit 135ffc7becc82cfb84936ae133da7969220b43b2 upstream.
vsock defines a BPF callback to be invoked when close() is called. However, this callback is never actually executed. As a result, a closed vsock socket is not automatically removed from the sockmap/sockhash.
Introduce a dummy vsock_close() and make vsock_release() call proto::close.
Note: changes in __vsock_release() look messy, but it's only due to indent level reduction and variables xmas tree reorder.
[LL: There is no sockmap support for this kernel version. This patch has been backported because it helps reduce conflicts on future backports]
--- net/vmw_vsock/af_vsock.c | 71 +++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 29 deletions(-)
net/vmw_vsock/af_vsock.c +42 -29
@@ -113,12 +113,14 @@static int __vsock_bind (struct sock *sk,struct sockaddr_vm *addr);static void vsock_sk_destruct (struct sock *sk);static int vsock_queue_rcv_skb (struct sock *sk,struct sk_buff *skb); +static void vsock_close (struct sock *sk,long timeout);/* Protocol family. */ static struct proto vsock_proto = { .name ="AF_VSOCK" , .owner =THIS_MODULE , .obj_size =sizeof (struct vsock_sock ), + .close = vsock_close, };/* The default peer timeout indicates how long we will wait for a peer response
@@ -800,39 +802,37 @@ static bool sock_type_connectible(u16 tystatic void __vsock_release (struct sock *sk,int level) { -if (sk) { -struct sock *pending; -struct vsock_sock *vsk; +struct vsock_sock *vsk; +struct sock *pending; - vsk =vsock_sk (sk); - pending =NULL ;/* Compiler warning. */ + vsk =vsock_sk (sk); + pending =NULL ;/* Compiler warning. */ -/* When "level" is SINGLE_DEPTH_NESTING, use the nested -* version to avoid the warning "possible recursive locking -* detected". When "level" is 0, lock_sock_nested(sk, level) -* is the same as lock_sock(sk). -*/ -lock_sock_nested (sk, level); +/* When "level" is SINGLE_DEPTH_NESTING, use the nested +* version to avoid the warning "possible recursive locking +* detected". When "level" is 0, lock_sock_nested(sk, level) +* is the same as lock_sock(sk). +*/ +lock_sock_nested (sk, level); -if (vsk->transport) - vsk->transport->release (vsk); -else if (sock_type_connectible (sk->sk_type)) -vsock_remove_sock (vsk); - -sock_orphan (sk); - sk->sk_shutdown =SHUTDOWN_MASK ; - -skb_queue_purge (&sk->sk_receive_queue); - -/* Clean up any sockets that never were accepted. */ -while ((pending =vsock_dequeue_accept (sk)) !=NULL ) { -__vsock_release (pending,SINGLE_DEPTH_NESTING ); -sock_put (pending); - } +if (vsk->transport) + vsk->transport->release (vsk); +else if (sock_type_connectible (sk->sk_type)) +vsock_remove_sock (vsk); -release_sock (sk); -sock_put (sk); +sock_orphan (sk); + sk->sk_shutdown =SHUTDOWN_MASK ; + +skb_queue_purge (&sk->sk_receive_queue); + +/* Clean up any sockets that never were accepted. */ +while ((pending =vsock_dequeue_accept (sk)) !=NULL ) { +__vsock_release (pending,SINGLE_DEPTH_NESTING ); +sock_put (pending); } + +release_sock (sk); +sock_put (sk); }static void vsock_sk_destruct (struct sock *sk)
@@ -899,9 +899,22 @@ s64 vsock_stream_has_space(struct vsock_ }EXPORT_SYMBOL_GPL (vsock_stream_has_space); +/* Dummy callback required by sockmap. +* See unconditional call of saved_close() in sock_map_close(). +*/ +static void vsock_close (struct sock *sk,long timeout) +{ +} +static int vsock_release (struct socket *sock) { -__vsock_release (sock->sk,0 ); +struct sock *sk = sock->sk; + +if (!sk) +return 0 ; + + sk->sk_prot->close (sk,0 ); +__vsock_release (sk,0 ); sock->sk =NULL ; sock->state =SS_FREE ;
Greg Kroah-Hartman
maintainerPATCH 616/620 vsock: Keep the binding until socket destruction
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
commit fcdd2242c0231032fc84e1404315c245ae56322a upstream.
Preserve sockets bindings; this includes both resulting from an explicit bind() and those implicitly bound through autobind during connect().
Prevents socket unbinding during a transport reassignment, which fixes a use-after-free:
1. vsock_create() (refcnt=1) calls vsock_insert_unbound() (refcnt=2)
2. transport->release() calls vsock_remove_bound() without checking if sk was bound and moved to bound list (refcnt=1)
3. vsock_bind() assumes sk is in unbound list and before __vsock_insert_bound(vsock_bound_sockets()) calls __vsock_remove_bound() which does:
list_del_init(&vsk->bound_table); // nop
sock_put(&vsk->sk); // refcnt=0
BUG: KASAN: slab-use-after-free in __vsock_bind+0x62e/0x730 Read of size 4 at addr ffff88816b46a74c by task a.out/2057 dump_stack_lvl+0x68/0x90 print_report+0x174/0x4f6 kasan_report+0xb9/0x190 __vsock_bind+0x62e/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Allocated by task 2057: kasan_save_stack+0x1e/0x40 kasan_save_track+0x10/0x30 __kasan_slab_alloc+0x85/0x90 kmem_cache_alloc_noprof+0x131/0x450 sk_prot_alloc+0x5b/0x220 sk_alloc+0x2c/0x870 __vsock_create.constprop.0+0x2e/0xb60 vsock_create+0xe4/0x420 __sock_create+0x241/0x650 __sys_socket+0xf2/0x1a0 __x64_sys_socket+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Freed by task 2057: kasan_save_stack+0x1e/0x40 kasan_save_track+0x10/0x30 kasan_save_free_info+0x37/0x60 __kasan_slab_free+0x4b/0x70 kmem_cache_free+0x1a1/0x590 __sk_destruct+0x388/0x5a0 __vsock_bind+0x5e1/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
refcount_t: addition on 0; use-after-free.
WARNING: CPU: 7 PID: 2057 at lib/refcount.c:25 refcount_warn_saturate+0xce/0x150 RIP: 0010:refcount_warn_saturate+0xce/0x150 __vsock_bind+0x66d/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
refcount_t: underflow; use-after-free.
WARNING: CPU: 7 PID: 2057 at lib/refcount.c:28 refcount_warn_saturate+0xee/0x150 RIP: 0010:refcount_warn_saturate+0xee/0x150 vsock_remove_bound+0x187/0x1e0 __vsock_release+0x383/0x4a0 vsock_release+0x90/0x120 __sock_release+0xa3/0x250 sock_close+0x14/0x20 __fput+0x359/0xa80 task_work_run+0x107/0x1d0 do_exit+0x847/0x2560 do_group_exit+0xb8/0x250 __x64_sys_exit_group+0x3a/0x50 x64_sys_call+0xfec/0x14f0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
--- net/vmw_vsock/af_vsock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/vmw_vsock/af_vsock.c +6 -2
@@ -330,7 +330,10 @@ EXPORT_SYMBOL_GPL(vsock_find_connected_svoid vsock_remove_sock (struct vsock_sock *vsk) { -vsock_remove_bound (vsk); +/* Transport reassignment must not remove the binding. */ +if (sock_flag (sk_vsock (vsk),SOCK_DEAD )) +vsock_remove_bound (vsk); +vsock_remove_connected (vsk); }EXPORT_SYMBOL_GPL (vsock_remove_sock);
@@ -815,12 +818,13 @@ static void __vsock_release(struct sock*/ lock_sock_nested (sk, level); +sock_orphan (sk); +if (vsk->transport) vsk->transport->release (vsk);else if (sock_type_connectible (sk->sk_type))vsock_remove_sock (vsk); -sock_orphan (sk); sk->sk_shutdown =SHUTDOWN_MASK ;skb_queue_purge (&sk->sk_receive_queue);
Greg Kroah-Hartman
maintainerPATCH 617/620 vsock: Orphan socket after transport release
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
commit 78dafe1cf3afa02ed71084b350713b07e72a18fb upstream.
During socket release, sock_orphan() is called without considering that it sets sk->sk_wq to NULL. Later, if SO_LINGER is enabled, this leads to a null pointer dereferenced in virtio_transport_wait_close().
Orphan the socket only after transport release.
Partially reverts the 'Fixes:' commit.
KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] lock_acquire+0x19e/0x500 _raw_spin_lock_irqsave+0x47/0x70 add_wait_queue+0x46/0x230 virtio_transport_release+0x4e7/0x7f0 __vsock_release+0xfd/0x490 vsock_release+0x90/0x120 __sock_release+0xa3/0x250 sock_close+0x14/0x20 __fput+0x35e/0xa90 __x64_sys_close+0x78/0xd0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
--- net/vmw_vsock/af_vsock.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +7 -1
@@ -818,13 +818,19 @@ static void __vsock_release(struct sock*/ lock_sock_nested (sk, level); -sock_orphan (sk); +/* Indicate to vsock_remove_sock() that the socket is being released and +* can be removed from the bound_table. Unlike transport reassignment +* case, where the socket must remain bound despite vsock_remove_sock() +* being called from the transport release() callback. +*/ +sock_set_flag (sk,SOCK_DEAD );if (vsk->transport) vsk->transport->release (vsk);else if (sock_type_connectible (sk->sk_type))vsock_remove_sock (vsk); +sock_orphan (sk); sk->sk_shutdown =SHUTDOWN_MASK ;skb_queue_purge (&sk->sk_receive_queue);
Greg Kroah-Hartman
maintainerPATCH 618/620 sched: sch_cake: add bounds checks to host bulk flow fairness counts
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
commit 737d4d91d35b5f7fa5bb442651472277318b0bfd upstream.
Even though we fixed a logic error in the commit cited below, syzbot still managed to trigger an underflow of the per-host bulk flow counters, leading to an out of bounds memory access.
To avoid any such logic errors causing out of bounds memory accesses, this commit factors out all accesses to the per-host bulk flow counters to a series of helpers that perform bounds-checking before any increments and decrements. This also has the benefit of improving readability by moving the conditional checks for the flow mode into these helpers, instead of having them spread out throughout the code (which was the cause of the original logic error).
As part of this change, the flow quantum calculation is consolidated into a helper function, which means that the dithering applied to the ost load scaling is now applied both in the DRR rotation and when a sparse flow's quantum is first initiated. The only user-visible effect of this is that the maximum packet size that can be sent while a flow stays sparse will now vary with +/- one byte in some cases. This should not make a noticeable difference in practice, and thus it's not worth complicating the code to preserve the old behaviour.
--- net/sched/sch_cake.c | 140 +++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 65 deletions(-)
net/sched/sch_cake.c +75 -65
@@ -643,6 +643,63 @@ static bool cake_ddst(int flow_mode)return (flow_mode &CAKE_FLOW_DUAL_DST ) ==CAKE_FLOW_DUAL_DST ; } +static void cake_dec_srchost_bulk_flow_count (struct cake_tin_data *q, +struct cake_flow *flow, +int flow_mode) +{ +if (likely (cake_dsrc (flow_mode) && + q->hosts[flow->srchost].srchost_bulk_flow_count)) + q->hosts[flow->srchost].srchost_bulk_flow_count--; +} + +static void cake_inc_srchost_bulk_flow_count (struct cake_tin_data *q, +struct cake_flow *flow, +int flow_mode) +{ +if (likely (cake_dsrc (flow_mode) && + q->hosts[flow->srchost].srchost_bulk_flow_count <CAKE_QUEUES )) + q->hosts[flow->srchost].srchost_bulk_flow_count++; +} + +static void cake_dec_dsthost_bulk_flow_count (struct cake_tin_data *q, +struct cake_flow *flow, +int flow_mode) +{ +if (likely (cake_ddst (flow_mode) && + q->hosts[flow->dsthost].dsthost_bulk_flow_count)) + q->hosts[flow->dsthost].dsthost_bulk_flow_count--; +} + +static void cake_inc_dsthost_bulk_flow_count (struct cake_tin_data *q, +struct cake_flow *flow, +int flow_mode) +{ +if (likely (cake_ddst (flow_mode) && + q->hosts[flow->dsthost].dsthost_bulk_flow_count <CAKE_QUEUES )) + q->hosts[flow->dsthost].dsthost_bulk_flow_count++; +} + +static u16 cake_get_flow_quantum (struct cake_tin_data *q, +struct cake_flow *flow, +int flow_mode) +{ +u16 host_load =1 ; + +if (cake_dsrc (flow_mode)) + host_load =max (host_load, + q->hosts[flow->srchost].srchost_bulk_flow_count); + +if (cake_ddst (flow_mode)) + host_load =max (host_load, + q->hosts[flow->dsthost].dsthost_bulk_flow_count); + +/* The shifted prandom_u32() is a way to apply dithering to avoid +* accumulating roundoff errors +*/ +return (q->flow_quantum * quantum_div[host_load] + + (prandom_u32 () >>16 )) >>16 ; +} +static u32 cake_hash (struct cake_tin_data *q,const struct sk_buff *skb,int flow_mode,u16 flow_override,u16 host_override) {
@@ -789,10 +846,8 @@ skip_hash: allocate_dst =cake_ddst (flow_mode);if (q->flows[outer_hash + k].set ==CAKE_SET_BULK ) { -if (allocate_src) - q->hosts[q->flows[reduced_hash].srchost].srchost_bulk_flow_count--; -if (allocate_dst) - q->hosts[q->flows[reduced_hash].dsthost].dsthost_bulk_flow_count--; +cake_dec_srchost_bulk_flow_count (q, &q->flows[outer_hash + k], flow_mode); +cake_dec_dsthost_bulk_flow_count (q, &q->flows[outer_hash + k], flow_mode); } found:/* reserve queue for future packets in same flow */
@@ -817,9 +872,10 @@ found: q->hosts[outer_hash + k].srchost_tag = srchost_hash; found_src: srchost_idx = outer_hash + k; -if (q->flows[reduced_hash].set ==CAKE_SET_BULK ) - q->hosts[srchost_idx].srchost_bulk_flow_count++; q->flows[reduced_hash].srchost = srchost_idx; + +if (q->flows[reduced_hash].set ==CAKE_SET_BULK ) +cake_inc_srchost_bulk_flow_count (q, &q->flows[reduced_hash], flow_mode); }if (allocate_dst) {
@@ -840,9 +896,10 @@ found_src: q->hosts[outer_hash + k].dsthost_tag = dsthost_hash; found_dst: dsthost_idx = outer_hash + k; -if (q->flows[reduced_hash].set ==CAKE_SET_BULK ) - q->hosts[dsthost_idx].dsthost_bulk_flow_count++; q->flows[reduced_hash].dsthost = dsthost_idx; + +if (q->flows[reduced_hash].set ==CAKE_SET_BULK ) +cake_inc_dsthost_bulk_flow_count (q, &q->flows[reduced_hash], flow_mode); } }
@@ -1855,10 +1912,6 @@ static s32 cake_enqueue(struct sk_buff */* flowchain */ if (!flow->set || flow->set ==CAKE_SET_DECAYING ) { -struct cake_host *srchost = &b->hosts[flow->srchost]; -struct cake_host *dsthost = &b->hosts[flow->dsthost]; -u16 host_load =1 ; -if (!flow->set) {list_add_tail (&flow->flowchain, &b->new_flows); }else {
@@ -1868,18 +1921,8 @@ static s32 cake_enqueue(struct sk_buff * flow->set =CAKE_SET_SPARSE ; b->sparse_flow_count++; -if (cake_dsrc (q->flow_mode)) - host_load =max (host_load, srchost->srchost_bulk_flow_count); - -if (cake_ddst (q->flow_mode)) - host_load =max (host_load, dsthost->dsthost_bulk_flow_count); - - flow->deficit = (b->flow_quantum * - quantum_div[host_load]) >>16 ; + flow->deficit =cake_get_flow_quantum (b, flow, q->flow_mode); }else if (flow->set ==CAKE_SET_SPARSE_WAIT ) { -struct cake_host *srchost = &b->hosts[flow->srchost]; -struct cake_host *dsthost = &b->hosts[flow->dsthost]; -/* this flow was empty, accounted as a sparse flow, but actually * in the bulk rotation. */
@@ -1887,12 +1930,8 @@ static s32 cake_enqueue(struct sk_buff * b->sparse_flow_count--; b->bulk_flow_count++; -if (cake_dsrc (q->flow_mode)) - srchost->srchost_bulk_flow_count++; - -if (cake_ddst (q->flow_mode)) - dsthost->dsthost_bulk_flow_count++; - +cake_inc_srchost_bulk_flow_count (b, flow, q->flow_mode); +cake_inc_dsthost_bulk_flow_count (b, flow, q->flow_mode); }if (q->buffer_used > q->buffer_max_used)
@@ -1949,13 +1988,11 @@ static struct sk_buff *cake_dequeue(stru {struct cake_sched_data *q =qdisc_priv (sch);struct cake_tin_data *b = &q->tins[q->cur_tin]; -struct cake_host *srchost, *dsthost;ktime_t now =ktime_get ();struct cake_flow *flow;struct list_head *head;bool first_flow = true;struct sk_buff *skb; -u16 host_load;u64 delay;u32 len;
@@ -2055,11 +2092,6 @@ retry: q->cur_flow = flow - b->flows; first_flow = false; -/* triple isolation (modified DRR++) */ - srchost = &b->hosts[flow->srchost]; - dsthost = &b->hosts[flow->dsthost]; - host_load =1 ; -/* flow isolation (DRR++) */ if (flow->deficit <=0 ) {/* Keep all flows with deficits out of the sparse and decaying
@@ -2071,11 +2103,8 @@ retry: b->sparse_flow_count--; b->bulk_flow_count++; -if (cake_dsrc (q->flow_mode)) - srchost->srchost_bulk_flow_count++; - -if (cake_ddst (q->flow_mode)) - dsthost->dsthost_bulk_flow_count++; +cake_inc_srchost_bulk_flow_count (b, flow, q->flow_mode); +cake_inc_dsthost_bulk_flow_count (b, flow, q->flow_mode); flow->set =CAKE_SET_BULK ; }else {
@@ -2087,19 +2116,7 @@ retry: } } -if (cake_dsrc (q->flow_mode)) - host_load =max (host_load, srchost->srchost_bulk_flow_count); - -if (cake_ddst (q->flow_mode)) - host_load =max (host_load, dsthost->dsthost_bulk_flow_count); - -WARN_ON (host_load >CAKE_QUEUES ); - -/* The shifted prandom_u32() is a way to apply dithering to -* avoid accumulating roundoff errors -*/ - flow->deficit += (b->flow_quantum * quantum_div[host_load] + - (prandom_u32 () >>16 )) >>16 ; + flow->deficit +=cake_get_flow_quantum (b, flow, q->flow_mode);list_move_tail (&flow->flowchain, &b->old_flows); goto retry;
@@ -2123,11 +2140,8 @@ retry:if (flow->set ==CAKE_SET_BULK ) { b->bulk_flow_count--; -if (cake_dsrc (q->flow_mode)) - srchost->srchost_bulk_flow_count--; - -if (cake_ddst (q->flow_mode)) - dsthost->dsthost_bulk_flow_count--; +cake_dec_srchost_bulk_flow_count (b, flow, q->flow_mode); +cake_dec_dsthost_bulk_flow_count (b, flow, q->flow_mode); b->decaying_flow_count++; } else if (flow->set == CAKE_SET_SPARSE ||
@@ -2145,12 +2159,8 @@ retry:else if (flow->set ==CAKE_SET_BULK ) { b->bulk_flow_count--; -if (cake_dsrc (q->flow_mode)) - srchost->srchost_bulk_flow_count--; - -if (cake_ddst (q->flow_mode)) - dsthost->dsthost_bulk_flow_count--; - +cake_dec_srchost_bulk_flow_count (b, flow, q->flow_mode); +cake_dec_dsthost_bulk_flow_count (b, flow, q->flow_mode); }else b->decaying_flow_count--;
Greg Kroah-Hartman
maintainerPATCH 619/620 kbuild: userprogs: use correct lld when linking through clang
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Thomas Wei�schuh" <[email protected]>
commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream.
The userprog infrastructure links objects files through $(CC). Either explicitly by manually calling $(CC) on multiple object files or implicitly by directly compiling a source file to an executable. The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld would be used for linking if LLVM=1 is specified.
However clang instead will use either a globally installed cross linker from $PATH called ${target}-ld or fall back to the system linker, which probably does not support crosslinking.
For the normal kernel build this is not an issue because the linker is always executed directly, without the compiler being involved.
Explicitly pass --ld-path to clang so $(LD) is respected.
As clang 13.0.1 is required to build the kernel, this option is available.
[nathan: use cc-option for 6.6 and older, as those trees support back to
clang-11]
--- Makefile | 5 +++++ 1 file changed, 5 insertions(+)
Makefile +5 -0
@@ -1114,6 +1114,11 @@ endif KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) +# userspace programs are linked via the compiler, use the correct linker +ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) +KBUILD_USERLDFLAGS += $(call cc-option, --ld-path=$(LD)) +endif + # make the checker run with the right architecture CHECKFLAGS += --arch=$(ARCH)
Greg Kroah-Hartman
maintainerPATCH 620/620 net: ipv6: fix dst refleaks in rpl, seg6 and ioam6 lwtunnels
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
commit c71a192976ded2f2f416d03c4f595cdd4478b825 upstream.
dst_cache_get() gives us a reference, we need to release it.
Discovered by the ioam6.sh test, kmemleak was recently fixed to catch per-cpu memory leaks.
--- net/ipv6/rpl_iptunnel.c | 6 ++++-- net/ipv6/seg6_iptunnel.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
net/ipv6/rpl_iptunnel.c +4 -2
@@ -232,7 +232,6 @@ static int rpl_output(struct net *net, s dst =ip6_route_output (net,NULL , &fl6);if (dst->error) { err = dst->error; -dst_release (dst); goto drop; }
@@ -251,6 +250,7 @@ static int rpl_output(struct net *net, sreturn dst_output (net, sk, skb); drop: +dst_release (dst);kfree_skb (skb);return err; }
@@ -277,8 +277,10 @@ static int rpl_input(struct sk_buff *skblocal_bh_enable (); err =rpl_do_srh (skb, rlwt, dst); -if (unlikely (err)) +if (unlikely (err)) { +dst_release (dst); goto drop; + }skb_dst_drop (skb);
net/ipv6/seg6_iptunnel.c +4 -2
@@ -490,8 +490,10 @@ static int seg6_input_core(struct net *nlocal_bh_enable (); err =seg6_do_srh (skb, dst); -if (unlikely (err)) +if (unlikely (err)) { +dst_release (dst); goto drop; + }skb_dst_drop (skb);
@@ -582,7 +584,6 @@ static int seg6_output_core(struct net * dst =ip6_route_output (net,NULL , &fl6);if (dst->error) { err = dst->error; -dst_release (dst); goto drop; }
@@ -604,6 +605,7 @@ static int seg6_output_core(struct net *return dst_output (net, sk, skb); drop: +dst_release (dst);kfree_skb (skb);return err; }
Re: [PATCH 5.15 620/620] net: ipv6: fix dst refleaks in rpl, seg6 and ioam6 lwtunnels
Quoted 7 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
commit
c71a192976ded2f2f416d03c4f595cdd4478b825upstream.
This backport to 5.15 seems to be correct. But why is this fix missing from the later 6.1 and 6.6 branches?
Ben.
Quoted 80 lines
dst_cache_get()gives us a reference, we need to release it.Discovered by the
ioam6.shtest, kmemleak was recently fixed to catch per-cpu memory leaks.Fixes 985ec6f5e623 ("net: ipv6: rpl_iptunnel: mitigate 2-realloc issue")Fixes 40475b63761a ("net: ipv6: seg6_iptunnel: mitigate 2-realloc issue")Fixes dce525185bc9 ("net: ipv6: ioam6_iptunnel: mitigate 2-realloc issue")Reviewed-by Justin Iurman <[email protected]>Reviewed-by Simon Horman <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- net/ipv6/rpl_iptunnel.c | 6 ++++-- net/ipv6/seg6_iptunnel.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)net/ipv6/rpl_iptunnel.c +4
-2@@ -232,7 +232,6 @@ static int rpl_output(struct net *net, s dst =ip6_route_output (net,NULL , &fl6);if (dst->error) { err = dst->error; -dst_release (dst); goto drop; }@@ -251,6 +250,7 @@ static int rpl_output(struct net *net, sreturn dst_output (net, sk, skb); drop: +dst_release (dst);kfree_skb (skb);return err; }@@ -277,8 +277,10 @@ static int rpl_input(struct sk_buff *skblocal_bh_enable (); err =rpl_do_srh (skb, rlwt, dst); -if (unlikely (err)) +if (unlikely (err)) { +dst_release (dst); goto drop; + }skb_dst_drop (skb);net/ipv6/seg6_iptunnel.c +4
-2@@ -490,8 +490,10 @@ static int seg6_input_core(struct net *nlocal_bh_enable (); err =seg6_do_srh (skb, dst); -if (unlikely (err)) +if (unlikely (err)) { +dst_release (dst); goto drop; + }skb_dst_drop (skb);@@ -582,7 +584,6 @@ static int seg6_output_core(struct net * dst =ip6_route_output (net,NULL , &fl6);if (dst->error) { err = dst->error; -dst_release (dst); goto drop; }@@ -604,6 +605,7 @@ static int seg6_output_core(struct net *return dst_output (net, sk, skb); drop: +dst_release (dst);kfree_skb (skb);return err; }
Signature · 2 lines
Ben Hutchings If at first you don't succeed, you're doing about average.
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 620/620] net: ipv6: fix dst refleaks in rpl, seg6 and ioam6 lwtunnels
Quoted 11 lines · Ben Hutchings
Quoted 7 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
commit
c71a192976ded2f2f416d03c4f595cdd4478b825upstream.This backport to 5.15 seems to be correct. But why is this fix missing from the later 6.1 and 6.6 branches?
I really do not know, sorry. I can't find it anywhere in my archives and it looks like I did this backport?
Also, it looks like the CVE for this was revoked, so it really isn't an issue?
I can try to backport it to 6.1 and 6.6 if you think it should go there.
thanks,
greg k-h
Hello,
Quoted 7 lines · On Mon, 10 Mar 2025 17:57:26 +0100 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +0000. Anything received after that time might be too late.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/damonitor/damon-tests/tree/next/corr
[2] cfe01cd80d85 ("Linux 5.15.179-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh # SKIP
ok 12 selftests: damon-tests: build_m68k.sh # SKIP
ok 13 selftests: damon-tests: build_i386_idle_flag.sh
ok 14 selftests: damon-tests: build_i386_highpte.sh
ok 15 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +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.15.179-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +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.15.179-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.15.179-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git commit: cfe01cd80d853c272b062feed8abd34216550de8
* git describe: v5.15.178-621-gcfe01cd80d85
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.178-621-gcfe01cd80d85
## Test Regressions (compared to v5.15.177-25-gcd260dae49a3)
## Metric Regressions (compared to v5.15.177-25-gcd260dae49a3)
## Test Fixes (compared to v5.15.177-25-gcd260dae49a3)
## Metric Fixes (compared to v5.15.177-25-gcd260dae49a3)
## Test result summary
total: 43796, pass: 30152, fail: 2641, skip: 10731, xfail: 272
## Build Summary
* arc: 6 total, 5 passed, 1 failed
* arm: 105 total, 105 passed, 0 failed
* arm64: 32 total, 32 passed, 0 failed
* i386: 25 total, 22 passed, 3 failed
* mips: 25 total, 22 passed, 3 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 25 total, 24 passed, 1 failed
* riscv: 10 total, 10 passed, 0 failed
* s390: 12 total, 11 passed, 1 failed
* sh: 12 total, 10 passed, 2 failed
* sparc: 8 total, 7 passed, 1 failed
* x86_64: 28 total, 28 passed, 0 failed
## Test suites summary
* boot
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-exec
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-kcmp
* kselftest-membarrier
* kselftest-memfd
* kselftest-mincore
* kselftest-mqueue
* kselftest-net
* kselftest-net-mptcp
* kselftest-openat2
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user_events
* kselftest-vDSO
* kselftest-x86
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-build-clang
* log-parser-build-gcc
* log-parser-test
* ltp-capability
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-crypto
* ltp-cve
* ltp-fcntl-locktests
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-hugetlb
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* perf
* rcutorture
--
Linaro LKFT
https://lkft.linaro.org
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +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.15.179-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
101 tests: 100 pass, 1 failLinux version: 5.15.179-rc1-gcfe01cd80d85
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000,
tegra194-p3509-0000+p3668-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Test failures: tegra194-p2972-0000: boot.py
Jon
Jon Hunter
maintainerHi Greg,
Quoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +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.15.179-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail 28 boots: 28 pass, 0 fail 101 tests: 100 pass, 1 fail
Quoted 8 lines
Linux version: 5.15.179-rc1-gcfe01cd80d85
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.py
With this update I am seeing the following kernel warnings for Tegra ...
WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip,
please consider fixing it!
WARNING KERN gpio gpiochip1: (tegra194-gpio): not an immutable chip,
please consider fixing it!
WARNING KERN gpio gpiochip2: (tegra194-gpio-aon): not an immutable
chip, please consider fixing it!
The above warning comes from commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as immutable") and to fix this for Tegra I believe that we need commits bba00555ede7 ("gpio: tegra186: Make the irqchip immutable") and 7f42aa7b008c ("gpio: max77620: Make the irqchip immutable"). There are other similar patches in the original series that I am guessing would be needed too.
Thanks
Jon
Signature · 1 line
nvpublic
Quoted 47 lines · Jon Hunter
Hi Greg,
Quoted 27 lines · Jon Hunter
Quoted 11 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.179-rc1.gzQuoted 7 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
101 tests: 100 pass, 1 failQuoted 8 lines
Linux version: 5.15.179-rc1-gcfe01cd80d85
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000, tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.pyWith this update I am seeing the following kernel warnings for Tegra ...
WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, please consider fixing it! WARNING KERN gpio gpiochip1: (tegra194-gpio): not an immutable chip, please consider fixing it! WARNING KERN gpio gpiochip2: (tegra194-gpio-aon): not an immutable
chip, please consider fixing it!
Quoted 4 lines
The above warning comes from commit
6c846d026d49("gpio: Don't fiddle with irqchips marked as immutable") and to fix this for Tegra I believe that we need commitsbba00555ede7("gpio: tegra186: Make the irqchip immutable") and7f42aa7b008c("gpio: max77620: Make the irqchip immutable"). There are other similar patches in the original series that I am guessing would be needed too.Thanks
Jon
Also seeing this on RISC-V.
[ 0.281617] gpio gpiochip0: (10060000.gpio): not an immutable chip, please consider fixing it!
Greg Kroah-Hartman
maintainerQuoted 58 lines · Ron Economos
Quoted 57 lines · Jon Hunter
Hi Greg,
Quoted 28 lines · Jon Hunter
Quoted 11 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.179-rc1.gzQuoted 8 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
linux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
101 tests: 100 pass, 1 failQuoted 8 lines
Linux version: 5.15.179-rc1-gcfe01cd80d85
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000, tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.pyWith this update I am seeing the following kernel warnings for Tegra ...
WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, please consider fixing it!
WARNING KERN gpio gpiochip1: (tegra194-gpio): not an immutable chip, please consider fixing it!
WARNING KERN gpio gpiochip2: (tegra194-gpio-aon): not an immutable chip, please consider fixing it!The above warning comes from commit
6c846d026d49("gpio: Don't fiddle with irqchips marked as immutable") and to fix this for Tegra I believe that we need commitsbba00555ede7("gpio: tegra186: Make the irqchip immutable") and7f42aa7b008c("gpio: max77620: Make the irqchip immutable"). There are other similar patches in the original series that I am guessing would be needed too.
Quoted 7 lines
Quoted 2 lines
Thanks
JonAlso seeing this on RISC-V.
[ 0.281617] gpio gpiochip0: (10060000.gpio): not an immutable chip, please consider fixing it!
Ugh, I think I know what that is, a patch slipped back in again, let me go dig...
Greg Kroah-Hartman
maintainerQuoted 62 lines · Greg Kroah-Hartman
Quoted 61 lines · Ron Economos
Quoted 59 lines · Jon Hunter
Hi Greg,
Quoted 28 lines · Jon Hunter
Quoted 11 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.179-rc1.gzQuoted 8 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
linux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
101 tests: 100 pass, 1 failQuoted 8 lines
Linux version: 5.15.179-rc1-gcfe01cd80d85
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000, tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.pyWith this update I am seeing the following kernel warnings for Tegra ...
WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, please consider fixing it!
WARNING KERN gpio gpiochip1: (tegra194-gpio): not an immutable chip, please consider fixing it!
WARNING KERN gpio gpiochip2: (tegra194-gpio-aon): not an immutable chip, please consider fixing it!The above warning comes from commit
6c846d026d49("gpio: Don't fiddle with irqchips marked as immutable") and to fix this for Tegra I believe that we need commitsbba00555ede7("gpio: tegra186: Make the irqchip immutable") and7f42aa7b008c("gpio: max77620: Make the irqchip immutable"). There are other similar patches in the original series that I am guessing would be needed too.Thanks
Jon
Quoted 7 lines
Quoted 4 lines
Also seeing this on RISC-V.
[ 0.281617] gpio gpiochip0: (10060000.gpio): not an immutable chip, please consider fixing it!
Ugh, I think I know what that is, a patch slipped back in again, let me go dig...
Found it, I'll push out a -rc2 later today with the fix.
thanks,
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.179 release. There are 620 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 12 Mar 2025 17:04:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.179-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
The kernel, bpf tool, perf tool, and kselftest builds fine for v5.15.179-rc1 on x86 and arm64 Azure VM.
Kernel binary size for x86 build:
text data bss dec hex filename 23546701 11254934 16400384 51202019 30d47e3 vmlinux
Kernel binary size for arm64 build:
text data bss dec hex filename 30786457 12639912 857980 44284349 2a3b9bd vmlinux
Thanks,
Hardik