5.10.235-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 308/462 ima: Fix use-after-free on a dentrys dname.name
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Berger <[email protected]>
commit be84f32bb2c981ca670922e047cdde1488b233de upstream.
->d_name.name can change on rename and the earlier value can be freed; there are conditions sufficient to stabilize it (->d_lock on dentry, ->d_lock on its parent, ->i_rwsem exclusive on the parent's inode, rename_lock), but none of those are met at any of the sites. Take a stable snapshot of the name instead.
--- security/integrity/ima/ima_api.c | 16 ++++++++++++---- security/integrity/ima/ima_template_lib.c | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-)
security/integrity/ima/ima_api.c +12 -4
@@ -213,7 +213,7 @@ int ima_collect_measurement(struct integconst char *audit_cause ="failed" ;struct inode *inode =file_inode (file);struct inode *real_inode =d_real_inode (file_dentry (file)); -const char *filename = file->f_path.dentry->d_name.name; +struct name_snapshot filename;int result =0 ;int length;void *tmpbuf;
@@ -276,9 +276,13 @@ out:if (file->f_flags &O_DIRECT ) audit_cause ="failed(directio)" ; +take_dentry_name_snapshot (&filename, file->f_path.dentry); +integrity_audit_msg (AUDIT_INTEGRITY_DATA , inode, - filename,"collect_data" , audit_cause, - result,0 ); + filename.name.name,"collect_data" , + audit_cause, result,0 ); + +release_dentry_name_snapshot (&filename); }return result; }
@@ -391,6 +395,7 @@ out:*/ const char *ima_d_path (const struct path *path,char **pathbuf,char *namebuf) { +struct name_snapshot filename;char *pathname =NULL ; *pathbuf =__getname ();
@@ -404,7 +409,10 @@ const char *ima_d_path(const struct path }if (!pathname) { -strlcpy (namebuf, path->dentry->d_name.name,NAME_MAX ); +take_dentry_name_snapshot (&filename, path->dentry); +strscpy (namebuf, filename.name.name,NAME_MAX ); +release_dentry_name_snapshot (&filename); + pathname = namebuf; }
security/integrity/ima/ima_template_lib.c +14 -3
@@ -385,7 +385,10 @@ static int ima_eventname_init_common(str bool size_limit) {const char *cur_filename =NULL ; +struct name_snapshot filename;u32 cur_filename_len =0 ; +bool snapshot = false; +int ret;BUG_ON (event_data->filename ==NULL && event_data->file ==NULL );
@@ -398,7 +401,10 @@ static int ima_eventname_init_common(str }if (event_data->file) { - cur_filename = event_data->file->f_path.dentry->d_name.name; +take_dentry_name_snapshot (&filename, + event_data->file->f_path.dentry); + snapshot = true; + cur_filename = filename.name.name; cur_filename_len =strlen (cur_filename); }else /*
@@ -407,8 +413,13 @@ static int ima_eventname_init_common(str*/ cur_filename_len =IMA_EVENT_NAME_LEN_MAX ; out: -return ima_write_template_field_data (cur_filename, cur_filename_len, -DATA_FMT_STRING , field_data); + ret =ima_write_template_field_data (cur_filename, cur_filename_len, +DATA_FMT_STRING , field_data); + +if (snapshot) +release_dentry_name_snapshot (&filename); + +return ret; }/*
Greg Kroah-Hartman
maintainerPATCH 309/462 vlan: introduce vlan_dev_free_egress_priority
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
commit 37aa50c539bcbcc01767e515bd170787fcfc0f33 upstream.
This patch is to introduce vlan_dev_free_egress_priority() to free egress priority for vlan dev, and keep vlan_dev_uninit() static as .ndo_uninit. It makes the code more clear and safer when adding new code in vlan_dev_uninit() in the future.
--- net/8021q/vlan.h | 2 +- net/8021q/vlan_dev.c | 7 ++++++- net/8021q/vlan_netlink.c | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-)
net/8021q/vlan.h +1 -1
@@ -124,6 +124,7 @@ void vlan_dev_set_ingress_priority(const u32 skb_prio, u16 vlan_prio);int vlan_dev_set_egress_priority (const struct net_device *dev,u32 skb_prio,u16 vlan_prio); +void vlan_dev_free_egress_priority (const struct net_device *dev);int vlan_dev_change_flags (const struct net_device *dev,u32 flag,u32 mask);void vlan_dev_get_realdev_name (const struct net_device *dev,char *result);
@@ -133,7 +134,6 @@ int vlan_check_real_dev(struct net_devicvoid vlan_setup (struct net_device *dev);int register_vlan_dev (struct net_device *dev,struct netlink_ext_ack *extack);void unregister_vlan_dev (struct net_device *dev,struct list_head *head); -void vlan_dev_uninit (struct net_device *dev);bool vlan_dev_inherit_address (struct net_device *dev,struct net_device *real_dev);
net/8021q/vlan_dev.c +6 -1
@@ -613,7 +613,7 @@ static int vlan_dev_init(struct net_devi }/* Note: this function might be called multiple times for the same device. */ -void vlan_dev_uninit (struct net_device *dev) +void vlan_dev_free_egress_priority (const struct net_device *dev) {struct vlan_priority_tci_mapping *pm;struct vlan_dev_priv *vlan =vlan_dev_priv (dev);
@@ -627,6 +627,11 @@ void vlan_dev_uninit(struct net_device * } } +static void vlan_dev_uninit (struct net_device *dev) +{ +vlan_dev_free_egress_priority (dev); +} +static netdev_features_t vlan_dev_fix_features (struct net_device *dev,netdev_features_t features) {
net/8021q/vlan_netlink.c +4 -3
@@ -187,10 +187,11 @@ static int vlan_newlink(struct net *src_return -EINVAL ; err =vlan_changelink (dev, tb, data, extack); -if (!err) - err =register_vlan_dev (dev, extack);if (err) -vlan_dev_uninit (dev); +return err; + err =register_vlan_dev (dev, extack); +if (err) +vlan_dev_free_egress_priority (dev);return err; }
Greg Kroah-Hartman
maintainerPATCH 310/462 vlan: move dev_put into vlan_dev_uninit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
commit d6ff94afd90b0ce8d1715f8ef77d4347d7a7f2c0 upstream.
Shuang Li reported an QinQ issue by simply doing:
# ip link add dummy0 type dummy # ip link add link dummy0 name dummy0.1 type vlan id 1 # ip link add link dummy0.1 name dummy0.1.2 type vlan id 2 # rmmod 8021q
unregister_netdevice: waiting for dummy0.1 to become free. Usage count = 1
When rmmods 8021q, all vlan devs are deleted from their real_dev's vlan grp and added into list_kill by unregister_vlan_dev(). dummy0.1 is unregistered before dummy0.1.2, as it's using for_each_netdev() in __rtnl_kill_links().
When unregisters dummy0.1, dummy0.1.2 is not unregistered in the event of NETDEV_UNREGISTER, as it's been deleted from dummy0.1's vlan grp. However, due to dummy0.1.2 still holding dummy0.1, dummy0.1 will keep waiting in netdev_wait_allrefs(), while dummy0.1.2 will never get unregistered and release dummy0.1, as it delays dev_put until calling dev->priv_destructor, vlan_dev_free().
This issue was introduced by Commit 563bcbae3ba2 ("net: vlan: fix a UAF in vlan_dev_real_dev()"), and this patch is to fix it by moving dev_put() into vlan_dev_uninit(), which is called after NETDEV_UNREGISTER event but before netdev_wait_allrefs().
--- net/8021q/vlan_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/8021q/vlan_dev.c +5 -3
@@ -629,7 +629,12 @@ void vlan_dev_free_egress_priority(conststatic void vlan_dev_uninit (struct net_device *dev) { +struct vlan_dev_priv *vlan =vlan_dev_priv (dev); +vlan_dev_free_egress_priority (dev); + +/* Get rid of the vlan's reference to real_dev */ +dev_put (vlan->real_dev); } static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
@@ -821,9 +826,6 @@ static void vlan_dev_free(struct net_devfree_percpu (vlan->vlan_pcpu_stats); vlan->vlan_pcpu_stats =NULL ; - -/* Get rid of the vlan's reference to real_dev */ -dev_put (vlan->real_dev); }void vlan_setup (struct net_device *dev)
Greg Kroah-Hartman
maintainerPATCH 311/462 nvme-pci: fix multiple races in nvme_setup_io_queues
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Chen <[email protected]>
commit e4b9852a0f4afe40604afb442e3af4452722050a upstream.
Below two paths could overlap each other if we power off a drive quickly after powering it on. There are multiple races in nvme_setup_io_queues() because of shutdown_lock missing and improper use of NVMEQ_ENABLED bit.
nvme_reset_work() nvme_remove()
nvme_setup_io_queues() nvme_dev_disable()
... ...
A1 clear NVMEQ_ENABLED bit for admin queue lock
retry: B1 nvme_suspend_io_queues()
A2 pci_free_irq() admin queue B2 nvme_suspend_queue() admin queue
A3 pci_free_irq_vectors() nvme_pci_disable()A4 nvme_setup_irqs(); B3 pci_free_irq_vectors()
... unlock
A5 queue_request_irq() for admin queue
set NVMEQ_ENABLED bit
...
nvme_create_io_queues()
A6 result = queue_request_irq();
set NVMEQ_ENABLED bit
...
fail to allocate enough IO queues:
A7 nvme_suspend_io_queues()
goto retry
If B3 runs in between A1 and A2, it will crash if irqaction haven't been freed by A2. B2 is supposed to free admin queue IRQ but it simply can't fulfill the job as A1 has cleared NVMEQ_ENABLED bit.
Fix: combine A1 A2 so IRQ get freed as soon as the NVMEQ_ENABLED bit gets cleared.
After solved #1, A2 could race with B3 if A2 is freeing IRQ while B3 is checking irqaction. A3 also could race with B2 if B2 is freeing IRQ while A3 is checking irqaction.
Fix: A2 and A3 take lock for mutual exclusion.
A3 could race with B3 since they could run free_msi_irqs() in parallel.
Fix: A3 takes lock for mutual exclusion.
A4 could fail to allocate all needed IRQ vectors if A3 and A4 are interrupted by B3.
Fix: A4 takes lock for mutual exclusion.
If A5/A6 happened after B2/B1, B3 will crash since irqaction is not NULL. They are just allocated by A5/A6.
Fix: Lock queue_request_irq() and setting of NVMEQ_ENABLED bit.
A7 could get chance to pci_free_irq() for certain IO queue while B3 is checking irqaction.
Fix: A7 takes lock.
nvme_dev->online_queues need to be protected by shutdown_lock. Since it is not atomic, both paths could modify it using its own copy.
--- drivers/nvme/host/pci.c | 66 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 8 deletions(-)
drivers/nvme/host/pci.c +58 -8
@@ -1563,6 +1563,28 @@ static void nvme_init_queue(struct nvme_wmb ();/* ensure the first interrupt sees the initialization */ } +/* +* Try getting shutdown_lock while setting up IO queues. +*/ +static int nvme_setup_io_queues_trylock (struct nvme_dev *dev) +{ +/* +* Give up if the lock is being held by nvme_dev_disable. +*/ +if (!mutex_trylock (&dev->shutdown_lock)) +return -ENODEV ; + +/* +* Controller is in wrong state, fail early. +*/ +if (dev->ctrl.state !=NVME_CTRL_CONNECTING ) { +mutex_unlock (&dev->shutdown_lock); +return -ENODEV ; + } + +return 0 ; +} +static int nvme_create_queue (struct nvme_queue *nvmeq,int qid,bool polled) {struct nvme_dev *dev = nvmeq->dev;
@@ -1591,8 +1613,11 @@ static int nvme_create_queue(struct nvme goto release_cq; nvmeq->cq_vector = vector; -nvme_init_queue (nvmeq, qid); + result =nvme_setup_io_queues_trylock (dev); +if (result) +return result; +nvme_init_queue (nvmeq, qid);if (!polled) { result =queue_request_irq (nvmeq);if (result <0 )
@@ -1600,10 +1625,12 @@ static int nvme_create_queue(struct nvme }set_bit (NVMEQ_ENABLED , &nvmeq->flags); +mutex_unlock (&dev->shutdown_lock);return result; release_sq: dev->online_queues--; +mutex_unlock (&dev->shutdown_lock);adapter_delete_sq (dev, qid); release_cq:adapter_delete_cq (dev, qid);
@@ -2182,7 +2209,18 @@ static int nvme_setup_io_queues(struct nif (nr_io_queues ==0 )return 0 ; -clear_bit (NVMEQ_ENABLED , &adminq->flags); +/* +* Free IRQ resources as soon as NVMEQ_ENABLED bit transitions +* from set to unset. If there is a window to it is truely freed, +* pci_free_irq_vectors() jumping into this window will crash. +* And take lock to avoid racing with pci_free_irq_vectors() in +* nvme_dev_disable() path. +*/ + result =nvme_setup_io_queues_trylock (dev); +if (result) +return result; +if (test_and_clear_bit (NVMEQ_ENABLED , &adminq->flags)) +pci_free_irq (pdev,0 , adminq);if (dev->cmb_use_sqes) { result = nvme_cmb_qdepth(dev, nr_io_queues,
@@ -2198,14 +2236,17 @@ static int nvme_setup_io_queues(struct n result =nvme_remap_bar (dev, size);if (!result)break ; -if (!--nr_io_queues) -return -ENOMEM ; +if (!--nr_io_queues) { + result = -ENOMEM ; + goto out_unlock; + } }while (1 ); adminq->q_db = dev->dbs; retry:/* Deregister the admin queue's interrupt */ -pci_free_irq (pdev,0 , adminq); +if (test_and_clear_bit (NVMEQ_ENABLED , &adminq->flags)) +pci_free_irq (pdev,0 , adminq);/* * If we enable msix early due to not intx, disable it again before
@@ -2214,8 +2255,10 @@ static int nvme_setup_io_queues(struct npci_free_irq_vectors (pdev); result =nvme_setup_irqs (dev, nr_io_queues); -if (result <=0 ) -return -EIO ; +if (result <=0 ) { + result = -EIO ; + goto out_unlock; + } dev->num_vecs = result; result =max (result -1 ,1 );
@@ -2229,8 +2272,9 @@ static int nvme_setup_io_queues(struct n*/ result =queue_request_irq (adminq);if (result) -return result; + goto out_unlock;set_bit (NVMEQ_ENABLED , &adminq->flags); +mutex_unlock (&dev->shutdown_lock); result =nvme_create_io_queues (dev);if (result || dev->online_queues <2 )
@@ -2239,6 +2283,9 @@ static int nvme_setup_io_queues(struct nif (dev->online_queues -1 < dev->max_qid) { nr_io_queues = dev->online_queues -1 ;nvme_disable_io_queues (dev); + result =nvme_setup_io_queues_trylock (dev); +if (result) +return result;nvme_suspend_io_queues (dev); goto retry; }
@@ -2247,6 +2294,9 @@ static int nvme_setup_io_queues(struct n dev->io_queues[HCTX_TYPE_READ ], dev->io_queues[HCTX_TYPE_POLL]);return 0 ; +out_unlock: +mutex_unlock (&dev->shutdown_lock); +return result; }static void nvme_del_queue_end (struct request *req,blk_status_t error)
Greg Kroah-Hartman
maintainerPATCH 312/462 arm64: mte: Do not allow PROT_MTE on MAP_HUGETLB user mappings
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Catalin Marinas <[email protected]>
PROT_MTE (memory tagging extensions) is not supported on all user mmap() types for various reasons (memory attributes, backing storage, CoW handling). The arm64 arch_validate_flags() function checks whether the VM_MTE_ALLOWED flag has been set for a vma during mmap(), usually by arch_calc_vm_flag_bits().
Linux prior to 6.13 does not support PROT_MTE hugetlb mappings. This was added by commit 25c17c4b55de ("hugetlb: arm64: add mte support"). However, earlier kernels inadvertently set VM_MTE_ALLOWED on (MAP_ANONYMOUS | MAP_HUGETLB) mappings by only checking for MAP_ANONYMOUS.
Explicitly check MAP_HUGETLB in arch_calc_vm_flag_bits() and avoid setting VM_MTE_ALLOWED for such mappings.
--- arch/arm64/include/asm/mman.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm64/include/asm/mman.h +6 -3
@@ -31,9 +31,12 @@ static inline unsigned long arch_calc_vm* backed by tags-capable memory. The vm_flags may be overridden by a * filesystem supporting MTE (RAM-based). */ -if (system_supports_mte () && - ((flags &MAP_ANONYMOUS ) ||shmem_file (file))) -return VM_MTE_ALLOWED ; +if (system_supports_mte ()) { +if ((flags &MAP_ANONYMOUS ) && !(flags &MAP_HUGETLB )) +return VM_MTE_ALLOWED ; +if (shmem_file (file)) +return VM_MTE_ALLOWED ; + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 313/462 crypto: testmgr - fix wrong key length for pkcs1pad
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lei He <[email protected]>
[ Upstream commit 39ef08517082a424b5b65c3dbaa6c0fa9d3303b9 ]
Fix wrong test data at testmgr.h, it seems to be caused by ignoring the last '\0' when calling sizeof.
--- crypto/testmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/testmgr.h +1 -1
@@ -777,7 +777,7 @@ static const struct akcipher_testvec pkcs1pad_rsa_tv_template[] = {"\xd1\x86\x48\x55\xce\x83\xee\x8e\x51\xc7\xde\x32\x12\x47\x7d\x46" "\xb8\x35\xdf\x41\x02\x01\x00\x02\x01\x00\x02\x01\x00\x02\x01\x00" "\x02\x01\x00", - .key_len = 804, + .key_len = 803,/* * m is SHA256 hash of following message: * "\x49\x41\xbe\x0a\x0c\xc9\xf6\x35\x51\xe4\x27\x56\x13\x71\x4b\xd0"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 314/462 crypto: testmgr - Fix wrong test case of RSA
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lei He <[email protected]>
[ Upstream commit a9887010ed2da3fddaff83ceec80e2b71be8a966 ]
According to the BER encoding rules, integer value should be encoded as two's complement, and if the highest bit of a positive integer is 1, should add a leading zero-octet.
The kernel's built-in RSA algorithm cannot recognize negative numbers when parsing keys, so it can pass this test case.
Export the key to file and run the following command to verify the fix result:
openssl asn1parse -inform DER -in /path/to/key/file
--- crypto/testmgr.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/testmgr.h +3 -3
@@ -257,9 +257,9 @@ static const struct akcipher_testvec rsa_tv_template[] = { }, {#endif .key = -"\x30\x82\x02\x1F" /* sequence of 543 bytes */ +"\x30\x82\x02\x20" /* sequence of 544 bytes */ "\x02\x01\x01" /* version - integer of 1 byte */ -"\x02\x82\x01\x00" /* modulus - integer of 256 bytes */ +"\x02\x82\x01\x01\x00" /* modulus - integer of 256 bytes */ "\xDB\x10\x1A\xC2\xA3\xF1\xDC\xFF\x13\x6B\xED\x44\xDF\xF0\x02\x6D" "\x13\xC7\x88\xDA\x70\x6B\x54\xF1\xE8\x27\xDC\xC3\x0F\x99\x6A\xFA" "\xC6\x67\xFF\x1D\x1E\x3C\x1D\xC1\xB5\x5F\x6C\xC0\xB2\x07\x3A\x6D"
@@ -299,7 +299,7 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\x02\x01\x00" /* exponent1 - integer of 1 byte */ "\x02\x01\x00" /* exponent2 - integer of 1 byte */ "\x02\x01\x00", /* coefficient - integer of 1 byte */ - .key_len = 547, + .key_len = 548, .m ="\x54\x85\x9b\x34\x2c\x49\xea\x2a" , .c ="\xb2\x97\x76\xb4\xae\x3e\x38\x3c\x7e\x64\x1f\xcc\xa2\x7f\xf6\xbe"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 315/462 crypto: testmgr - fix version number of RSA tests
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: lei he <[email protected]>
[ Upstream commit 0bb8f125253843c445b70fc6ef4fb21aa7b25625 ]
According to PKCS#1 standard, the 'otherPrimeInfos' field contains the information for the additional primes r_3, ..., r_u, in order. It shall be omitted if the version is 0 and shall contain at least one instance of OtherPrimeInfo if the version is 1, see:
https://www.rfc-editor.org/rfc/rfc3447#page-44
Replace the version number '1' with 0, otherwise, some drivers may not pass the run-time tests.
--- crypto/testmgr.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/testmgr.h +3 -3
@@ -184,7 +184,7 @@ static const struct akcipher_testvec rsa_tv_template[] = {#ifndef CONFIG_CRYPTO_FIPS .key ="\x30\x81\x9A" /* sequence of 154 bytes */ -"\x02\x01\x01" /* version - integer of 1 byte */ +"\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x41" /* modulus - integer of 65 bytes */ "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F" "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
@@ -214,7 +214,7 @@ static const struct akcipher_testvec rsa_tv_template[] = { }, { .key ="\x30\x82\x01\x1D" /* sequence of 285 bytes */ -"\x02\x01\x01" /* version - integer of 1 byte */ +"\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x81\x81" /* modulus - integer of 129 bytes */ "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71" "\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
@@ -258,7 +258,7 @@ static const struct akcipher_testvec rsa_tv_template[] = {#endif .key ="\x30\x82\x02\x20" /* sequence of 544 bytes */ -"\x02\x01\x01" /* version - integer of 1 byte */ +"\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x82\x01\x01\x00" /* modulus - integer of 256 bytes */ "\xDB\x10\x1A\xC2\xA3\xF1\xDC\xFF\x13\x6B\xED\x44\xDF\xF0\x02\x6D" "\x13\xC7\x88\xDA\x70\x6B\x54\xF1\xE8\x27\xDC\xC3\x0F\x99\x6A\xFA"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 316/462 crypto: testmgr - populate RSA CRT parameters in RSA test vectors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ignat Korchagin <[email protected]>
[ Upstream commit 79e6e2f3f3ff345947075341781e900e4f70db81 ]
Changes from v1:
* replace some accidental spaces with tabs
In commit f145d411a67e ("crypto: rsa - implement Chinese Remainder Theorem for faster private key operations") we have started to use the additional primes and coefficients for RSA private key operations. However, these additional parameters are not present (defined as 0 integers) in the RSA test vectors.
Some parameters were borrowed from OpenSSL, so I was able to find the source. I could not find the public source for 1 vector though, so had to recover the parameters by implementing Appendix C from [1].
[1]: https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Br1.pdf
--- crypto/testmgr.h | 121 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 100 insertions(+), 21 deletions(-)
crypto/testmgr.h +100 -21
@@ -183,7 +183,7 @@ static const struct akcipher_testvec rsa_tv_template[] = { {#ifndef CONFIG_CRYPTO_FIPS .key = -"\x30\x81\x9A" /* sequence of 154 bytes */ +"\x30\x82\x01\x38" /* sequence of 312 bytes */ "\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x41" /* modulus - integer of 65 bytes */ "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
@@ -197,23 +197,36 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64" "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9" "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51" -"\x02\x01\x00" /* prime1 - integer of 1 byte */ -"\x02\x01\x00" /* prime2 - integer of 1 byte */ -"\x02\x01\x00" /* exponent1 - integer of 1 byte */ -"\x02\x01\x00" /* exponent2 - integer of 1 byte */ - "\x02\x01\x00", /* coefficient - integer of 1 byte */ +"\x02\x21" /* prime1 - integer of 33 bytes */ +"\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5" +"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12" +"\x0D" +"\x02\x21" /* prime2 - integer of 33 bytes */ +"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9" +"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D" +"\x89" +"\x02\x20" /* exponent1 - integer of 32 bytes */ +"\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF" +"\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05" +"\x02\x21" /* exponent2 - integer of 33 bytes */ +"\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99" +"\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D" +"\x51" +"\x02\x20" /* coefficient - integer of 32 bytes */ +"\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8" + "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26", .m = "\x54\x85\x9b\x34\x2c\x49\xea\x2a", .c ="\x63\x1c\xcd\x7b\xe1\x7e\xe4\xde\xc9\xa8\x89\xa1\x74\xcb\x3c\x63" "\x7d\x24\xec\x83\xc3\x15\xe4\x7f\x73\x05\x34\xd1\xec\x22\xbb\x8a" "\x5e\x32\x39\x6d\xc1\x1d\x7d\x50\x3b\x9f\x7a\xad\xf0\x2e\x25\x53" "\x9f\x6e\xbd\x4c\x55\x84\x0c\x9b\xcf\x1a\x4b\x51\x1e\x9e\x0c\x06", - .key_len = 157, + .key_len = 316, .m_size = 8, .c_size =64 , }, { .key = -"\x30\x82\x01\x1D" /* sequence of 285 bytes */ +"\x30\x82\x02\x5B" /* sequence of 603 bytes */ "\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x81\x81" /* modulus - integer of 129 bytes */ "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
@@ -236,12 +249,35 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94" "\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3" "\xC1" -"\x02\x01\x00" /* prime1 - integer of 1 byte */ -"\x02\x01\x00" /* prime2 - integer of 1 byte */ -"\x02\x01\x00" /* exponent1 - integer of 1 byte */ -"\x02\x01\x00" /* exponent2 - integer of 1 byte */ - "\x02\x01\x00", /* coefficient - integer of 1 byte */ - .key_len = 289, +"\x02\x41" /* prime1 - integer of 65 bytes */ +"\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60" +"\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6" +"\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A" +"\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65" +"\x99" +"\x02\x41" /* prime2 - integer of 65 bytes */ +"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9" +"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D" +"\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5" +"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15" +"\x03" +"\x02\x40" /* exponent1 - integer of 64 bytes */ +"\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A" +"\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E" +"\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E" +"\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81" +"\x02\x40" /* exponent2 - integer of 64 bytes */ +"\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9" +"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7" +"\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D" +"\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D" +"\x02\x41" ,/* coefficient - integer of 65 bytes */ +"\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23" +"\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11" +"\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E" +"\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39" +"\xF7" , + .key_len = 607, .m = "\x54\x85\x9b\x34\x2c\x49\xea\x2a", .c ="\x74\x1b\x55\xac\x47\xb5\x08\x0a\x6e\x2b\x2d\xf7\x94\xb8\x8a\x95"
@@ -257,7 +293,7 @@ static const struct akcipher_testvec rsa_tv_template[] = { }, {#endif .key = -"\x30\x82\x02\x20" /* sequence of 544 bytes */ +"\x30\x82\x04\xA3" /* sequence of 1187 bytes */ "\x02\x01\x00" /* version - integer of 1 byte */ "\x02\x82\x01\x01\x00" /* modulus - integer of 256 bytes */ "\xDB\x10\x1A\xC2\xA3\xF1\xDC\xFF\x13\x6B\xED\x44\xDF\xF0\x02\x6D"
@@ -294,12 +330,55 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\x62\xFF\xE9\x46\xB8\xD8\x44\xDB\xA5\xCC\x31\x54\x34\xCE\x3E\x82" "\xD6\xBF\x7A\x0B\x64\x21\x6D\x88\x7E\x5B\x45\x12\x1E\x63\x8D\x49" "\xA7\x1D\xD9\x1E\x06\xCD\xE8\xBA\x2C\x8C\x69\x32\xEA\xBE\x60\x71" -"\x02\x01\x00" /* prime1 - integer of 1 byte */ -"\x02\x01\x00" /* prime2 - integer of 1 byte */ -"\x02\x01\x00" /* exponent1 - integer of 1 byte */ -"\x02\x01\x00" /* exponent2 - integer of 1 byte */ - "\x02\x01\x00", /* coefficient - integer of 1 byte */ - .key_len = 548, +"\x02\x81\x81" /* prime1 - integer of 129 bytes */ +"\x00\xFA\xAC\xE1\x37\x5E\x32\x11\x34\xC6\x72\x58\x2D\x91\x06\x3E" +"\x77\xE7\x11\x21\xCD\x4A\xF8\xA4\x3F\x0F\xEF\x31\xE3\xF3\x55\xA0" +"\xB9\xAC\xB6\xCB\xBB\x41\xD0\x32\x81\x9A\x8F\x7A\x99\x30\x77\x6C" +"\x68\x27\xE2\x96\xB5\x72\xC9\xC3\xD4\x42\xAA\xAA\xCA\x95\x8F\xFF" +"\xC9\x9B\x52\x34\x30\x1D\xCF\xFE\xCF\x3C\x56\x68\x6E\xEF\xE7\x6C" +"\xD7\xFB\x99\xF5\x4A\xA5\x21\x1F\x2B\xEA\x93\xE8\x98\x26\xC4\x6E" +"\x42\x21\x5E\xA0\xA1\x2A\x58\x35\xBB\x10\xE7\xBA\x27\x0A\x3B\xB3" +"\xAF\xE2\x75\x36\x04\xAC\x56\xA0\xAB\x52\xDE\xCE\xDD\x2C\x28\x77" +"\x03" +"\x02\x81\x81" /* prime2 - integer of 129 bytes */ +"\x00\xDF\xB7\x52\xB6\xD7\xC0\xE2\x96\xE7\xC9\xFE\x5D\x71\x5A\xC4" +"\x40\x96\x2F\xE5\x87\xEA\xF3\xA5\x77\x11\x67\x3C\x8D\x56\x08\xA7" +"\xB5\x67\xFA\x37\xA8\xB8\xCF\x61\xE8\x63\xD8\x38\x06\x21\x2B\x92" +"\x09\xA6\x39\x3A\xEA\xA8\xB4\x45\x4B\x36\x10\x4C\xE4\x00\x66\x71" +"\x65\xF8\x0B\x94\x59\x4F\x8C\xFD\xD5\x34\xA2\xE7\x62\x84\x0A\xA7" +"\xBB\xDB\xD9\x8A\xCD\x05\xE1\xCC\x57\x7B\xF1\xF1\x1F\x11\x9D\xBA" +"\x3E\x45\x18\x99\x1B\x41\x64\x43\xEE\x97\x5D\x77\x13\x5B\x74\x69" +"\x73\x87\x95\x05\x07\xBE\x45\x07\x17\x7E\x4A\x69\x22\xF3\xDB\x05" +"\x39" +"\x02\x81\x80" /* exponent1 - integer of 128 bytes */ +"\x5E\xD8\xDC\xDA\x53\x44\xC4\x67\xE0\x92\x51\x34\xE4\x83\xA5\x4D" +"\x3E\xDB\xA7\x9B\x82\xBB\x73\x81\xFC\xE8\x77\x4B\x15\xBE\x17\x73" +"\x49\x9B\x5C\x98\xBC\xBD\x26\xEF\x0C\xE9\x2E\xED\x19\x7E\x86\x41" +"\x1E\x9E\x48\x81\xDD\x2D\xE4\x6F\xC2\xCD\xCA\x93\x9E\x65\x7E\xD5" +"\xEC\x73\xFD\x15\x1B\xA2\xA0\x7A\x0F\x0D\x6E\xB4\x53\x07\x90\x92" +"\x64\x3B\x8B\xA9\x33\xB3\xC5\x94\x9B\x4C\x5D\x9C\x7C\x46\xA4\xA5" +"\x56\xF4\xF3\xF8\x27\x0A\x7B\x42\x0D\x92\x70\x47\xE7\x42\x51\xA9" +"\xC2\x18\xB1\x58\xB1\x50\x91\xB8\x61\x41\xB6\xA9\xCE\xD4\x7C\xBB" +"\x02\x81\x80" /* exponent2 - integer of 128 bytes */ +"\x54\x09\x1F\x0F\x03\xD8\xB6\xC5\x0C\xE8\xB9\x9E\x0C\x38\x96\x43" +"\xD4\xA6\xC5\x47\xDB\x20\x0E\xE5\xBD\x29\xD4\x7B\x1A\xF8\x41\x57" +"\x49\x69\x9A\x82\xCC\x79\x4A\x43\xEB\x4D\x8B\x2D\xF2\x43\xD5\xA5" +"\xBE\x44\xFD\x36\xAC\x8C\x9B\x02\xF7\x9A\x03\xE8\x19\xA6\x61\xAE" +"\x76\x10\x93\x77\x41\x04\xAB\x4C\xED\x6A\xCC\x14\x1B\x99\x8D\x0C" +"\x6A\x37\x3B\x86\x6C\x51\x37\x5B\x1D\x79\xF2\xA3\x43\x10\xC6\xA7" +"\x21\x79\x6D\xF9\xE9\x04\x6A\xE8\x32\xFF\xAE\xFD\x1C\x7B\x8C\x29" +"\x13\xA3\x0C\xB2\xAD\xEC\x6C\x0F\x8D\x27\x12\x7B\x48\xB2\xDB\x31" +"\x02\x81\x81" ,/* coefficient - integer of 129 bytes */ +"\x00\x8D\x1B\x05\xCA\x24\x1F\x0C\x53\x19\x52\x74\x63\x21\xFA\x78" +"\x46\x79\xAF\x5C\xDE\x30\xA4\x6C\x20\x38\xE6\x97\x39\xB8\x7A\x70" +"\x0D\x8B\x6C\x6D\x13\x74\xD5\x1C\xDE\xA9\xF4\x60\x37\xFE\x68\x77" +"\x5E\x0B\x4E\x5E\x03\x31\x30\xDF\xD6\xAE\x85\xD0\x81\xBB\x61\xC7" +"\xB1\x04\x5A\xC4\x6D\x56\x1C\xD9\x64\xE7\x85\x7F\x88\x91\xC9\x60" +"\x28\x05\xE2\xC6\x24\x8F\xDD\x61\x64\xD8\x09\xDE\x7E\xD3\x4A\x61" +"\x1A\xD3\x73\x58\x4B\xD8\xA0\x54\x25\x48\x83\x6F\x82\x6C\xAF\x36" +"\x51\x2A\x5D\x14\x2F\x41\x25\x00\xDD\xF8\xF3\x95\xFE\x31\x25\x50" +"\x12" , + .key_len = 1191, .m = "\x54\x85\x9b\x34\x2c\x49\xea\x2a", .c ="\xb2\x97\x76\xb4\xae\x3e\x38\x3c\x7e\x64\x1f\xcc\xa2\x7f\xf6\xbe"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 317/462 crypto: testmgr - some more fixes to RSA test vectors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ignat Korchagin <[email protected]>
[ Upstream commit 9d2bb9a74b2877f100637d6ab5685bcd33c69d44 ]
Two more fixes:
* some test vectors in commit 79e6e2f3f3ff ("crypto: testmgr - populate RSA CRT parameters in RSA test vectors") had misplaced commas, which break the test and trigger KASAN warnings at least on x86-64
* pkcs1pad test vector did not have its CRT parameters
--- crypto/testmgr.h | 102 +++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 39 deletions(-)
crypto/testmgr.h +63 -39
@@ -271,7 +271,7 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7" "\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D" "\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D" -"\x02\x41" ,/* coefficient - integer of 65 bytes */ +"\x02\x41" /* coefficient - integer of 65 bytes */ "\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23" "\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11" "\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
@@ -368,7 +368,7 @@ static const struct akcipher_testvec rsa_tv_template[] = {"\x6A\x37\x3B\x86\x6C\x51\x37\x5B\x1D\x79\xF2\xA3\x43\x10\xC6\xA7" "\x21\x79\x6D\xF9\xE9\x04\x6A\xE8\x32\xFF\xAE\xFD\x1C\x7B\x8C\x29" "\x13\xA3\x0C\xB2\xAD\xEC\x6C\x0F\x8D\x27\x12\x7B\x48\xB2\xDB\x31" -"\x02\x81\x81" ,/* coefficient - integer of 129 bytes */ +"\x02\x81\x81" /* coefficient - integer of 129 bytes */ "\x00\x8D\x1B\x05\xCA\x24\x1F\x0C\x53\x19\x52\x74\x63\x21\xFA\x78" "\x46\x79\xAF\x5C\xDE\x30\xA4\x6C\x20\x38\xE6\x97\x39\xB8\x7A\x70" "\x0D\x8B\x6C\x6D\x13\x74\xD5\x1C\xDE\xA9\xF4\x60\x37\xFE\x68\x77"
@@ -805,7 +805,7 @@ static const struct akcipher_testvec ecrdsa_tv_template[] = {static const struct akcipher_testvec pkcs1pad_rsa_tv_template[] = { { .key = -"\x30\x82\x03\x1f\x02\x01\x00\x02\x82\x01\x01\x00\xd7\x1e\x77\x82" +"\x30\x82\x04\xa5\x02\x01\x00\x02\x82\x01\x01\x00\xd7\x1e\x77\x82" "\x8c\x92\x31\xe7\x69\x02\xa2\xd5\x5c\x78\xde\xa2\x0c\x8f\xfe\x28" "\x59\x31\xdf\x40\x9c\x60\x61\x06\xb9\x2f\x62\x40\x80\x76\xcb\x67" "\x4a\xb5\x59\x56\x69\x17\x07\xfa\xf9\x4c\xbd\x6c\x37\x7a\x46\x7d"
@@ -821,42 +821,66 @@ static const struct akcipher_testvec pkcs1pad_rsa_tv_template[] = {"\x9e\x49\x63\x6e\x02\xc1\xc9\x3a\x9b\xa5\x22\x1b\x07\x95\xd6\x10" "\x02\x50\xfd\xfd\xd1\x9b\xbe\xab\xc2\xc0\x74\xd7\xec\x00\xfb\x11" "\x71\xcb\x7a\xdc\x81\x79\x9f\x86\x68\x46\x63\x82\x4d\xb7\xf1\xe6" -"\x16\x6f\x42\x63\xf4\x94\xa0\xca\x33\xcc\x75\x13\x02\x82\x01\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x01" -"\x02\x82\x01\x00\x62\xb5\x60\x31\x4f\x3f\x66\x16\xc1\x60\xac\x47" -"\x2a\xff\x6b\x69\x00\x4a\xb2\x5c\xe1\x50\xb9\x18\x74\xa8\xe4\xdc" -"\xa8\xec\xcd\x30\xbb\xc1\xc6\xe3\xc6\xac\x20\x2a\x3e\x5e\x8b\x12" -"\xe6\x82\x08\x09\x38\x0b\xab\x7c\xb3\xcc\x9c\xce\x97\x67\xdd\xef" -"\x95\x40\x4e\x92\xe2\x44\xe9\x1d\xc1\x14\xfd\xa9\xb1\xdc\x71\x9c" -"\x46\x21\xbd\x58\x88\x6e\x22\x15\x56\xc1\xef\xe0\xc9\x8d\xe5\x80" -"\x3e\xda\x7e\x93\x0f\x52\xf6\xf5\xc1\x91\x90\x9e\x42\x49\x4f\x8d" -"\x9c\xba\x38\x83\xe9\x33\xc2\x50\x4f\xec\xc2\xf0\xa8\xb7\x6e\x28" -"\x25\x56\x6b\x62\x67\xfe\x08\xf1\x56\xe5\x6f\x0e\x99\xf1\xe5\x95" -"\x7b\xef\xeb\x0a\x2c\x92\x97\x57\x23\x33\x36\x07\xdd\xfb\xae\xf1" -"\xb1\xd8\x33\xb7\x96\x71\x42\x36\xc5\xa4\xa9\x19\x4b\x1b\x52\x4c" -"\x50\x69\x91\xf0\x0e\xfa\x80\x37\x4b\xb5\xd0\x2f\xb7\x44\x0d\xd4" -"\xf8\x39\x8d\xab\x71\x67\x59\x05\x88\x3d\xeb\x48\x48\x33\x88\x4e" -"\xfe\xf8\x27\x1b\xd6\x55\x60\x5e\x48\xb7\x6d\x9a\xa8\x37\xf9\x7a" -"\xde\x1b\xcd\x5d\x1a\x30\xd4\xe9\x9e\x5b\x3c\x15\xf8\x9c\x1f\xda" -"\xd1\x86\x48\x55\xce\x83\xee\x8e\x51\xc7\xde\x32\x12\x47\x7d\x46" -"\xb8\x35\xdf\x41\x02\x01\x00\x02\x01\x00\x02\x01\x00\x02\x01\x00" - "\x02\x01\x00", - .key_len = 803, +"\x16\x6f\x42\x63\xf4\x94\xa0\xca\x33\xcc\x75\x13\x02\x03\x01\x00" +"\x01\x02\x82\x01\x00\x62\xb5\x60\x31\x4f\x3f\x66\x16\xc1\x60\xac" +"\x47\x2a\xff\x6b\x69\x00\x4a\xb2\x5c\xe1\x50\xb9\x18\x74\xa8\xe4" +"\xdc\xa8\xec\xcd\x30\xbb\xc1\xc6\xe3\xc6\xac\x20\x2a\x3e\x5e\x8b" +"\x12\xe6\x82\x08\x09\x38\x0b\xab\x7c\xb3\xcc\x9c\xce\x97\x67\xdd" +"\xef\x95\x40\x4e\x92\xe2\x44\xe9\x1d\xc1\x14\xfd\xa9\xb1\xdc\x71" +"\x9c\x46\x21\xbd\x58\x88\x6e\x22\x15\x56\xc1\xef\xe0\xc9\x8d\xe5" +"\x80\x3e\xda\x7e\x93\x0f\x52\xf6\xf5\xc1\x91\x90\x9e\x42\x49\x4f" +"\x8d\x9c\xba\x38\x83\xe9\x33\xc2\x50\x4f\xec\xc2\xf0\xa8\xb7\x6e" +"\x28\x25\x56\x6b\x62\x67\xfe\x08\xf1\x56\xe5\x6f\x0e\x99\xf1\xe5" +"\x95\x7b\xef\xeb\x0a\x2c\x92\x97\x57\x23\x33\x36\x07\xdd\xfb\xae" +"\xf1\xb1\xd8\x33\xb7\x96\x71\x42\x36\xc5\xa4\xa9\x19\x4b\x1b\x52" +"\x4c\x50\x69\x91\xf0\x0e\xfa\x80\x37\x4b\xb5\xd0\x2f\xb7\x44\x0d" +"\xd4\xf8\x39\x8d\xab\x71\x67\x59\x05\x88\x3d\xeb\x48\x48\x33\x88" +"\x4e\xfe\xf8\x27\x1b\xd6\x55\x60\x5e\x48\xb7\x6d\x9a\xa8\x37\xf9" +"\x7a\xde\x1b\xcd\x5d\x1a\x30\xd4\xe9\x9e\x5b\x3c\x15\xf8\x9c\x1f" +"\xda\xd1\x86\x48\x55\xce\x83\xee\x8e\x51\xc7\xde\x32\x12\x47\x7d" +"\x46\xb8\x35\xdf\x41\x02\x81\x81\x00\xe4\x4c\xae\xde\x16\xfd\x9f" +"\x83\x55\x5b\x84\x4a\xcf\x1c\xf1\x37\x95\xad\xca\x29\x7f\x2d\x6e" +"\x32\x81\xa4\x2b\x26\x14\x96\x1d\x40\x05\xec\x0c\xaf\x3f\x2c\x6f" +"\x2c\xe8\xbf\x1d\xee\xd0\xb3\xef\x7c\x5b\x9e\x88\x4f\x2a\x8b\x0e" +"\x4a\xbd\xb7\x8c\xfa\x10\x0e\x3b\xda\x68\xad\x41\x2b\xe4\x96\xfa" +"\x7f\x80\x52\x5f\x07\x9f\x0e\x3b\x5e\x96\x45\x1a\x13\x2b\x94\xce" +"\x1f\x07\x69\x85\x35\xfc\x69\x63\x5b\xf8\xf8\x3f\xce\x9d\x40\x1e" +"\x7c\xad\xfb\x9e\xce\xe0\x01\xf8\xef\x59\x5d\xdc\x00\x79\xab\x8a" +"\x3f\x80\xa2\x76\x32\x94\xa9\xea\x65\x02\x81\x81\x00\xf1\x38\x60" +"\x90\x0d\x0c\x2e\x3d\x34\xe5\x90\xea\x21\x43\x1f\x68\x63\x16\x7b" +"\x25\x8d\xde\x82\x2b\x52\xf8\xa3\xfd\x0f\x39\xe7\xe9\x5e\x32\x75" +"\x15\x7d\xd0\xc9\xce\x06\xe5\xfb\xa9\xcb\x22\xe5\xdb\x49\x09\xf2" +"\xe6\xb7\xa5\xa7\x75\x2e\x91\x2d\x2b\x5d\xf1\x48\x61\x45\x43\xd7" +"\xbd\xfc\x11\x73\xb5\x11\x9f\xb2\x18\x3a\x6f\x36\xa7\xc2\xd3\x18" +"\x4d\xf0\xc5\x1f\x70\x8c\x9b\xc5\x1d\x95\xa8\x5a\x9e\x8c\xb1\x4b" +"\x6a\x2a\x84\x76\x2c\xd8\x4f\x47\xb0\x81\x84\x02\x45\xf0\x85\xf8" +"\x0c\x6d\xa7\x0c\x4d\x2c\xb2\x5b\x81\x70\xfd\x6e\x17\x02\x81\x81" +"\x00\x8d\x07\xc5\xfa\x92\x4f\x48\xcb\xd3\xdd\xfe\x02\x4c\xa1\x7f" +"\x6d\xab\xfc\x38\xe7\x9b\x95\xcf\xfe\x49\x51\xc6\x09\xf7\x2b\xa8" +"\x94\x15\x54\x75\x9d\x88\xb4\x05\x55\xc3\xcd\xd4\x4a\xe4\x08\x53" +"\xc8\x09\xbd\x0c\x4d\x83\x65\x75\x85\xbc\x5e\xf8\x2a\xbd\xe2\x5d" +"\x1d\x16\x0e\xf9\x34\x89\x38\xaf\x34\x36\x6c\x2c\x22\x44\x22\x81" +"\x90\x73\xd9\xea\x3a\xaf\x70\x74\x48\x7c\xc6\xb5\xb0\xdc\xe5\xa9" +"\xa8\x76\x4b\xbc\xf7\x00\xf3\x4c\x22\x0f\x44\x62\x1d\x40\x0a\x57" +"\xe2\x5b\xdd\x7c\x7b\x9a\xad\xda\x70\x52\x21\x8a\x4c\xc2\xc3\x98" +"\x75\x02\x81\x81\x00\xed\x24\x5c\xa2\x21\x81\xa1\x0f\xa1\x2a\x33" +"\x0e\x49\xc7\x00\x60\x92\x51\x6e\x9d\x9b\xdc\x6d\x22\x04\x7e\xd6" +"\x51\x19\x9f\xf6\xe3\x91\x2c\x8f\xb8\xa2\x29\x19\xcc\x47\x31\xdf" +"\xf8\xab\xf0\xd2\x02\x83\xca\x99\x16\xc2\xe2\xc3\x3f\x4b\x99\x83" +"\xcb\x87\x9e\x86\x66\xc2\x3e\x91\x21\x80\x66\xf3\xd6\xc5\xcd\xb6" +"\xbb\x64\xef\x22\xcf\x48\x94\x58\xe7\x7e\xd5\x7c\x34\x1c\xb7\xa2" +"\xd0\x93\xe9\x9f\xb5\x11\x61\xd7\x5f\x37\x0f\x64\x52\x70\x11\x78" +"\xcc\x08\x77\xeb\xf8\x30\x1e\xb4\x9e\x1b\x4a\xc7\xa8\x33\x51\xe0" +"\xed\xdf\x53\xf6\xdf\x02\x81\x81\x00\x86\xd9\x4c\xee\x65\x61\xc1" +"\x19\xa9\xd5\x74\x9b\xd5\xca\xf6\x83\x2b\x06\xb4\x20\xfe\x45\x29" +"\xe8\xe3\xfa\xe1\x4f\x28\x8e\x63\x2f\x74\xc3\x3a\x5c\x9a\xf5\x9e" +"\x0e\x0d\xc5\xfe\xa0\x4c\x00\xce\x7b\xa4\x19\x17\x59\xaf\x13\x3a" +"\x03\x8f\x54\xf5\x60\x39\x2e\xd9\x06\xb3\x7c\xd6\x90\x06\x41\x77" +"\xf3\x93\xe1\x7a\x01\x41\xc1\x8f\xfe\x4c\x88\x39\xdb\xde\x71\x9e" +"\x58\xd1\x49\x50\x80\xb2\x5a\x4f\x69\x8b\xb8\xfe\x63\xd4\x42\x3d" +"\x37\x61\xa8\x4c\xff\xb6\x99\x4c\xf4\x51\xe0\x44\xaa\x69\x79\x3f" + "\x81\xa4\x61\x3d\x26\xe9\x04\x52\x64", + .key_len = 1193,/* * m is SHA256 hash of following message: * "\x49\x41\xbe\x0a\x0c\xc9\xf6\x35\x51\xe4\x27\x56\x13\x71\x4b\xd0"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 318/462 mm: update mark_victim tracepoints fields
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Galo <[email protected]>
[ Upstream commit 72ba14deb40a9e9668ec5e66a341ed657e5215c2 ]
The current implementation of the mark_victim tracepoint provides only the process ID (pid) of the victim process. This limitation poses challenges for userspace tools requiring real-time OOM analysis and intervention. Although this information is available from the kernel logs, it’s not the appropriate format to provide OOM notifications. In Android, BPF programs are used with the mark_victim trace events to notify userspace of an OOM kill. For consistency, update the trace event to include the same information about the OOMed victim as the kernel logs.
- UID
In Android each installed application has a unique UID. Including the uid assists in correlating OOM events with specific apps.
- Process Name (comm)
Enables identification of the affected process.
- OOM Score
Will allow userspace to get additional insight of the relative kill priority of the OOM victim. In Android, the oom_score_adj is used to categorize app state (foreground, background, etc.), which aids in analyzing user-perceptible impacts of OOM events [1].
- Total VM, RSS Stats, and pgtables
Amount of memory used by the victim that will, potentially, be freed up by killing it.
Stable-dep-of: ade81479c7dd ("memcg: fix soft lockup in the OOM process")
--- include/trace/events/oom.h | 36 ++++++++++++++++++++++++++++++++---- mm/oom_kill.c | 6 +++++- 2 files changed, 37 insertions(+), 5 deletions(-)
include/trace/events/oom.h +32 -4
@@ -7,6 +7,8 @@#include <linux/tracepoint.h> #include <trace/events/mmflags.h> +#define PG_COUNT_TO_KB (x) ((x) << (PAGE_SHIFT - 10)) + TRACE_EVENT(oom_score_adj_update, TP_PROTO(struct task_struct *task),
@@ -72,19 +74,45 @@ TRACE_EVENT(reclaim_retry_zone, );TRACE_EVENT (mark_victim, - TP_PROTO(int pid), + TP_PROTO(struct task_struct *task, uid_t uid), -TP_ARGS (pid), +TP_ARGS (task, uid),TP_STRUCT__entry ( __field(int, pid) + __string(comm, task->comm) + __field(unsigned long, total_vm) + __field(unsigned long, anon_rss) + __field(unsigned long, file_rss) + __field(unsigned long, shmem_rss) + __field(uid_t, uid) + __field(unsigned long, pgtables) +__field (short, oom_score_adj) ),TP_fast_assign ( - __entry->pid = pid; + __entry->pid = task->pid; + __assign_str(comm, task->comm); + __entry->total_vm = PG_COUNT_TO_KB(task->mm->total_vm); + __entry->anon_rss = PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_ANONPAGES)); + __entry->file_rss = PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_FILEPAGES)); + __entry->shmem_rss = PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_SHMEMPAGES)); + __entry->uid = uid; + __entry->pgtables = mm_pgtables_bytes(task->mm) >> 10; + __entry->oom_score_adj = task->signal->oom_score_adj; ), -TP_printk ("pid=%d" , __entry->pid) +TP_printk ("pid=%d comm=%s total-vm=%lukB anon-rss=%lukB file-rss:%lukB shmem-rss:%lukB uid=%u pgtables=%lukB oom_score_adj=%hd" , + __entry->pid, +__get_str (comm), + __entry->total_vm, + __entry->anon_rss, + __entry->file_rss, + __entry->shmem_rss, + __entry->uid, + __entry->pgtables, + __entry->oom_score_adj + ) ); TRACE_EVENT(wake_reaper,
mm/oom_kill.c +5 -1
@@ -43,6 +43,7 @@#include <linux/kthread.h> #include <linux/init.h> #include <linux/mmu_notifier.h> +#include <linux/cred.h> #include <asm/tlb.h> #include "internal.h"
@@ -723,6 +724,7 @@ static inline void queue_oom_reaper(struct task_struct *tsk)*/ static void mark_oom_victim (struct task_struct *tsk) { +const struct cred *cred;struct mm_struct *mm = tsk->mm;WARN_ON (oom_killer_disabled);
@@ -744,7 +746,9 @@ static void mark_oom_victim(struct task_struct *tsk)*/ __thaw_task (tsk);atomic_inc (&oom_victims); -trace_mark_victim (tsk->pid); + cred =get_task_cred (tsk); +trace_mark_victim (tsk, cred->uid.val); +put_cred (cred); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 319/462 memcg: fix soft lockup in the OOM process
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ridong <[email protected]>
[ Upstream commit ade81479c7dda1ce3eedb215c78bc615bbd04f06 ]
A soft lockup issue was found in the product with about 56,000 tasks were in the OOM cgroup, it was traversing them when the soft lockup was triggered.
watchdog: BUG: soft lockup - CPU#2 stuck for 23s! [VM Thread:1503066] CPU: 2 PID: 1503066 Comm: VM Thread Kdump: loaded Tainted: G Hardware name: Huawei Cloud OpenStack Nova, BIOS RIP: 0010:console_unlock+0x343/0x540 RSP: 0000:ffffb751447db9a0 EFLAGS: 00000247 ORIG_RAX: ffffffffffffff13 RAX: 0000000000000001 RBX: 0000000000000000 RCX: 00000000ffffffff RDX: 0000000000000000 RSI: 0000000000000004 RDI: 0000000000000247 RBP: ffffffffafc71f90 R08: 0000000000000000 R09: 0000000000000040 R10: 0000000000000080 R11: 0000000000000000 R12: ffffffffafc74bd0 R13: ffffffffaf60a220 R14: 0000000000000247 R15: 0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f2fe6ad91f0 CR3: 00000004b2076003 CR4: 0000000000360ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: vprintk_emit+0x193/0x280 printk+0x52/0x6e dump_task+0x114/0x130 mem_cgroup_scan_tasks+0x76/0x100 dump_header+0x1fe/0x210 oom_kill_process+0xd1/0x100 out_of_memory+0x125/0x570 mem_cgroup_out_of_memory+0xb5/0xd0 try_charge+0x720/0x770 mem_cgroup_try_charge+0x86/0x180 mem_cgroup_try_charge_delay+0x1c/0x40 do_anonymous_page+0xb5/0x390 handle_mm_fault+0xc4/0x1f0
This is because thousands of processes are in the OOM cgroup, it takes a long time to traverse all of them. As a result, this lead to soft lockup in the OOM process.
To fix this issue, call 'cond_resched' in the 'mem_cgroup_scan_tasks' function per 1000 iterations. For global OOM, call 'touch_softlockup_watchdog' per 1000 iterations to avoid this issue.
--- mm/memcontrol.c | 7 ++++++- mm/oom_kill.c | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
mm/memcontrol.c +6 -1
@@ -1312,6 +1312,7 @@ int mem_cgroup_scan_tasks(struct mem_cgroup *memcg, {struct mem_cgroup *iter;int ret =0 ; +int i =0 ;BUG_ON (memcg == root_mem_cgroup);
@@ -1320,8 +1321,12 @@ int mem_cgroup_scan_tasks(struct mem_cgroup *memcg,struct task_struct *task;css_task_iter_start (&iter->css,CSS_TASK_ITER_PROCS , &it); -while (!ret && (task =css_task_iter_next (&it))) +while (!ret && (task =css_task_iter_next (&it))) { +/* Avoid potential softlockup warning */ +if ((++i &1023 ) ==0 ) +cond_resched (); ret =fn (task, arg); + }css_task_iter_end (&it);if (ret) {mem_cgroup_iter_break (memcg, iter);
mm/oom_kill.c +7 -1
@@ -44,6 +44,7 @@#include <linux/init.h> #include <linux/mmu_notifier.h> #include <linux/cred.h> +#include <linux/nmi.h> #include <asm/tlb.h> #include "internal.h"
@@ -431,10 +432,15 @@ static void dump_tasks(struct oom_control *oc)mem_cgroup_scan_tasks (oc->memcg, dump_task, oc); else {struct task_struct *p; +int i =0 ;rcu_read_lock (); -for_each_process (p) +for_each_process (p) { +/* Avoid potential softlockup warning */ +if ((++i &1023 ) ==0 ) +touch_softlockup_watchdog ();dump_task (p, oc); + }rcu_read_unlock (); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 320/462 drm/probe-helper: Create a HPD IRQ event helper for a single connector
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
[ Upstream commit 0464ed1a79b818d5e3eda1ac3c23a057ac0cc7c3 ]
The drm_helper_hpd_irq_event() function is iterating over all the connectors when an hotplug event is detected.
During that iteration, it will call each connector detect function and figure out if its status changed.
Finally, if any connector changed, it will notify the user-space and the clients that something changed on the DRM device.
This is supposed to be used for drivers that don't have a hotplug interrupt for individual connectors. However, drivers that can use an interrupt for a single connector are left in the dust and can either reimplement the logic used during the iteration for each connector or use that helper and iterate over all connectors all the time.
Since both are suboptimal, let's create a helper that will only perform the status detection on a single connector.
Stable-dep-of: 666e19604641 ("drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event()")
--- drivers/gpu/drm/drm_probe_helper.c | 116 +++++++++++++++++++++-------- include/drm/drm_probe_helper.h | 1 + 2 files changed, 86 insertions(+), 31 deletions(-)
drivers/gpu/drm/drm_probe_helper.c +85 -31
@@ -795,6 +795,86 @@ void drm_kms_helper_poll_fini(struct drm_device *dev) }EXPORT_SYMBOL (drm_kms_helper_poll_fini); +static bool check_connector_changed (struct drm_connector *connector) +{ +struct drm_device *dev = connector->dev; +enum drm_connector_status old_status; +u64 old_epoch_counter; + +/* Only handle HPD capable connectors. */ +drm_WARN_ON (dev, !(connector->polled &DRM_CONNECTOR_POLL_HPD )); + +drm_WARN_ON (dev, !mutex_is_locked (&dev->mode_config.mutex)); + + old_status = connector->status; + old_epoch_counter = connector->epoch_counter; + connector->status =drm_helper_probe_detect (connector,NULL , false); + +if (old_epoch_counter == connector->epoch_counter) { +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] Same epoch counter %llu\n" , + connector->base.id, + connector->name, + connector->epoch_counter); + +return false; + } + +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] status updated from %s to %s\n" , + connector->base.id, + connector->name, +drm_get_connector_status_name (old_status), +drm_get_connector_status_name (connector->status)); + +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] Changed epoch counter %llu => %llu\n" , + connector->base.id, + connector->name, + old_epoch_counter, + connector->epoch_counter); + +return true; +} + +/** +* drm_connector_helper_hpd_irq_event - hotplug processing +* @connector: drm_connector +* +* Drivers can use this helper function to run a detect cycle on a connector +* which has the DRM_CONNECTOR_POLL_HPD flag set in its &polled member. +* +* This helper function is useful for drivers which can track hotplug +* interrupts for a single connector. Drivers that want to send a +* hotplug event for all connectors or can't track hotplug interrupts +* per connector need to use drm_helper_hpd_irq_event(). +* +* This function must be called from process context with no mode +* setting locks held. +* +* Note that a connector can be both polled and probed from the hotplug +* handler, in case the hotplug interrupt is known to be unreliable. +* +* Returns: +* A boolean indicating whether the connector status changed or not +*/ +bool drm_connector_helper_hpd_irq_event (struct drm_connector *connector) +{ +struct drm_device *dev = connector->dev; +bool changed; + +mutex_lock (&dev->mode_config.mutex); + changed =check_connector_changed (connector); +mutex_unlock (&dev->mode_config.mutex); + +if (changed) { +drm_kms_helper_hotplug_event (dev); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] Sent hotplug event\n" , + connector->base.id, + connector->name); + } + +return changed; +} +EXPORT_SYMBOL (drm_connector_helper_hpd_irq_event); +/** * drm_helper_hpd_irq_event - hotplug processing * @dev: drm_device
@@ -808,9 +888,10 @@ EXPORT_SYMBOL(drm_kms_helper_poll_fini);* interrupts for each connector. * * Drivers which support hotplug interrupts for each connector individually and -* which have a more fine-grained detect logic should bypass this code and -* directly call drm_kms_helper_hotplug_event() in case the connector state -* changed. +* which have a more fine-grained detect logic can use +* drm_connector_helper_hpd_irq_event(). Alternatively, they should bypass this +* code and directly call drm_kms_helper_hotplug_event() in case the connector +* state changed. * * This function must be called from process context with no mode * setting locks held.
@@ -822,9 +903,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) {struct drm_connector *connector;struct drm_connector_list_iter conn_iter; -enum drm_connector_status old_status;bool changed = false; -u64 old_epoch_counter;if (!dev->mode_config.poll_enabled)return false;
@@ -836,33 +915,8 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev)if (!(connector->polled &DRM_CONNECTOR_POLL_HPD ))continue ; - old_status = connector->status; - - old_epoch_counter = connector->epoch_counter; - -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] Old epoch counter %llu\n" , connector->base.id, - connector->name, - old_epoch_counter); - - connector->status =drm_helper_probe_detect (connector,NULL , false); -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] status updated from %s to %s\n" , - connector->base.id, - connector->name, -drm_get_connector_status_name (old_status), -drm_get_connector_status_name (connector->status)); - -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] New epoch counter %llu\n" , - connector->base.id, - connector->name, - connector->epoch_counter); - -/* -* Check if epoch counter had changed, meaning that we need -* to send a uevent. -*/ -if (old_epoch_counter != connector->epoch_counter) +if (check_connector_changed (connector)) changed = true; - }drm_connector_list_iter_end (&conn_iter);mutex_unlock (&dev->mode_config.mutex);
include/drm/drm_probe_helper.h +1 -0
@@ -18,6 +18,7 @@ int drm_helper_probe_detect(struct drm_connector *connector,void drm_kms_helper_poll_init (struct drm_device *dev);void drm_kms_helper_poll_fini (struct drm_device *dev);bool drm_helper_hpd_irq_event (struct drm_device *dev); +bool drm_connector_helper_hpd_irq_event (struct drm_connector *connector);void drm_kms_helper_hotplug_event (struct drm_device *dev);void drm_kms_helper_poll_disable (struct drm_device *dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 321/462 drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 666e1960464140cc4bc9203c203097e70b54c95a ]
The code for detecting and updating the connector status in cdn_dp_pd_event_work() has a number of problems.
- It does not aquire the locks to call the detect helper and update the connector status. These are struct drm_mode_config.connection_mutex and struct drm_mode_config.mutex.
- It does not use drm_helper_probe_detect(), which helps with the details of locking and detection.
- It uses the connector's status field to determine a change to the connector status. The epoch_counter field is the correct one. The field signals a change even if the connector status' value did not change.
Replace the code with a call to drm_connector_helper_hpd_irq_event(), which fixes all these problems.
--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -8
@@ -915,9 +915,6 @@ static void cdn_dp_pd_event_work(struct work_struct *work) { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); -struct drm_connector *connector = &dp->connector; -enum drm_connector_status old_status; -int ret;mutex_lock (&dp->lock);
@@ -979,11 +976,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work) out:mutex_unlock (&dp->lock); - - old_status = connector->status; - connector->status = connector->funcs->detect (connector, false); -if (old_status != connector->status) -drm_kms_helper_hotplug_event (dp->drm_dev); +drm_connector_helper_hpd_irq_event (&dp->connector); } static int cdn_dp_pd_event(struct notifier_block *nb,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 322/462 tpm: Use managed allocation for bios event log
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eddie James <[email protected]>
[ Upstream commit 441b7152729f4a2bdb100135a58625fa0aeb69e4 ]
Since the bios event log is freed in the device release function, let devres handle the deallocation. This will allow other memory allocation/mapping functions to be used for the bios event log.
Stable-dep-of: a3a860bc0fd6 ("tpm: Change to kvalloc() in eventlog/acpi.c")
--- drivers/char/tpm/eventlog/acpi.c | 5 +++-- drivers/char/tpm/eventlog/efi.c | 13 +++++++------ drivers/char/tpm/eventlog/of.c | 3 ++- drivers/char/tpm/tpm-chip.c | 1 - 4 files changed, 12 insertions(+), 10 deletions(-)
drivers/char/tpm/eventlog/acpi.c +3 -2
@@ -14,6 +14,7 @@* Access to the event log extended by the TCG BIOS of PC platform */ +#include <linux/device.h> #include <linux/seq_file.h> #include <linux/fs.h> #include <linux/security.h>
@@ -135,7 +136,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip) }/* malloc EventLog space */ - log->bios_event_log =kmalloc (len,GFP_KERNEL ); + log->bios_event_log =devm_kmalloc (&chip->dev, len,GFP_KERNEL );if (!log->bios_event_log)return -ENOMEM ;
@@ -164,7 +165,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)return format; err: -kfree (log->bios_event_log); +devm_kfree (&chip->dev, log->bios_event_log); log->bios_event_log =NULL ;return ret; }
drivers/char/tpm/eventlog/efi.c +7 -6
@@ -6,6 +6,7 @@* Thiebaud Weksteen <[email protected]> */ +#include <linux/device.h> #include <linux/efi.h> #include <linux/tpm_eventlog.h>
@@ -55,7 +56,7 @@ int tpm_read_log_efi(struct tpm_chip *chip) }/* malloc EventLog space */ - log->bios_event_log =kmemdup (log_tbl->log, log_size,GFP_KERNEL ); + log->bios_event_log =devm_kmemdup (&chip->dev, log_tbl->log, log_size,GFP_KERNEL );if (!log->bios_event_log) { ret = -ENOMEM ; goto out;
@@ -76,7 +77,7 @@ int tpm_read_log_efi(struct tpm_chip *chip) MEMREMAP_WB);if (!final_tbl) {pr_err ("Could not map UEFI TPM final log\n" ); -kfree (log->bios_event_log); +devm_kfree (&chip->dev, log->bios_event_log); ret = -ENOMEM ; goto out; }
@@ -91,11 +92,11 @@ int tpm_read_log_efi(struct tpm_chip *chip)* Allocate memory for the 'combined log' where we will append the * 'final events log' to. */ - tmp =krealloc (log->bios_event_log, - log_size + final_events_log_size, -GFP_KERNEL ); + tmp =devm_krealloc (&chip->dev, log->bios_event_log, + log_size + final_events_log_size, +GFP_KERNEL );if (!tmp) { -kfree (log->bios_event_log); +devm_kfree (&chip->dev, log->bios_event_log); ret = -ENOMEM ; goto out; }
drivers/char/tpm/eventlog/of.c +2 -1
@@ -10,6 +10,7 @@* Read the event log created by the firmware on PPC64 */ +#include <linux/device.h> #include <linux/slab.h> #include <linux/of.h> #include <linux/tpm_eventlog.h>
@@ -65,7 +66,7 @@ int tpm_read_log_of(struct tpm_chip *chip)return -EIO ; } - log->bios_event_log =kmemdup (__va (base), size,GFP_KERNEL ); + log->bios_event_log =devm_kmemdup (&chip->dev,__va (base), size,GFP_KERNEL );if (!log->bios_event_log)return -ENOMEM ;
drivers/char/tpm/tpm-chip.c +0 -1
@@ -267,7 +267,6 @@ static void tpm_dev_release(struct device *dev)idr_remove (&dev_nums_idr, chip->dev_num);mutex_unlock (&idr_lock); -kfree (chip->log.bios_event_log);kfree (chip->work_space.context_buf);kfree (chip->work_space.session_buf);kfree (chip->allocated_banks);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 323/462 tpm: Change to kvalloc() in eventlog/acpi.c
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jarkko Sakkinen <[email protected]>
[ Upstream commit a3a860bc0fd6c07332e4911cf9a238d20de90173 ]
The following failure was reported on HPE ProLiant D320:
[ 10.693310][ T1] tpm_tis STM0925:00: 2.0 TPM (device-id 0x3, rev-id 0) [ 10.848132][ T1] ------------[ cut here ]------------ [ 10.853559][ T1] WARNING: CPU: 59 PID: 1 at mm/page_alloc.c:4727 __alloc_pages_noprof+0x2ca/0x330 [ 10.862827][ T1] Modules linked in: [ 10.866671][ T1] CPU: 59 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.12.0-lp155.2.g52785e2-default #1 openSUSE Tumbleweed (unreleased) 588cd98293a7c9eba9013378d807364c088c9375 [ 10.882741][ T1] Hardware name: HPE ProLiant DL320 Gen12/ProLiant DL320 Gen12, BIOS 1.20 10/28/2024 [ 10.892170][ T1] RIP: 0010:__alloc_pages_noprof+0x2ca/0x330 [ 10.898103][ T1] Code: 24 08 e9 4a fe ff ff e8 34 36 fa ff e9 88 fe ff ff 83 fe 0a 0f 86 b3 fd ff ff 80 3d 01 e7 ce 01 00 75 09 c6 05 f8 e6 ce 01 01 <0f> 0b 45 31 ff e9 e5 fe ff ff f7 c2 00 00 08 00 75 42 89 d9 80 e1 [ 10.917750][ T1] RSP: 0000:ffffb7cf40077980 EFLAGS: 00010246 [ 10.923777][ T1] RAX: 0000000000000000 RBX: 0000000000040cc0 RCX: 0000000000000000 [ 10.931727][ T1] RDX: 0000000000000000 RSI: 000000000000000c RDI: 0000000000040cc0
The above transcript shows that ACPI pointed a 16 MiB buffer for the log events because RSI maps to the 'order' parameter of __alloc_pages_noprof(). Address the bug by moving from devm_kmalloc() to devm_add_action() and kvmalloc() and devm_add_action().
--- drivers/char/tpm/eventlog/acpi.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/char/tpm/eventlog/acpi.c +13 -2
@@ -63,6 +63,11 @@ static bool tpm_is_tpm2_log(void *bios_event_log, u64 len)return n ==0 ; } +static void tpm_bios_log_free (void *data) +{ +kvfree (data); +} +/* read binary bios log */ int tpm_read_log_acpi (struct tpm_chip *chip) {
@@ -136,7 +141,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip) }/* malloc EventLog space */ - log->bios_event_log =devm_kmalloc (&chip->dev, len,GFP_KERNEL ); + log->bios_event_log =kvmalloc (len,GFP_KERNEL );if (!log->bios_event_log)return -ENOMEM ;
@@ -162,10 +167,16 @@ int tpm_read_log_acpi(struct tpm_chip *chip) goto err; } + ret =devm_add_action (&chip->dev, tpm_bios_log_free, log->bios_event_log); +if (ret) { + log->bios_event_log =NULL ; + goto err; + } +return format; err: -devm_kfree (&chip->dev, log->bios_event_log); +tpm_bios_log_free (log->bios_event_log); log->bios_event_log =NULL ;return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 324/462 batman-adv: Add new include for min/max helpers
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit fcd193e1dfa6842e2783b04d98345767fe99cf31 ]
The commit b296a6d53339 ("kernel.h: split out min()/max() et al. helpers") moved the min/max helper functionality from kernel.h to minmax.h. Adjust the kernel code accordingly to avoid fragile indirect includes.
Stable-dep-of: 8c8ecc98f5c6 ("batman-adv: Drop unmanaged ELP metric worker")
--- net/batman-adv/bat_v.c | 1 + net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/fragmentation.c | 2 +- net/batman-adv/hard-interface.c | 1 + net/batman-adv/icmp_socket.c | 1 + net/batman-adv/main.c | 1 + net/batman-adv/netlink.c | 1 + net/batman-adv/tp_meter.c | 1 + 9 files changed, 9 insertions(+), 1 deletion(-)
net/batman-adv/bat_v.c +1 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/rculist.h>
net/batman-adv/bat_v_elp.c +1 -0
@@ -18,6 +18,7 @@#include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> +#include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/nl80211.h> #include <linux/prandom.h>
net/batman-adv/bat_v_ogm.c +1 -0
@@ -18,6 +18,7 @@#include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> +#include <linux/minmax.h> #include <linux/mutex.h> #include <linux/netdevice.h> #include <linux/prandom.h>
net/batman-adv/fragmentation.c +1 -1
@@ -14,8 +14,8 @@#include <linux/gfp.h> #include <linux/if_ether.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/lockdep.h> +#include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/slab.h>
net/batman-adv/hard-interface.c +1 -0
@@ -18,6 +18,7 @@#include <linux/kref.h> #include <linux/limits.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/mutex.h> #include <linux/netdevice.h> #include <linux/printk.h>
net/batman-adv/icmp_socket.c +1 -0
@@ -20,6 +20,7 @@#include <linux/if_ether.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/netdevice.h> #include <linux/pkt_sched.h>
net/batman-adv/main.c +1 -0
@@ -23,6 +23,7 @@#include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/netdevice.h> #include <linux/printk.h>
net/batman-adv/netlink.c +1 -0
@@ -23,6 +23,7 @@#include <linux/kernel.h> #include <linux/limits.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/printk.h>
net/batman-adv/tp_meter.c +1 -0
@@ -23,6 +23,7 @@#include <linux/kthread.h> #include <linux/limits.h> #include <linux/list.h> +#include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/param.h> #include <linux/printk.h>
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 325/462 batman-adv: Drop initialization of flexible ethtool_link_ksettings
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 813e62a6fe7539fdf0d8e018d4f157b57bdaeedd ]
The commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members") changed various structures from using 0-length arrays to flexible arrays
net/batman-adv/bat_v_elp.c: note: in included file:
./include/linux/ethtool.h:148:38: warning: nested flexible array net/batman-adv/bat_v_elp.c:128:9: warning: using sizeof on a flexible structure
In theory, this could be worked around by using {} as initializer for the variable on the stack. But this variable doesn't has to be initialized at all by the caller of __ethtool_get_link_ksettings - everything will be initialized by the callee when no error occurs.
Stable-dep-of: 8c8ecc98f5c6 ("batman-adv: Drop unmanaged ELP metric worker")
--- net/batman-adv/bat_v_elp.c | 1 - 1 file changed, 1 deletion(-)
net/batman-adv/bat_v_elp.c +0 -1
@@ -141,7 +141,6 @@ static bool batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh,/* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ -memset (&link_settings,0 ,sizeof (link_settings));rtnl_lock (); ret =__ethtool_get_link_ksettings (hard_iface->net_dev, &link_settings);rtnl_unlock ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 326/462 batman-adv: Drop unmanaged ELP metric worker
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 8c8ecc98f5c65947b0070a24bac11e12e47cc65d ]
The ELP worker needs to calculate new metric values for all neighbors "reachable" over an interface. Some of the used metric sources require locks which might need to sleep. This sleep is incompatible with the RCU list iterator used for the recorded neighbors. The initial approach to work around of this problem was to queue another work item per neighbor and then run this in a new context.
Even when this solved the RCU vs might_sleep() conflict, it has a major
problems: Nothing was stopping the work item in case it is not needed anymore - for example because one of the related interfaces was removed or the batman-adv module was unloaded - resulting in potential invalid memory accesses.
Directly canceling the metric worker also has various problems:
* cancel_work_sync for a to-be-deactivated interface is called with rtnl_lock held. But the code in the ELP metric worker also tries to use rtnl_lock() - which will never return in this case. This also means that cancel_work_sync would never return because it is waiting for the worker to finish.
* iterating over the neighbor list for the to-be-deactivated interface is currently done using the RCU specific methods. Which means that it is possible to miss items when iterating over it without the associated spinlock - a behaviour which is acceptable for a periodic metric check but not for a cleanup routine (which must "stop" all still running workers)
The better approch is to get rid of the per interface neighbor metric worker and handle everything in the interface worker. The original problems are solved by:
* creating a list of neighbors which require new metric information inside the RCU protected context, gathering the metric according to the new list outside the RCU protected context
* only use rcu_trylock inside metric gathering code to avoid a deadlock when the cancel_delayed_work_sync is called in the interface removal code (which is called with the rtnl_lock held)
--- net/batman-adv/bat_v.c | 2 -- net/batman-adv/bat_v_elp.c | 71 ++++++++++++++++++++++++++------------ net/batman-adv/bat_v_elp.h | 2 -- net/batman-adv/types.h | 3 -- 4 files changed, 48 insertions(+), 30 deletions(-)
net/batman-adv/bat_v.c +0 -2
@@ -116,8 +116,6 @@ static void batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh) {ewma_throughput_init (&hardif_neigh->bat_v.throughput); -INIT_WORK (&hardif_neigh->bat_v.metric_work, - batadv_v_elp_throughput_metric_update); }#ifdef CONFIG_BATMAN_ADV_DEBUGFS
net/batman-adv/bat_v_elp.c +48 -23
143 lines not on this page · raw message
net/batman-adv/bat_v_elp.h +0 -2
@@ -10,7 +10,6 @@#include "main.h" #include <linux/skbuff.h> -#include <linux/workqueue.h> int batadv_v_elp_iface_enable (struct batadv_hard_iface *hard_iface);void batadv_v_elp_iface_disable (struct batadv_hard_iface *hard_iface);
@@ -19,6 +18,5 @@ void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,void batadv_v_elp_primary_iface_set (struct batadv_hard_iface *primary_iface);int batadv_v_elp_packet_recv (struct sk_buff *skb,struct batadv_hard_iface *if_incoming); -void batadv_v_elp_throughput_metric_update (struct work_struct *work);#endif /* _NET_BATMAN_ADV_BAT_V_ELP_H_ */
net/batman-adv/types.h +0 -3
@@ -606,9 +606,6 @@ struct batadv_hardif_neigh_node_bat_v {* neighbor */ unsigned long last_unicast_tx; - -/** @metric_work: work queue callback item for metric update */ -struct work_struct metric_work; };/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 327/462 usb: dwc3: Increase DWC3 controller halt timeout
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 461ee467507cb98a348fa91ff8460908bb0ea423 ]
Since EP0 transactions need to be completed before the controller halt sequence is finished, this may take some time depending on the host and the enabled functions. Increase the controller halt timeout, so that we give the controller sufficient time to handle EP0 transfers.
Stable-dep-of: d3a8c28426fc ("usb: dwc3: Fix timeout issue during controller enter/exit from halt state")
--- drivers/usb/dwc3/gadget.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +2 -1
@@ -2104,7 +2104,7 @@ static void dwc3_stop_active_transfers(struct dwc3 *dwc)static int dwc3_gadget_run_stop (struct dwc3 *dwc,int is_on,int suspend) {u32 reg; -u32 timeout =500 ; +u32 timeout =2000 ;if (pm_runtime_suspended (dwc->dev))return 0 ;
@@ -2136,6 +2136,7 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)dwc3_gadget_dctl_write_safe (dwc, reg);do { +usleep_range (1000 ,2000 ); reg =dwc3_readl (dwc->regs,DWC3_DSTS ); reg &=DWC3_DSTS_DEVCTRLHLT ; }while (--timeout && !(!is_on ^ !reg));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 328/462 usb: dwc3: Fix timeout issue during controller enter/exit from halt state
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Selvarasu Ganesan <[email protected]>
[ Upstream commit d3a8c28426fc1fb3252753a9f1db0d691ffc21b0 ]
There is a frequent timeout during controller enter/exit from halt state after toggling the run_stop bit by SW. This timeout occurs when performing frequent role switches between host and device, causing device enumeration issues due to the timeout. This issue was not present when USB2 suspend PHY was disabled by passing the SNPS quirks (snps,dis_u2_susphy_quirk and snps,dis_enblslpm_quirk) from the DTS. However, there is a requirement to enable USB2 suspend PHY by setting of GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY bits when controller starts in gadget or host mode results in the timeout issue.
This commit addresses this timeout issue by ensuring that the bits GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY are cleared before starting the dwc3_gadget_run_stop sequence and restoring them after the dwc3_gadget_run_stop sequence is completed.
--- drivers/usb/dwc3/gadget.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/usb/dwc3/gadget.c +34 -0
@@ -2105,10 +2105,38 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) {u32 reg;u32 timeout =2000 ; +u32 saved_config =0 ;if (pm_runtime_suspended (dwc->dev))return 0 ; +/* +* When operating in USB 2.0 speeds (HS/FS), ensure that +* GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY are cleared before starting +* or stopping the controller. This resolves timeout issues that occur +* during frequent role switches between host and device modes. +* +* Save and clear these settings, then restore them after completing the +* controller start or stop sequence. +* +* This solution was discovered through experimentation as it is not +* mentioned in the dwc3 programming guide. It has been tested on an +* Exynos platforms. +*/ + reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); +if (reg &DWC3_GUSB2PHYCFG_SUSPHY ) { + saved_config |=DWC3_GUSB2PHYCFG_SUSPHY ; + reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ; + } + +if (reg &DWC3_GUSB2PHYCFG_ENBLSLPM ) { + saved_config |=DWC3_GUSB2PHYCFG_ENBLSLPM ; + reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM ; + } + +if (saved_config) +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); + reg =dwc3_readl (dwc->regs,DWC3_DCTL );if (is_on) { if (DWC3_VER_IS_WITHIN(DWC3, ANY, 187A)) {
@@ -2141,6 +2169,12 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) reg &=DWC3_DSTS_DEVCTRLHLT ; }while (--timeout && !(!is_on ^ !reg)); +if (saved_config) { + reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); + reg |= saved_config; +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); + } +if (!timeout)return -ETIMEDOUT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 329/462 usb/gadget: f_midi: Replace tasklet with work
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
[ Upstream commit 8653d71ce3763aedcf3d2331f59beda3fecd79e4 ]
Currently a tasklet is used to transmit input substream buffer data. However, tasklets have long been deprecated as being too heavy on the system by running in irq context - and this is not a performance critical path. If a higher priority process wants to run, it must wait for the tasklet to finish before doing so.
Deferring work to a workqueue and executing in process context should be fine considering the callback already does f_midi_do_transmit() under the transmit_lock and thus changes in semantics are ok regarding concurrency - tasklets being serialized against itself.
Stable-dep-of: 4ab37fcb4283 ("USB: gadget: f_midi: f_midi_complete to call queue_work")
--- drivers/usb/gadget/function/f_midi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/usb/gadget/function/f_midi.c +7 -5
@@ -87,7 +87,7 @@ struct f_midi {struct snd_rawmidi_substream *out_substream[MAX_PORTS ];unsigned long out_triggered; -struct tasklet_struct tasklet; +struct work_struct work;unsigned int in_ports;unsigned int out_ports;int index;
@@ -698,9 +698,11 @@ static void f_midi_transmit(struct f_midi *midi)f_midi_drop_out_substreams (midi); } -static void f_midi_in_tasklet (struct tasklet_struct *t) +static void f_midi_in_work (struct work_struct *work) { -struct f_midi *midi =from_tasklet (midi, t, tasklet); +struct f_midi *midi; + + midi = container_of(work, struct f_midi, work);f_midi_transmit (midi); }
@@ -737,7 +739,7 @@ static void f_midi_in_trigger(struct snd_rawmidi_substream *substream, int up)VDBG (midi,"%s() %d\n" , __func__, up); midi->in_ports_array[substream->number].active = up;if (up) -tasklet_hi_schedule (&midi->tasklet); +queue_work (system_highpri_wq, &midi->work); }static int f_midi_out_open (struct snd_rawmidi_substream *substream)
@@ -875,7 +877,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)int status, n, jack =1 , i =0 , endpoint_descriptor_index =0 ; midi->gadget = cdev->gadget; -tasklet_setup (&midi->tasklet, f_midi_in_tasklet); +INIT_WORK (&midi->work, f_midi_in_work); status =f_midi_register_card (midi);if (status <0 ) goto fail_register;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 330/462 USB: gadget: f_midi: f_midi_complete to call queue_work
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jill Donahue <[email protected]>
[ Upstream commit 4ab37fcb42832cdd3e9d5e50653285ca84d6686f ]
When using USB MIDI, a lock is attempted to be acquired twice through a re-entrant call to f_midi_transmit, causing a deadlock.
Fix it by using queue_work() to schedule the inner f_midi_transmit() via a high priority work queue from the completion handler.
--- drivers/usb/gadget/function/f_midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_midi.c +1 -1
@@ -282,7 +282,7 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)/* Our transmit completed. See if there's more to go. * f_midi_transmit eats req, don't queue it again. */ req->length =0 ; -f_midi_transmit (midi); +queue_work (system_highpri_wq, &midi->work);return ; }break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 331/462 powerpc/64s/mm: Move __real_pte stubs into hash-4k.h
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 8ae4f16f7d7b59cca55aeca6db7c9636ffe7fbaa ]
The stub versions of __real_pte() etc are only used with HPT & 4K pages, so move them into the hash-4k.h header.
Stable-dep-of: 61bcc752d1b8 ("powerpc/64s: Rewrite __real_pte() and __rpte_to_hidx() as static inline")
--- arch/powerpc/include/asm/book3s/64/hash-4k.h | 20 +++++++++++++++ arch/powerpc/include/asm/book3s/64/pgtable.h | 26 -------------------- 2 files changed, 20 insertions(+), 26 deletions(-)
arch/powerpc/include/asm/book3s/64/hash-4k.h +20 -0
@@ -89,6 +89,26 @@ static inline int hash__hugepd_ok(hugepd_t hpd) }#endif +/* +* With 4K page size the real_pte machinery is all nops. +*/ +#define __real_pte (e, p, o) ((real_pte_t){(e)}) +#define __rpte_to_pte (r) ((r).pte) +#define __rpte_to_hidx (r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT) + +#define pte_iterate_hashed_subpages (rpte, psize, va, index, shift) \ + do { \ + index = 0; \ + shift = mmu_psize_defs[psize].shift; \ + +#define pte_iterate_hashed_end () } while(0) + +/* +* We expect this to be called only for user addresses or kernel virtual +* addresses other than the linear mapping. +*/ +#define pte_pagesize_index (mm, addr, pte) MMU_PAGE_4K +/* * 4K PTE format is different from 64K PTE format. Saving the hash_slot is just * a matter of returning the PTE bits that need to be modified. On 64K PTE,
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -26
@@ -332,32 +332,6 @@ extern unsigned long pci_io_base;#ifndef __ASSEMBLY__ -/* -* This is the default implementation of various PTE accessors, it's -* used in all cases except Book3S with 64K pages where we have a -* concept of sub-pages -*/ -#ifndef __real_pte - -#define __real_pte (e, p, o) ((real_pte_t){(e)}) -#define __rpte_to_pte (r) ((r).pte) -#define __rpte_to_hidx (r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT) - -#define pte_iterate_hashed_subpages (rpte, psize, va, index, shift) \ - do { \ - index = 0; \ - shift = mmu_psize_defs[psize].shift; \ - -#define pte_iterate_hashed_end () } while(0) - -/* -* We expect this to be called only for user addresses or kernel virtual -* addresses other than the linear mapping. -*/ -#define pte_pagesize_index (mm, addr, pte) MMU_PAGE_4K - -#endif /* __real_pte */ -static inline unsigned long pte_update (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned long clr,unsigned long set,int huge)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 332/462 powerpc/64s: Rewrite __real_pte() and __rpte_to_hidx() as static inline
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 61bcc752d1b81fde3cae454ff20c1d3c359df500 ]
Rewrite __real_pte() and __rpte_to_hidx() as static inline in order to avoid following warnings/errors when building with 4k page size:
CC arch/powerpc/mm/book3s64/hash_tlb.o
arch/powerpc/mm/book3s64/hash_tlb.c: In function 'hpte_need_flush':
arch/powerpc/mm/book3s64/hash_tlb.c:49:16: error: variable 'offset' set but not used [-Werror=unused-but-set-variable]
49 | int i, offset;
| ^~~~~~
CC arch/powerpc/mm/book3s64/hash_native.o
arch/powerpc/mm/book3s64/hash_native.c: In function 'native_flush_hash_range':
arch/powerpc/mm/book3s64/hash_native.c:782:29: error: variable 'index' set but not used [-Werror=unused-but-set-variable]
782 | unsigned long hash, index, hidx, shift, slot;
| ^~~~~
--- arch/powerpc/include/asm/book3s/64/hash-4k.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/book3s/64/hash-4k.h +10 -2
@@ -92,9 +92,17 @@ static inline int hash__hugepd_ok(hugepd_t hpd)/* * With 4K page size the real_pte machinery is all nops. */ -#define __real_pte (e, p, o) ((real_pte_t){(e)}) +static inline real_pte_t __real_pte (pte_t pte,pte_t *ptep,int offset) +{ +return (real_pte_t ){pte}; +} +#define __rpte_to_pte (r) ((r).pte) -#define __rpte_to_hidx (r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT) + +static inline unsigned long __rpte_to_hidx (real_pte_t rpte,unsigned long index) +{ +return pte_val (__rpte_to_pte (rpte)) >>H_PAGE_F_GIX_SHIFT ; +}#define pte_iterate_hashed_subpages (rpte, psize, va, index, shift) \ do { \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 333/462 ALSA: hda/realtek: Fixup ALC225 depop procedure
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
[ Upstream commit 174448badb4409491bfba2e6b46f7aa078741c5e ]
Headset MIC will no function when power_save=0.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -3713,6 +3713,7 @@ static void alc225_init(struct hda_codec *codec) AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);msleep (75 ); +alc_update_coef_idx (codec,0x4a ,3 <<10 ,0 );alc_update_coefex_idx (codec,0x57 ,0x04 ,0x0007 ,0x4 );/* Hight power */ } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 334/462 powerpc/code-patching: Fix KASAN hit by not flagging text patching area as VM_ALLOC
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit d262a192d38e527faa5984629aabda2e0d1c4f54 ]
Erhard reported the following KASAN hit while booting his PowerMac G4 with a KASAN-enabled kernel 6.13-rc6:
BUG: KASAN: vmalloc-out-of-bounds in copy_to_kernel_nofault+0xd8/0x1c8 Write of size 8 at addr f1000000 by task chronyd/1293 CPU: 0 UID: 123 PID: 1293 Comm: chronyd Tainted: G W 6.13.0-rc6-PMacG4 #2 Tainted: [W]=WARN Hardware name: PowerMac3,6 7455 0x80010303 PowerMac Call Trace: [c2437590] [c1631a84] dump_stack_lvl+0x70/0x8c (unreliable) [c24375b0] [c0504998] print_report+0xdc/0x504 [c2437610] [c050475c] kasan_report+0xf8/0x108 [c2437690] [c0505a3c] kasan_check_range+0x24/0x18c [c24376a0] [c03fb5e4] copy_to_kernel_nofault+0xd8/0x1c8 [c24376c0] [c004c014] patch_instructions+0x15c/0x16c [c2437710] [c00731a8] bpf_arch_text_copy+0x60/0x7c [c2437730] [c0281168] bpf_jit_binary_pack_finalize+0x50/0xac [c2437750] [c0073cf4] bpf_int_jit_compile+0xb30/0xdec [c2437880] [c0280394] bpf_prog_select_runtime+0x15c/0x478 [c24378d0] [c1263428] bpf_prepare_filter+0xbf8/0xc14 [c2437990] [c12677ec] bpf_prog_create_from_user+0x258/0x2b4 [c24379d0] [c027111c] do_seccomp+0x3dc/0x1890 [c2437ac0] [c001d8e0] system_call_exception+0x2dc/0x420 [c2437f30] [c00281ac] ret_from_syscall+0x0/0x2c --- interrupt: c00 at 0x5a1274 NIP: 005a1274 LR: 006a3b3c CTR: 005296c8 REGS: c2437f40 TRAP: 0c00 Tainted: G W (6.13.0-rc6-PMacG4) MSR: 0200f932 <VEC,EE,PR,FP,ME,IR,DR,RI> CR: 24004422 XER: 00000000
GPR00: 00000166 af8f3fa0 a7ee3540 00000001 00000000 013b6500 005a5858 0200f932
GPR08: 00000000 00001fe9 013d5fc8 005296c8 2822244c 00b2fcd8 00000000 af8f4b57
GPR16: 00000000 00000001 00000000 00000000 00000000 00000001 00000000 00000002
GPR24: 00afdbb0 00000000 00000000 00000000 006e0004 013ce060 006e7c1c 00000001 NIP [005a1274] 0x5a1274
LR [006a3b3c] 0x6a3b3c
--- interrupt: c00
The buggy address belongs to the virtual mapping at
[f1000000, f1002000) created by:
text_area_cpu_up+0x20/0x190
The buggy address belongs to the physical page:
page: refcount:1 mapcount:0 mapping:00000000 index:0x0 pfn:0x76e30
flags: 0x80000000(zone=2)
raw: 80000000 00000000 00000122 00000000 00000000 00000000 ffffffff 00000001
raw: 00000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
f0ffff00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
f0ffff80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>f1000000: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8
^
f1000080: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8
f1000100: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8
==================================================================f8 corresponds to KASAN_VMALLOC_INVALID which means the area is not initialised hence not supposed to be used yet.
Powerpc text patching infrastructure allocates a virtual memory area using get_vm_area() and flags it as VM_ALLOC. But that flag is meant to be used for vmalloc() and vmalloc() allocated memory is not supposed to be used before a call to __vmalloc_node_range() which is never called for that area.
That went undetected until commit e4137f08816b ("mm, kasan, kmsan:
instrument copy_from/to_kernel_nofault")
The area allocated by text_area_cpu_up() is not vmalloc memory, it is mapped directly on demand when needed by map_kernel_page(). There is no VM flag corresponding to such usage, so just pass no flag. That way the area will be unpoisonned and usable immediately.
--- arch/powerpc/lib/code-patching.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/lib/code-patching.c +1 -1
@@ -47,7 +47,7 @@ static int text_area_cpu_up(unsigned int cpu) {struct vm_struct *area; - area =get_vm_area (PAGE_SIZE ,VM_ALLOC ); + area =get_vm_area (PAGE_SIZE ,0 );if (!area) {WARN_ONCE (1 ,"Failed to create text area for cpu %d\n" , cpu);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 335/462 geneve: Fix use-after-free in geneve_find_dev().
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 9593172d93b9f91c362baec4643003dc29802929 ]
syzkaller reported a use-after-free in geneve_find_dev() [0] without repro.
geneve_configure() links struct geneve_dev.next to net_generic(net, geneve_net_id)->geneve_list.
The net here could differ from dev_net(dev) if IFLA_NET_NS_PID, IFLA_NET_NS_FD, or IFLA_TARGET_NETNSID is set.
When dev_net(dev) is dismantled, geneve_exit_batch_rtnl() finally calls unregister_netdevice_queue() for each dev in the netns, and later the dev is freed.
However, its geneve_dev.next is still linked to the backend UDP socket netns.
Then, use-after-free will occur when another geneve dev is created in the netns.
Let's call geneve_dellink() instead in geneve_destroy_tunnels().
[0]:
BUG: KASAN: slab-use-after-free in geneve_find_dev drivers/net/geneve.c:1295 [inline] BUG: KASAN: slab-use-after-free in geneve_configure+0x234/0x858 drivers/net/geneve.c:1343 Read of size 2 at addr ffff000054d6ee24 by task syz.1.4029/13441 CPU: 1 UID: 0 PID: 13441 Comm: syz.1.4029 Not tainted 6.13.0-g0ad9617c78ac #24 dc35ca22c79fb82e8e7bc5c9c9adafea898b1e3d Hardware name: linux,dummy-virt (DT) Call trace: show_stack+0x38/0x50 arch/arm64/kernel/stacktrace.c:466 (C) __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0xbc/0x108 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0x16c/0x6f0 mm/kasan/report.c:489 kasan_report+0xc0/0x120 mm/kasan/report.c:602 __asan_report_load2_noabort+0x20/0x30 mm/kasan/report_generic.c:379 geneve_find_dev drivers/net/geneve.c:1295 [inline] geneve_configure+0x234/0x858 drivers/net/geneve.c:1343 geneve_newlink+0xb8/0x128 drivers/net/geneve.c:1634 rtnl_newlink_create+0x23c/0x868 net/core/rtnetlink.c:3795 __rtnl_newlink net/core/rtnetlink.c:3906 [inline] rtnl_newlink+0x1054/0x1630 net/core/rtnetlink.c:4021 rtnetlink_rcv_msg+0x61c/0x918 net/core/rtnetlink.c:6911 netlink_rcv_skb+0x1dc/0x398 net/netlink/af_netlink.c:2543 rtnetlink_rcv+0x34/0x50 net/core/rtnetlink.c:6938 netlink_unicast_kernel net/netlink/af_netlink.c:1322 [inline] netlink_unicast+0x618/0x838 net/netlink/af_netlink.c:1348 netlink_sendmsg+0x5fc/0x8b0 net/netlink/af_netlink.c:1892 sock_sendmsg_nosec net/socket.c:713 [inline] __sock_sendmsg net/socket.c:728 [inline] ____sys_sendmsg+0x410/0x6f8 net/socket.c:2568 ___sys_sendmsg+0x178/0x1d8 net/socket.c:2622 __sys_sendmsg net/socket.c:2654 [inline] __do_sys_sendmsg net/socket.c:2659 [inline] __se_sys_sendmsg net/socket.c:2657 [inline] __arm64_sys_sendmsg+0x12c/0x1c8 net/socket.c:2657 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x90/0x278 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x13c/0x250 arch/arm64/kernel/syscall.c:132 do_el0_svc+0x54/0x70 arch/arm64/kernel/syscall.c:151 el0_svc+0x4c/0xa8 arch/arm64/kernel/entry-common.c:744 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:762 el0t_64_sync+0x198/0x1a0 arch/arm64/kernel/entry.S:600 Allocated by task 13247: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x30/0x68 mm/kasan/common.c:68 kasan_save_alloc_info+0x44/0x58 mm/kasan/generic.c:568 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0x84/0xa0 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __do_kmalloc_node mm/slub.c:4298 [inline] __kmalloc_node_noprof+0x2a0/0x560 mm/slub.c:4304 __kvmalloc_node_noprof+0x9c/0x230 mm/util.c:645 alloc_netdev_mqs+0xb8/0x11a0 net/core/dev.c:11470 rtnl_create_link+0x2b8/0xb50 net/core/rtnetlink.c:3604 rtnl_newlink_create+0x19c/0x868 net/core/rtnetlink.c:3780 __rtnl_newlink net/core/rtnetlink.c:3906 [inline] rtnl_newlink+0x1054/0x1630 net/core/rtnetlink.c:4021 rtnetlink_rcv_msg+0x61c/0x918 net/core/rtnetlink.c:6911 netlink_rcv_skb+0x1dc/0x398 net/netlink/af_netlink.c:2543 rtnetlink_rcv+0x34/0x50 net/core/rtnetlink.c:6938 netlink_unicast_kernel net/netlink/af_netlink.c:1322 [inline] netlink_unicast+0x618/0x838 net/netlink/af_netlink.c:1348 netlink_sendmsg+0x5fc/0x8b0 net/netlink/af_netlink.c:1892 sock_sendmsg_nosec net/socket.c:713 [inline] __sock_sendmsg net/socket.c:728 [inline] ____sys_sendmsg+0x410/0x6f8 net/socket.c:2568 ___sys_sendmsg+0x178/0x1d8 net/socket.c:2622 __sys_sendmsg net/socket.c:2654 [inline] __do_sys_sendmsg net/socket.c:2659 [inline] __se_sys_sendmsg net/socket.c:2657 [inline] __arm64_sys_sendmsg+0x12c/0x1c8 net/socket.c:2657 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x90/0x278 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x13c/0x250 arch/arm64/kernel/syscall.c:132 do_el0_svc+0x54/0x70 arch/arm64/kernel/syscall.c:151 el0_svc+0x4c/0xa8 arch/arm64/kernel/entry-common.c:744 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:762 el0t_64_sync+0x198/0x1a0 arch/arm64/kernel/entry.S:600 Freed by task 45: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x30/0x68 mm/kasan/common.c:68 kasan_save_free_info+0x58/0x70 mm/kasan/generic.c:582 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x48/0x68 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2353 [inline] slab_free mm/slub.c:4613 [inline] kfree+0x140/0x420 mm/slub.c:4761 kvfree+0x4c/0x68 mm/util.c:688 netdev_release+0x94/0xc8 net/core/net-sysfs.c:2065 device_release+0x98/0x1c0 kobject_cleanup lib/kobject.c:689 [inline] kobject_release lib/kobject.c:720 [inline] kref_put include/linux/kref.h:65 [inline] kobject_put+0x2b0/0x438 lib/kobject.c:737 netdev_run_todo+0xe5c/0xfc8 net/core/dev.c:11185 rtnl_unlock+0x20/0x38 net/core/rtnetlink.c:151 cleanup_net+0x4fc/0x8c0 net/core/net_namespace.c:648 process_one_work+0x700/0x1398 kernel/workqueue.c:3236 process_scheduled_works kernel/workqueue.c:3317 [inline] worker_thread+0x8c4/0xe10 kernel/workqueue.c:3398 kthread+0x4bc/0x608 kernel/kthread.c:464 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:862 The buggy address belongs to the object at ffff000054d6e000 which belongs to the cache kmalloc-cg-4k of size 4096
The buggy address is located 3620 bytes inside of
freed 4096-byte region [ffff000054d6e000, ffff000054d6f000)
The buggy address belongs to the physical page: page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x94d68
head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 memcg:ffff000016276181
flags: 0x3fffe0000000040(head|node=0|zone=0|lastcpupid=0x1ffff)page_type: f5(slab)
raw: 03fffe0000000040 ffff0000c000f500 dead000000000122 0000000000000000 raw: 0000000000000000 0000000000040004 00000001f5000000 ffff000016276181
head: 03fffe0000000040 ffff0000c000f500 dead000000000122 0000000000000000
head: 0000000000000000 0000000000040004 00000001f5000000 ffff000016276181
head: 03fffe0000000003 fffffdffc1535a01 ffffffffffffffff 0000000000000000
head: 0000000000000008 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff000054d6ed00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff000054d6ed80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff000054d6ee00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff000054d6ee80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff000054d6ef00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- drivers/net/geneve.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/geneve.c +3 -8
@@ -1968,16 +1968,11 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head)/* gather any geneve devices that were moved into this ns */ for_each_netdev_safe (net, dev, aux)if (dev->rtnl_link_ops == &geneve_link_ops) -unregister_netdevice_queue (dev, head); +geneve_dellink (dev, head);/* now gather any other geneve devices that were created in this ns */ -list_for_each_entry_safe (geneve, next, &gn->geneve_list, next) { -/* If geneve->dev is in the same netns, it was already added -* to the list by the previous loop. -*/ -if (!net_eq (dev_net (geneve->dev), net)) -unregister_netdevice_queue (geneve->dev, head); - } +list_for_each_entry_safe (geneve, next, &gn->geneve_list, next) +geneve_dellink (geneve->dev, head); } static void __net_exit geneve_exit_batch_net(struct list_head *net_list)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 336/462 gtp: Suppress list corruption splat in gtp_net_exit_batch_rtnl().
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 4ccacf86491d33d2486b62d4d44864d7101b299d ]
Brad Spengler reported the list_del() corruption splat in gtp_net_exit_batch_rtnl(). [0]
Commit eb28fd76c0a0 ("gtp: Destroy device along with udp socket's netns dismantle.") added the for_each_netdev() loop in gtp_net_exit_batch_rtnl() to destroy devices in each netns as done in geneve and ip tunnels.
However, this could trigger ->dellink() twice for the same device during ->exit_batch_rtnl().
Say we have two netns A & B and gtp device B that resides in netns B but whose UDP socket is in netns A.
1. cleanup_net() processes netns A and then B.
2. gtp_net_exit_batch_rtnl() finds the device B while iterating
netns A's gn->gtp_dev_list and calls ->dellink().
[ device B is not yet unlinked from netns B
as unregister_netdevice_many() has not been called. ]
3. gtp_net_exit_batch_rtnl() finds the device B while iterating
netns B's for_each_netdev() and calls ->dellink().
gtp_dellink() cleans up the device's hash table, unlinks the dev from gn->gtp_dev_list, and calls unregister_netdevice_queue().
Basically, calling gtp_dellink() multiple times is fine unless CONFIG_DEBUG_LIST is enabled.
Let's remove for_each_netdev() in gtp_net_exit_batch_rtnl() and delegate the destruction to default_device_exit_batch() as done in bareudp.
[0]:list_del corruption, ffff8880aaa62c00->next (autoslab_size_M_dev_P_net_core_dev_11127_8_1328_8_S_4096_A_64_n_139+0xc00/0x1000 [slab object]) is LIST_POISON1 (ffffffffffffff02) (prev is 0xffffffffffffff04) kernel BUG at lib/list_debug.c:58!
Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN CPU: 1 UID: 0 PID: 1804 Comm: kworker/u8:7 Tainted: G T 6.12.13-grsec-full-20250211091339 #1 Tainted: [T]=RANDSTRUCT Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Workqueue: netns cleanup_net RIP: 0010:[<ffffffff84947381>] __list_del_entry_valid_or_report+0x141/0x200 lib/list_debug.c:58 Code: c2 76 91 31 c0 e8 9f b1 f7 fc 0f 0b 4d 89 f0 48 c7 c1 02 ff ff ff 48 89 ea 48 89 ee 48 c7 c7 e0 c2 76 91 31 c0 e8 7f b1 f7 fc <0f> 0b 4d 89 e8 48 c7 c1 04 ff ff ff 48 89 ea 48 89 ee 48 c7 c7 60 RSP: 0018:fffffe8040b4fbd0 EFLAGS: 00010283 RAX: 00000000000000cc RBX: dffffc0000000000 RCX: ffffffff818c4054 RDX: ffffffff84947381 RSI: ffffffff818d1512 RDI: 0000000000000000 RBP: ffff8880aaa62c00 R08: 0000000000000001 R09: fffffbd008169f32 R10: fffffe8040b4f997 R11: 0000000000000001 R12: a1988d84f24943e4 R13: ffffffffffffff02 R14: ffffffffffffff04 R15: ffff8880aaa62c08 RBX: kasan shadow of 0x0 RCX: __wake_up_klogd.part.0+0x74/0xe0 kernel/printk/printk.c:4554 RDX: __list_del_entry_valid_or_report+0x141/0x200 lib/list_debug.c:58 RSI: vprintk+0x72/0x100 kernel/printk/printk_safe.c:71 RBP: autoslab_size_M_dev_P_net_core_dev_11127_8_1328_8_S_4096_A_64_n_139+0xc00/0x1000 [slab object] RSP: process kstack fffffe8040b4fbd0+0x7bd0/0x8000 [kworker/u8:7+netns 1804 ] R09: kasan shadow of process kstack fffffe8040b4f990+0x7990/0x8000 [kworker/u8:7+netns 1804 ] R10: process kstack fffffe8040b4f997+0x7997/0x8000 [kworker/u8:7+netns 1804 ] R15: autoslab_size_M_dev_P_net_core_dev_11127_8_1328_8_S_4096_A_64_n_139+0xc08/0x1000 [slab object] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000748f5372c000 CR3: 0000000015408000 CR4: 00000000003406f0 shadow CR4: 00000000003406f0 Stack: 0000000000000000 ffffffff8a0c35e7 ffffffff8a0c3603 ffff8880aaa62c00 ffff8880aaa62c00 0000000000000004 ffff88811145311c 0000000000000005 0000000000000001 ffff8880aaa62000 fffffe8040b4fd40 ffffffff8a0c360d Call Trace: <TASK> [<ffffffff8a0c360d>] __list_del_entry_valid include/linux/list.h:131 [inline] fffffe8040b4fc28 [<ffffffff8a0c360d>] __list_del_entry include/linux/list.h:248 [inline] fffffe8040b4fc28 [<ffffffff8a0c360d>] list_del include/linux/list.h:262 [inline] fffffe8040b4fc28 [<ffffffff8a0c360d>] gtp_dellink+0x16d/0x360 drivers/net/gtp.c:1557 fffffe8040b4fc28 [<ffffffff8a0d0404>] gtp_net_exit_batch_rtnl+0x124/0x2c0 drivers/net/gtp.c:2495 fffffe8040b4fc88 [<ffffffff8e705b24>] cleanup_net+0x5a4/0xbe0 net/core/net_namespace.c:635 fffffe8040b4fcd0 [<ffffffff81754c97>] process_one_work+0xbd7/0x2160 kernel/workqueue.c:3326 fffffe8040b4fd88 [<ffffffff81757195>] process_scheduled_works kernel/workqueue.c:3407 [inline] fffffe8040b4fec0 [<ffffffff81757195>] worker_thread+0x6b5/0xfa0 kernel/workqueue.c:3488 fffffe8040b4fec0 [<ffffffff817782a0>] kthread+0x360/0x4c0 kernel/kthread.c:397 fffffe8040b4ff78 [<ffffffff814d8594>] ret_from_fork+0x74/0xe0 arch/x86/kernel/process.c:172 fffffe8040b4ffb8 [<ffffffff8110f509>] ret_from_fork_asm+0x29/0xc0 arch/x86/entry/entry_64.S:399 fffffe8040b4ffe8 </TASK> Modules linked in:
--- drivers/net/gtp.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/gtp.c +0 -5
@@ -1398,11 +1398,6 @@ static void __net_exit gtp_net_exit_batch_rtnl(struct list_head *net_list,list_for_each_entry (net, net_list, exit_list) {struct gtp_net *gn =net_generic (net, gtp_net_id);struct gtp_dev *gtp, *gtp_next; -struct net_device *dev; - -for_each_netdev (net, dev) -if (dev->rtnl_link_ops == >p_link_ops) -gtp_dellink (dev, dev_to_kill);list_for_each_entry_safe (gtp, gtp_next, &gn->gtp_dev_list, list)gtp_dellink (gtp->dev, dev_to_kill);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 337/462 geneve: Suppress list corruption splat in geneve_destroy_tunnels().
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 62fab6eef61f245dc8797e3a6a5b890ef40e8628 ]
As explained in the previous patch, iterating for_each_netdev() and gn->geneve_list during ->exit_batch_rtnl() could trigger ->dellink() twice for the same device.
If CONFIG_DEBUG_LIST is enabled, we will see a list_del() corruption splat in the 2nd call of geneve_dellink().
Let's remove for_each_netdev() in geneve_destroy_tunnels() and delegate that part to default_device_exit_batch().
--- drivers/net/geneve.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/net/geneve.c +0 -7
@@ -1963,14 +1963,7 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head) {struct geneve_net *gn =net_generic (net, geneve_net_id);struct geneve_dev *geneve, *next; -struct net_device *dev, *aux; -/* gather any geneve devices that were moved into this ns */ -for_each_netdev_safe (net, dev, aux) -if (dev->rtnl_link_ops == &geneve_link_ops) -geneve_dellink (dev, head); - -/* now gather any other geneve devices that were created in this ns */ list_for_each_entry_safe (geneve, next, &gn->geneve_list, next)geneve_dellink (geneve->dev, head); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 338/462 net: extract port range fields from fl_flow_key
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maksym Glubokiy <[email protected]>
[ Upstream commit 83d85bb069152b790caad905fa53e6d50cd3734d ]
So it can be used for port range filter offloading.
Stable-dep-of: 3e5796862c69 ("flow_dissector: Fix handling of mixed port and port-range keys")
--- include/net/flow_dissector.h | 16 ++++++++++++++++ include/net/flow_offload.h | 6 ++++++ net/core/flow_offload.c | 7 +++++++ net/sched/cls_flower.c | 8 +------- 4 files changed, 30 insertions(+), 7 deletions(-)
include/net/flow_dissector.h +16 -0
@@ -178,6 +178,22 @@ struct flow_dissector_key_ports { }; }; +/** +* struct flow_dissector_key_ports_range +* @tp: port number from packet +* @tp_min: min port number in range +* @tp_max: max port number in range +*/ +struct flow_dissector_key_ports_range { +union { +struct flow_dissector_key_ports tp; +struct { +struct flow_dissector_key_ports tp_min; +struct flow_dissector_key_ports tp_max; + }; + }; +}; +/** * flow_dissector_key_icmp: * type: ICMP type
include/net/flow_offload.h +6 -0
@@ -48,6 +48,10 @@ struct flow_match_ports {struct flow_dissector_key_ports *key, *mask; }; +struct flow_match_ports_range { +struct flow_dissector_key_ports_range *key, *mask; +}; +struct flow_match_icmp {struct flow_dissector_key_icmp *key, *mask; };
@@ -94,6 +98,8 @@ void flow_rule_match_ip(const struct flow_rule *rule, struct flow_match_ip *out);void flow_rule_match_ports (const struct flow_rule *rule,struct flow_match_ports *out); +void flow_rule_match_ports_range (const struct flow_rule *rule, +struct flow_match_ports_range *out);void flow_rule_match_tcp (const struct flow_rule *rule,struct flow_match_tcp *out); void flow_rule_match_icmp(const struct flow_rule *rule,
net/core/flow_offload.c +7 -0
@@ -104,6 +104,13 @@ void flow_rule_match_ports(const struct flow_rule *rule, }EXPORT_SYMBOL (flow_rule_match_ports); +void flow_rule_match_ports_range (const struct flow_rule *rule, +struct flow_match_ports_range *out) +{ +FLOW_DISSECTOR_MATCH (rule,FLOW_DISSECTOR_KEY_PORTS_RANGE , out); +} +EXPORT_SYMBOL (flow_rule_match_ports_range); +void flow_rule_match_tcp (const struct flow_rule *rule,struct flow_match_tcp *out) {
net/sched/cls_flower.c +1 -7
@@ -61,13 +61,7 @@ struct fl_flow_key {struct flow_dissector_key_ip ip;struct flow_dissector_key_ip enc_ip;struct flow_dissector_key_enc_opts enc_opts; -union { -struct flow_dissector_key_ports tp; -struct { -struct flow_dissector_key_ports tp_min; -struct flow_dissector_key_ports tp_max; - }; - } tp_range; +struct flow_dissector_key_ports_range tp_range;struct flow_dissector_key_ct ct;struct flow_dissector_key_hash hash; }__aligned(BITS_PER_LONG / 8) ;/* Ensure that we can do comparisons as longs. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 339/462 flow_dissector: Fix handling of mixed port and port-range keys
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 3e5796862c692ea608d96f0a1437f9290f44953a ]
This patch fixes a bug in TC flower filter where rules combining a specific destination port with a source port range weren't working correctly.
The specific case was when users tried to configure rules like:
tc filter add dev ens38 ingress protocol ip flower ip_proto udp \dst_port 5000 src_port 2000-3000 action drop
The root cause was in the flow dissector code. While both FLOW_DISSECTOR_KEY_PORTS and FLOW_DISSECTOR_KEY_PORTS_RANGE flags were being set correctly in the classifier, the __skb_flow_dissect_ports() function was only populating one of them: whichever came first in the enum check. This meant that when the code needed both a specific port and a port range, one of them would be left as 0, causing the filter to not match packets as expected.
Fix it by removing the either/or logic and instead checking and populating both key types independently when they're in use.
--- net/core/flow_dissector.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
net/core/flow_dissector.c +19 -12
@@ -716,23 +716,30 @@ __skb_flow_dissect_ports(const struct sk_buff *skb, void *target_container, void *data, int nhoff, u8 ip_proto, int hlen) { - enum flow_dissector_key_id dissector_ports = FLOW_DISSECTOR_KEY_MAX; -struct flow_dissector_key_ports *key_ports; + struct flow_dissector_key_ports_range *key_ports_range = NULL; +struct flow_dissector_key_ports *key_ports =NULL ; +__be32 ports;if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_PORTS )) - dissector_ports =FLOW_DISSECTOR_KEY_PORTS ; -else if (dissector_uses_key (flow_dissector, -FLOW_DISSECTOR_KEY_PORTS_RANGE )) - dissector_ports =FLOW_DISSECTOR_KEY_PORTS_RANGE ; + key_ports =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_PORTS , + target_container); + +if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_PORTS_RANGE )) + key_ports_range =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_PORTS_RANGE , + target_container); -if (dissector_ports ==FLOW_DISSECTOR_KEY_MAX ) +if (!key_ports && !key_ports_range)return ; - key_ports =skb_flow_dissector_target (flow_dissector, - dissector_ports, - target_container); - key_ports->ports =__skb_flow_get_ports (skb, nhoff, ip_proto, - data, hlen); + ports =__skb_flow_get_ports (skb, nhoff, ip_proto, data, hlen); + +if (key_ports) + key_ports->ports = ports; + +if (key_ports_range) + key_ports_range->tp.ports = ports; } static void
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 340/462 flow_dissector: Fix port range key handling in BPF conversion
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 69ab34f705fbfabcace64b5d53bb7a4450fac875 ]
Fix how port range keys are handled in __skb_flow_bpf_to_target() by:
- Separating PORTS and PORTS_RANGE key handling
- Using correct key_ports_range structure for range keys
- Properly initializing both key types independently
This ensures port range information is correctly stored in its dedicated structure rather than incorrectly using the regular ports key structure.
--- net/core/flow_dissector.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
net/core/flow_dissector.c +10 -8
@@ -792,6 +792,7 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys,struct flow_dissector *flow_dissector, void *target_container) { + struct flow_dissector_key_ports_range *key_ports_range = NULL;struct flow_dissector_key_ports *key_ports =NULL ;struct flow_dissector_key_control *key_control;struct flow_dissector_key_basic *key_basic;
@@ -836,20 +837,21 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys, key_control->addr_type =FLOW_DISSECTOR_KEY_IPV6_ADDRS ; } -if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_PORTS )) +if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_PORTS )) { key_ports =skb_flow_dissector_target (flow_dissector,FLOW_DISSECTOR_KEY_PORTS , target_container); -else if (dissector_uses_key (flow_dissector, -FLOW_DISSECTOR_KEY_PORTS_RANGE )) - key_ports =skb_flow_dissector_target (flow_dissector, -FLOW_DISSECTOR_KEY_PORTS_RANGE , - target_container); - -if (key_ports) { key_ports->src = flow_keys->sport; key_ports->dst = flow_keys->dport; } +if (dissector_uses_key (flow_dissector, +FLOW_DISSECTOR_KEY_PORTS_RANGE )) { + key_ports_range =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_PORTS_RANGE , + target_container); + key_ports_range->tp.src = flow_keys->sport; + key_ports_range->tp.dst = flow_keys->dport; + }if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_FLOW_LABEL )) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 341/462 power: supply: da9150-fg: fix potential overflow
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vatoropin <[email protected]>
[ Upstream commit 3fb3cb4350befc4f901c54e0cb4a2a47b1302e08 ]
Size of variable sd_gain equals four bytes - DA9150_QIF_SD_GAIN_SIZE. Size of variable shunt_val equals two bytes - DA9150_QIF_SHUNT_VAL_SIZE.
The expression sd_gain * shunt_val is currently being evaluated using 32-bit arithmetic. So during the multiplication an overflow may occur.
As the value of type 'u64' is used as storage for the eventual result, put ULL variable at the first position of each expression in order to give the compiler complete information about the proper arithmetic to use. According to C99 the guaranteed width for a variable of type 'unsigned long long' >= 64 bits.
Remove the explicit cast to u64 as it is meaningless.
Just for the sake of consistency, perform the similar trick with another expression concerning 'iavg'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/power/supply/da9150-fg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/supply/da9150-fg.c +2 -2
@@ -247,9 +247,9 @@ static int da9150_fg_current_avg(struct da9150_fg *fg, DA9150_QIF_SD_GAIN_SIZE);da9150_fg_read_sync_end (fg); - div = (u64) (sd_gain * shunt_val *65536ULL ); + div =65536ULL * sd_gain * shunt_val;do_div (div,1000000 ); - res = (u64) (iavg *1000000ULL ); + res =1000000ULL * iavg;do_div (res, div); val->intval = (int ) res;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 342/462 bpf: skip non exist keys in generic_map_lookup_batch
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yan Zhai <[email protected]>
[ Upstream commit 5644c6b50ffee0a56c1e01430a8c88e34decb120 ]
The generic_map_lookup_batch currently returns EINTR if it fails with ENOENT and retries several times on bpf_map_copy_value. The next batch would start from the same location, presuming it's a transient issue. This is incorrect if a map can actually have "holes", i.e. "get_next_key" can return a key that does not point to a valid value. At least the array of maps type may contain such holes legitly. Right now these holes show up, generic batch lookup cannot proceed any more. It will always fail with EINTR errors.
Rather, do not retry in generic_map_lookup_batch. If it finds a non existing element, skip to the next key. This simple solution comes with a price that transient errors may not be recovered, and the iteration might cycle back to the first key under parallel deletion. For example, Hou Tao <[email protected]> pointed out a following scenario:
For LPM trie map:
(1) ->map_get_next_key(map, prev_key, key) returns a valid key
(2) bpf_map_copy_value() return -ENOMENT
It means the key must be deleted concurrently.
(3) goto next_key
It swaps the prev_key and key
(4) ->map_get_next_key(map, prev_key, key) againprev_key points to a non-existing key, for LPM trie it will treat just like prev_key=NULL case, the returned key will be duplicated.
With the retry logic, the iteration can continue to the key next to the deleted one. But if we directly skip to the next key, the iteration loop would restart from the first key for the lpm_trie type.
However, not all races may be recovered. For example, if current key is deleted after instead of before bpf_map_copy_value, or if the prev_key also gets deleted, then the loop will still restart from the first key for lpm_tire anyway. For generic lookup it might be better to stay simple, i.e. just skip to the next key. To guarantee that the output keys are not duplicated, it is better to implement map type specific batch operations, which can properly lock the trie and synchronize with concurrent mutators.
--- kernel/bpf/syscall.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
kernel/bpf/syscall.c +5 -13
@@ -1406,8 +1406,6 @@ int generic_map_update_batch(struct bpf_map *map,return err; } -#define MAP_LOOKUP_RETRIES 3 -int generic_map_lookup_batch (struct bpf_map *map,const union bpf_attr *attr,union bpf_attr __user *uattr)
@@ -1417,8 +1415,8 @@ int generic_map_lookup_batch(struct bpf_map *map,void __user *values =u64_to_user_ptr (attr->batch.values);void __user *keys =u64_to_user_ptr (attr->batch.keys);void *buf, *buf_prevkey, *prev_key, *key, *value; -int err, retry =MAP_LOOKUP_RETRIES ;u32 value_size, cp, max_count; +int err;if (attr->batch.elem_flags & ~BPF_F_LOCK )return -EINVAL ;
@@ -1464,14 +1462,8 @@ int generic_map_lookup_batch(struct bpf_map *map, err =bpf_map_copy_value (map, key, value, attr->batch.elem_flags); -if (err == -ENOENT ) { -if (retry) { - retry--; -continue ; - } - err = -EINTR ; -break ; - } +if (err == -ENOENT ) + goto next_key;if (err) goto free_buf;
@@ -1486,12 +1478,12 @@ int generic_map_lookup_batch(struct bpf_map *map, goto free_buf; } + cp++; +next_key:if (!prev_key) prev_key = buf_prevkey;swap (prev_key, key); - retry =MAP_LOOKUP_RETRIES ; - cp++;cond_resched (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 343/462 tee: optee: Fix supplicant wait loop
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sumit Garg <[email protected]>
commit 70b0d6b0a199c5a3ee6c72f5e61681ed6f759612 upstream.
OP-TEE supplicant is a user-space daemon and it's possible for it be hung or crashed or killed in the middle of processing an OP-TEE RPC call. It becomes more complicated when there is incorrect shutdown ordering of the supplicant process vs the OP-TEE client application which can eventually lead to system hang-up waiting for the closure of the client application.
Allow the client process waiting in kernel for supplicant response to be killed rather than indefinitely waiting in an unkillable state. Also, a normal uninterruptible wait should not have resulted in the hung-task watchdog getting triggered, but the endless loop would.
This fixes issues observed during system reboot/shutdown when supplicant got hung for some reason or gets crashed/killed which lead to client getting hung in an unkillable state. It in turn lead to system being in hung up state requiring hard power off/on to recover.
--- drivers/tee/optee/supp.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/tee/optee/supp.c +8 -27
@@ -80,7 +80,6 @@ u32 optee_supp_thrd_req(struct tee_contestruct optee *optee =tee_get_drvdata (ctx->teedev);struct optee_supp *supp = &optee->supp;struct optee_supp_req *req; -bool interruptable;u32 ret;/*
@@ -111,36 +110,18 @@ u32 optee_supp_thrd_req(struct tee_conte/* * Wait for supplicant to process and return result, once we've * returned from wait_for_completion(&req->c) successfully we have -* exclusive access again. +* exclusive access again. Allow the wait to be killable such that +* the wait doesn't turn into an indefinite state if the supplicant +* gets hung for some reason. */ -while (wait_for_completion_interruptible (&req->c)) { +if (wait_for_completion_killable (&req->c)) {mutex_lock (&supp->mutex); - interruptable = !supp->ctx; -if (interruptable) { -/* -* There's no supplicant available and since the -* supp->mutex currently is held none can -* become available until the mutex released -* again. -* -* Interrupting an RPC to supplicant is only -* allowed as a way of slightly improving the user -* experience in case the supplicant hasn't been -* started yet. During normal operation the supplicant -* will serve all requests in a timely manner and -* interrupting then wouldn't make sense. -*/ -if (req->in_queue) { -list_del (&req->link); - req->in_queue = false; - } +if (req->in_queue) { +list_del (&req->link); + req->in_queue = false; }mutex_unlock (&supp->mutex); - -if (interruptable) { - req->ret =TEEC_ERROR_COMMUNICATION ; -break ; - } + req->ret =TEEC_ERROR_COMMUNICATION ; } ret = req->ret;
Greg Kroah-Hartman
maintainerPATCH 344/462 nfp: bpf: Add check for nfp_app_ctrl_msg_alloc()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit 878e7b11736e062514e58f3b445ff343e6705537 upstream.
Add check for the return value of nfp_app_ctrl_msg_alloc() in nfp_bpf_cmsg_alloc() to prevent null pointer dereference.
--- drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/netronome/nfp/bpf/cmsg.c +2 -0
@@ -20,6 +20,8 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bstruct sk_buff *skb; skb =nfp_app_ctrl_msg_alloc (bpf->app, size,GFP_KERNEL ); +if (!skb) +return NULL ;skb_put (skb, size);return skb;
Greg Kroah-Hartman
maintainerPATCH 345/462 ALSA: hda/conexant: Add quirk for HP ProBook 450 G4 mute LED
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Veness <[email protected]>
commit 6d1f86610f23b0bc334d6506a186f21a98f51392 upstream.
Allows the LED on the dedicated mute button on the HP ProBook 450 G4 laptop to change colour correctly.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1025,6 +1025,7 @@ static const struct snd_pci_quirk cxt506SND_PCI_QUIRK (0x103c ,0x814f ,"HP ZBook 15u G3" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x8174 ,"HP Spectre x360" ,CXT_FIXUP_HP_SPECTRE ),SND_PCI_QUIRK (0x103c ,0x822e ,"HP ProBook 440 G4" ,CXT_FIXUP_MUTE_LED_GPIO ), +SND_PCI_QUIRK (0x103c ,0x8231 ,"HP ProBook 450 G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x828c ,"HP EliteBook 840 G4" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x8299 ,"HP 800 G3 SFF" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 346/462 acct: block access to kernel internal filesystems
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
commit 890ed45bde808c422c3c27d3285fc45affa0f930 upstream.
There's no point in allowing anything kernel internal nor procfs or sysfs.
--- kernel/acct.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
kernel/acct.c +14 -0
@@ -216,6 +216,20 @@ static int acct_on(struct filename *pathreturn -EACCES ; } +/* Exclude kernel kernel internal filesystems. */ +if (file_inode (file)->i_sb->s_flags & (SB_NOUSER |SB_KERNMOUNT )) { +kfree (acct); +filp_close (file,NULL ); +return -EINVAL ; + } + +/* Exclude procfs and sysfs. */ +if (file_inode (file)->i_sb->s_iflags &SB_I_USERNS_VISIBLE ) { +kfree (acct); +filp_close (file,NULL ); +return -EINVAL ; + } +if (!(file->f_mode &FMODE_CAN_WRITE )) {kfree (acct);filp_close (file,NULL );
Greg Kroah-Hartman
maintainerPATCH 347/462 mtd: rawnand: cadence: fix error code in cadence_nand_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niravkumar L Rabara <[email protected]>
commit 2b9df00cded911e2ca2cfae5c45082166b24f8aa upstream.
Replace dma_request_channel() with dma_request_chan_by_mask() and use helper functions to return proper error code instead of fixed -EBUSY.
--- drivers/mtd/nand/raw/cadence-nand-controller.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +4 -5
@@ -2866,11 +2866,10 @@ static int cadence_nand_init(struct cdnsdma_cap_set (DMA_MEMCPY , mask);if (cdns_ctrl->caps1->has_dma) { - cdns_ctrl->dmac =dma_request_channel (mask,NULL ,NULL ); -if (!cdns_ctrl->dmac) { -dev_err (cdns_ctrl->dev, -"Unable to get a DMA channel\n" ); - ret = -EBUSY ; + cdns_ctrl->dmac =dma_request_chan_by_mask (&mask); +if (IS_ERR (cdns_ctrl->dmac)) { + ret =dev_err_probe (cdns_ctrl->dev,PTR_ERR (cdns_ctrl->dmac), +"%d: Failed to get a DMA channel\n" , ret); goto disable_irq; } }
Greg Kroah-Hartman
maintainerPATCH 348/462 mtd: rawnand: cadence: use dma_map_resource for sdma address
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niravkumar L Rabara <[email protected]>
commit d76d22b5096c5b05208fd982b153b3f182350b19 upstream.
Remap the slave DMA I/O resources to enhance driver portability. Using a physical address causes DMA translation failure when the ARM SMMU is enabled.
--- drivers/mtd/nand/raw/cadence-nand-controller.c | 29 +++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +25 -4
@@ -469,6 +469,8 @@ struct cdns_nand_ctrl {struct {void __iomem *virt;dma_addr_t dma; +dma_addr_t iova_dma; +u32 size; } io;int irq;
@@ -1830,11 +1832,11 @@ static int cadence_nand_slave_dma_transf }if (dir ==DMA_FROM_DEVICE ) { - src_dma = cdns_ctrl->io.dma; + src_dma = cdns_ctrl->io.iova_dma; dst_dma = buf_dma; }else { src_dma = buf_dma; - dst_dma = cdns_ctrl->io.dma; + dst_dma = cdns_ctrl->io.iova_dma; } tx = dmaengine_prep_dma_memcpy(cdns_ctrl->dmac, dst_dma, src_dma, len,
@@ -2831,6 +2833,7 @@ cadence_nand_irq_cleanup(int irqnum, strstatic int cadence_nand_init (struct cdns_nand_ctrl *cdns_ctrl) {dma_cap_mask_t mask; +struct dma_device *dma_dev = cdns_ctrl->dmac->device;int ret; cdns_ctrl->cdma_desc = dma_alloc_coherent(cdns_ctrl->dev,
@@ -2874,6 +2877,16 @@ static int cadence_nand_init(struct cdns } } + cdns_ctrl->io.iova_dma =dma_map_resource (dma_dev->dev, cdns_ctrl->io.dma, + cdns_ctrl->io.size, +DMA_BIDIRECTIONAL ,0 ); + + ret =dma_mapping_error (dma_dev->dev, cdns_ctrl->io.iova_dma); +if (ret) { +dev_err (cdns_ctrl->dev,"Failed to map I/O resource to DMA\n" ); + goto dma_release_chnl; + } +nand_controller_init (&cdns_ctrl->controller);INIT_LIST_HEAD (&cdns_ctrl->chips);
@@ -2884,18 +2897,22 @@ static int cadence_nand_init(struct cdnsif (ret) {dev_err (cdns_ctrl->dev,"Failed to register MTD: %d\n" , ret); - goto dma_release_chnl; + goto unmap_dma_resource; }kfree (cdns_ctrl->buf); cdns_ctrl->buf =kzalloc (cdns_ctrl->buf_size,GFP_KERNEL );if (!cdns_ctrl->buf) { ret = -ENOMEM ; - goto dma_release_chnl; + goto unmap_dma_resource; }return 0 ; +unmap_dma_resource: +dma_unmap_resource (dma_dev->dev, cdns_ctrl->io.iova_dma, + cdns_ctrl->io.size,DMA_BIDIRECTIONAL ,0 ); + dma_release_chnl:if (cdns_ctrl->dmac)dma_release_channel (cdns_ctrl->dmac);
@@ -2917,6 +2934,8 @@ 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 );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),
@@ -2985,7 +3004,9 @@ static int cadence_nand_dt_probe(struct cdns_ctrl->io.virt =devm_platform_get_and_ioremap_resource (ofdev,1 , &res);if (IS_ERR (cdns_ctrl->io.virt))return PTR_ERR (cdns_ctrl->io.virt); + cdns_ctrl->io.dma = res->start; + cdns_ctrl->io.size =resource_size (res); dt->clk =devm_clk_get (cdns_ctrl->dev,"nf_clk" );if (IS_ERR (dt->clk))
Greg Kroah-Hartman
maintainerPATCH 349/462 mtd: rawnand: cadence: fix incorrect device in dma_unmap_single
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niravkumar L Rabara <[email protected]>
commit f37d135b42cb484bdecee93f56b9f483214ede78 upstream.
dma_map_single is using physical/bus device (DMA) but dma_unmap_single is using framework device(NAND controller), which is incorrect. Fixed dma_unmap_single to use correct physical/bus device.
--- drivers/mtd/nand/raw/cadence-nand-controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +2 -2
@@ -1858,12 +1858,12 @@ static int cadence_nand_slave_dma_transfdma_async_issue_pending (cdns_ctrl->dmac);wait_for_completion (&finished); -dma_unmap_single (cdns_ctrl->dev, buf_dma, len, dir); +dma_unmap_single (dma_dev->dev, buf_dma, len, dir);return 0 ; err_unmap: -dma_unmap_single (cdns_ctrl->dev, buf_dma, len, dir); +dma_unmap_single (dma_dev->dev, buf_dma, len, dir); err:dev_dbg (cdns_ctrl->dev,"Fall back to CPU I/O\n" );
Greg Kroah-Hartman
maintainerPATCH 350/462 x86/cpu/kvm: SRSO: Fix possible missing IBPB on VM-Exit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrick Bellasi <[email protected]>
commit 318e8c339c9a0891c389298bb328ed0762a9935e upstream.
In [1] the meaning of the synthetic IBPB flags has been redefined for a better separation of concerns:
- ENTRY_IBPB -- issue IBPB on entry only
- IBPB_ON_VMEXIT -- issue IBPB on VM-Exit only
and the Retbleed mitigations have been updated to match this new semantics.
Commit [2] was merged shortly before [1], and their interaction was not handled properly. This resulted in IBPB not being triggered on VM-Exit in all SRSO mitigation configs requesting an IBPB there.
Specifically, an IBPB on VM-Exit is triggered only when X86_FEATURE_IBPB_ON_VMEXIT is set. However:
- X86_FEATURE_IBPB_ON_VMEXIT is not set for "spec_rstack_overflow=ibpb", because before [1] having X86_FEATURE_ENTRY_IBPB was enough. Hence, an IBPB is triggered on entry but the expected IBPB on VM-exit is not.
- X86_FEATURE_IBPB_ON_VMEXIT is not set also when "spec_rstack_overflow=ibpb-vmexit" if X86_FEATURE_ENTRY_IBPB is already set.
That's because before [1] this was effectively redundant. Hence, e.g. a "retbleed=ibpb spec_rstack_overflow=bpb-vmexit" config mistakenly reports the machine still vulnerable to SRSO, despite an IBPB being triggered both on entry and VM-Exit, because of the Retbleed selected mitigation config.
- UNTRAIN_RET_VM won't still actually do anything unless CONFIG_MITIGATION_IBPB_ENTRY is set.
For "spec_rstack_overflow=ibpb", enable IBPB on both entry and VM-Exit and clear X86_FEATURE_RSB_VMEXIT which is made superfluous by X86_FEATURE_IBPB_ON_VMEXIT. This effectively makes this mitigation option similar to the one for 'retbleed=ibpb', thus re-order the code for the RETBLEED_MITIGATION_IBPB option to be less confusing by having all features enabling before the disabling of the not needed ones.
For "spec_rstack_overflow=ibpb-vmexit", guard this mitigation setting with CONFIG_MITIGATION_IBPB_ENTRY to ensure UNTRAIN_RET_VM sequence is effectively compiled in. Drop instead the CONFIG_MITIGATION_SRSO guard, since none of the SRSO compile cruft is required in this configuration. Also, check only that the required microcode is present to effectively enabled the IBPB on VM-Exit.
Finally, update the KConfig description for CONFIG_MITIGATION_IBPB_ENTRY to list also all SRSO config settings enabled by this guard.
--- arch/x86/Kconfig | 3 ++- arch/x86/kernel/cpu/bugs.c | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-)
arch/x86/Kconfig +2 -1
@@ -2463,7 +2463,8 @@ config CPU_IBPB_ENTRY depends on CPU_SUP_AMD && X86_64 default y help - Compile the kernel with support for the retbleed=ibpb mitigation. + Compile the kernel with support for the retbleed=ibpb and + spec_rstack_overflow={ibpb,ibpb-vmexit} mitigations. config CPU_IBRS_ENTRY bool "Enable IBRS on kernel entry"
arch/x86/kernel/cpu/bugs.c +14 -6
@@ -1061,6 +1061,8 @@ do_cmd_auto:case RETBLEED_MITIGATION_IBPB :setup_force_cpu_cap (X86_FEATURE_ENTRY_IBPB ); +setup_force_cpu_cap (X86_FEATURE_IBPB_ON_VMEXIT ); + mitigate_smt = true;/* * IBPB on entry already obviates the need for
@@ -1070,8 +1072,6 @@ do_cmd_auto:setup_clear_cpu_cap (X86_FEATURE_UNRET );setup_clear_cpu_cap (X86_FEATURE_RETHUNK ); - mitigate_smt = true; -/* * There is no need for RSB filling: entry_ibpb() ensures * all predictions, including the RSB, are invalidated,
@@ -2469,6 +2469,7 @@ static void __init srso_select_mitigatioif (IS_ENABLED (CONFIG_CPU_IBPB_ENTRY )) {if (has_microcode) {setup_force_cpu_cap (X86_FEATURE_ENTRY_IBPB ); +setup_force_cpu_cap (X86_FEATURE_IBPB_ON_VMEXIT ); srso_mitigation =SRSO_MITIGATION_IBPB ;/*
@@ -2478,6 +2479,13 @@ static void __init srso_select_mitigatio*/ setup_clear_cpu_cap (X86_FEATURE_UNRET );setup_clear_cpu_cap (X86_FEATURE_RETHUNK ); + +/* +* There is no need for RSB filling: entry_ibpb() ensures +* all predictions, including the RSB, are invalidated, +* regardless of IBPB implementation. +*/ +setup_clear_cpu_cap (X86_FEATURE_RSB_VMEXIT ); } }else {pr_err ("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n" );
@@ -2486,8 +2494,8 @@ static void __init srso_select_mitigatiobreak ;case SRSO_CMD_IBPB_ON_VMEXIT : -if (IS_ENABLED (CONFIG_CPU_SRSO )) { -if (!boot_cpu_has (X86_FEATURE_ENTRY_IBPB ) && has_microcode) { +if (IS_ENABLED (CONFIG_CPU_IBPB_ENTRY )) { +if (has_microcode) {setup_force_cpu_cap (X86_FEATURE_IBPB_ON_VMEXIT ); srso_mitigation =SRSO_MITIGATION_IBPB_ON_VMEXIT ;
@@ -2499,9 +2507,9 @@ static void __init srso_select_mitigatiosetup_clear_cpu_cap (X86_FEATURE_RSB_VMEXIT ); } }else { -pr_err ("WARNING: kernel not compiled with CPU_SRSO.\n" ); +pr_err ("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n" ); goto pred_cmd; - } + }break ;default :
Greg Kroah-Hartman
maintainerPATCH 351/462 IB/mlx5: Set and get correct qp_num for a DCT QP
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Zhang <[email protected]>
[ Upstream commit 12d044770e12c4205fa69535b4fa8a9981fea98f ]
When a DCT QP is created on an active lag, it's dctc.port is assigned in a round-robin way, which is from 1 to dev->lag_port. In this case when querying this QP, we may get qp_attr.port_num > 2.
Fix this by setting qp->port when modifying a DCT QP, and read port_num from qp->port instead of dctc.port when querying it.
--- drivers/infiniband/hw/mlx5/qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/qp.c +3 -1
@@ -4219,6 +4219,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr, set_id =mlx5_ib_get_counters_id (dev, attr->port_num -1 );MLX5_SET (dctc, dctc, counter_set_id, set_id); + + qp->port = attr->port_num; }else if (cur_state ==IB_QPS_INIT && new_state ==IB_QPS_RTR ) {struct mlx5_ib_modify_qp_resp resp = {};u32 out[MLX5_ST_SZ_DW (create_dct_out)] = {};
@@ -4714,7 +4716,7 @@ static int mlx5_ib_dct_query_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *mqp, }if (qp_attr_mask &IB_QP_PORT ) - qp_attr->port_num =MLX5_GET (dctc, dctc, port); + qp_attr->port_num = mqp->port;if (qp_attr_mask &IB_QP_MIN_RNR_TIMER ) qp_attr->min_rnr_timer =MLX5_GET (dctc, dctc, min_rnr_nak);if (qp_attr_mask &IB_QP_AV ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 352/462 RDMA/mlx5: Fix bind QP error cleanup flow
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit e1a0bdbdfdf08428f0ede5ae49c7f4139ac73ef5 ]
When there is a failure during bind QP, the cleanup flow destroys the counter regardless if it is the one that created it or not, which is problematic since if it isn't the one that created it, that counter could still be in use.
Fix that by destroying the counter only if it was created during this call.
--- drivers/infiniband/hw/mlx5/counters.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx5/counters.c +6 -2
@@ -337,6 +337,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, struct ib_qp *qp) {struct mlx5_ib_dev *dev =to_mdev (qp->device); +bool new = false;int err;if (!counter->id) {
@@ -351,6 +352,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter,return err; counter->id =MLX5_GET (alloc_q_counter_out, out, counter_set_id); + new = true; } err =mlx5_ib_qp_set_counter (qp, counter);
@@ -360,8 +362,10 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter,return 0 ; fail_set_counter: -mlx5_ib_counter_dealloc (counter); - counter->id =0 ; +if (new) { +mlx5_ib_counter_dealloc (counter); + counter->id =0 ; + }return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 353/462 sunrpc: suppress warnings for unused procfs functions
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 1f7a4f98c11fbeb18ed21f3b3a497e90a50ad2e0 ]
There is a warning about unused variables when building with W=1 and no procfs:
net/sunrpc/cache.c:1660:30: error: 'cache_flush_proc_ops' defined but not used [-Werror=unused-const-variable=]
1660 | static const struct proc_ops cache_flush_proc_ops = {
| ^~~~~~~~~~~~~~~~~~~~
net/sunrpc/cache.c:1622:30: error: 'content_proc_ops' defined but not used [-Werror=unused-const-variable=]
1622 | static const struct proc_ops content_proc_ops = {
| ^~~~~~~~~~~~~~~~
net/sunrpc/cache.c:1598:30: error: 'cache_channel_proc_ops' defined but not used [-Werror=unused-const-variable=]
1598 | static const struct proc_ops cache_channel_proc_ops = {
| ^~~~~~~~~~~~~~~~~~~~~~These are used inside of an #ifdef, so replacing that with an IS_ENABLED() check lets the compiler see how they are used while still dropping them during dead code elimination.
--- net/sunrpc/cache.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
net/sunrpc/cache.c +3 -7
@@ -1678,12 +1678,14 @@ static void remove_cache_proc_entries(struct cache_detail *cd) } } -#ifdef CONFIG_PROC_FS static int create_cache_proc_entries (struct cache_detail *cd,struct net *net) {struct proc_dir_entry *p;struct sunrpc_net *sn; +if (!IS_ENABLED (CONFIG_PROC_FS )) +return 0 ; + sn =net_generic (net, sunrpc_net_id); cd->procfs =proc_mkdir (cd->name, sn->proc_net_rpc);if (cd->procfs ==NULL )
@@ -1711,12 +1713,6 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)remove_cache_proc_entries (cd);return -ENOMEM ; } -#else /* CONFIG_PROC_FS */ -static int create_cache_proc_entries (struct cache_detail *cd,struct net *net) -{ -return 0 ; -} -#endif void __init cache_initialize (void ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 354/462 ALSA: usb-audio: Avoid dropping MIDI events at closing multiple ports
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit a3bdd8f5c2217e1cb35db02c2eed36ea20fb50f5 ]
We fixed the UAF issue in USB MIDI code by canceling the pending work at closing each MIDI output device in the commit below. However, this assumed that it's the only one that is tied with the endpoint, and it resulted in unexpected data truncations when multiple devices are assigned to a single endpoint and opened simultaneously.
For addressing the unexpected MIDI message drops, simply replace cancel_work_sync() with flush_work(). The drain callback should have been already invoked before the close callback, hence the port->active flag must be already cleared. So this just assures that the pending work is finished before freeing the resources.
--- sound/usb/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/midi.c +1 -1
@@ -1161,7 +1161,7 @@ static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream) {struct usbmidi_out_port *port = substream->runtime->private_data; -cancel_work_sync (&port->ep->work); +flush_work (&port->ep->work);return substream_open (substream,0 ,0 ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 355/462 Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit b25120e1d5f2ebb3db00af557709041f47f7f3d0 ]
L2CAP_ECRED_CONN_RSP needs to respond DCID in the same order received as SCID but the order is reversed due to use of list_add which actually prepend channels to the list so the response is reversed:
Quoted 1 line
ACL Data RX: Handle 16 flags
0x02dlen 26
LE L2CAP: Enhanced Credit Connection Request (0x17) ident 2 len 18
PSM: 39 (0x0027)
MTU: 256
MPS: 251
Credits: 65535
Source CID: 116
Source CID: 117
Source CID: 118
Source CID: 119
Source CID: 120< ACL Data TX: Handle 16 flags 0x00 dlen 26
LE L2CAP: Enhanced Credit Connection Response (0x18) ident 2 len 18
MTU: 517
MPS: 247
Credits: 3
Result: Connection successful (0x0000)
Destination CID: 68
Destination CID: 67
Destination CID: 66
Destination CID: 65
Destination CID: 64
Also make sure the response don't include channels that are not on BT_CONNECT2 since the chan->ident can be set to the same value as in the following trace:
< ACL Data TX: Handle 16 flags 0x00 dlen 12
LE L2CAP: LE Flow Control Credit (0x16) ident 6 len 4
Source CID: 64
Credits: 1
...
Quoted 1 line
ACL Data RX: Handle 16 flags
0x02dlen 18
LE L2CAP: Enhanced Credit Connection Request (0x17) ident 6 len 10
PSM: 39 (0x0027)
MTU: 517
MPS: 251
Credits: 255
Source CID: 70
< ACL Data TX: Handle 16 flags 0x00 dlen 20
LE L2CAP: Enhanced Credit Connection Response (0x18) ident 6 len 12
MTU: 517
MPS: 247
Credits: 3
Result: Connection successful (0x0000)
Destination CID: 64
Destination CID: 68--- net/bluetooth/l2cap_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_core.c +7 -2
@@ -632,7 +632,8 @@ void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan) test_bit(FLAG_HOLD_HCI_CONN, &chan->flags))hci_conn_hold (conn->hcon); -list_add (&chan->list, &conn->chan_l); +/* Append to the list since the order matters for ECRED */ +list_add_tail (&chan->list, &conn->chan_l); }void l2cap_chan_add (struct l2cap_conn *conn,struct l2cap_chan *chan)
@@ -3967,7 +3968,11 @@ static void l2cap_ecred_rsp_defer(struct l2cap_chan *chan, void *data) {struct l2cap_ecred_rsp_data *rsp = data; -if (test_bit (FLAG_ECRED_CONN_REQ_SENT , &chan->flags)) +/* Check if channel for outgoing connection or if it wasn't deferred +* since in those cases it must be skipped. +*/ +if (test_bit (FLAG_ECRED_CONN_REQ_SENT , &chan->flags) || + !test_and_clear_bit (FLAG_DEFER_SETUP , &chan->flags))return ;/* Reset ident so only one response is sent */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 356/462 net: loopback: Avoid sending IP packets without an Ethernet header
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 0e4427f8f587c4b603475468bb3aee9418574893 ]
After commit 22600596b675 ("ipv4: give an IPv4 dev to blackhole_netdev") IPv4 neighbors can be constructed on the blackhole net device, but they are constructed with an output function (neigh_direct_output()) that simply calls dev_queue_xmit(). The latter will transmit packets via 'skb->dev' which might not be the blackhole net device if dst_dev_put() switched 'dst->dev' to the blackhole net device while another CPU was using the dst entry in ip_output(), but after it already initialized 'skb->dev' from 'dst->dev'.
Specifically, the following can happen:
CPU1 CPU2
udp_sendmsg(sk1) udp_sendmsg(sk2)udp_send_skb() [...]ip_output()
skb->dev = skb_dst(skb)->dev
dst_dev_put()
dst->dev = blackhole_netdev
ip_finish_output2()
resolves neigh on dst->devneigh_output()neigh_direct_output()dev_queue_xmit()
This will result in IPv4 packets being sent without an Ethernet header via a valid net device:
tcpdump: verbose output suppressed, use -v[v]... for full protocol decode listening on enp9s0, link-type EN10MB (Ethernet), snapshot length 262144 bytes 22:07:02.329668 20:00:40:11:18:fb > 45:00:00:44:f4:94, ethertype Unknown (0x58c6), length 68:
0x0000: 8dda 74ca f1ae ca6c ca6c 0098 969c 0400 ..t....l.l......
0x0010: 0000 4730 3f18 6800 0000 0000 0000 9971 ..G0?.h........q
0x0020: c4c9 9055 a157 0a70 9ead bf83 38ca ab38 ...U.W.p....8..8
0x0030: 8add ab96 e052 .....RFix by making sure that neighbors are constructed on top of the blackhole net device with an output function that simply consumes the packets, in a similar fashion to dst_discard_out() and blackhole_netdev_xmit().
--- drivers/net/loopback.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/loopback.c +14 -0
@@ -243,8 +243,22 @@ static netdev_tx_t blackhole_netdev_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } +static int blackhole_neigh_output (struct neighbour *n,struct sk_buff *skb) +{ +kfree_skb (skb); +return 0 ; +} + +static int blackhole_neigh_construct (struct net_device *dev, +struct neighbour *n) +{ + n->output = blackhole_neigh_output; +return 0 ; +} +static const struct net_device_ops blackhole_netdev_ops = { .ndo_start_xmit = blackhole_netdev_xmit, + .ndo_neigh_construct = blackhole_neigh_construct, };/* This is a dst-dummy device used specifically for invalidated
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 357/462 net: cadence: macb: Synchronize stats calculations
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit fa52f15c745ce55261b92873676f64f7348cfe82 ]
Stats calculations involve a RMW to add the stat update to the existing value. This is currently not protected by any synchronization mechanism, so data races are possible. Add a spinlock to protect the update. The reader side could be protected using u64_stats, but we would still need a spinlock for the update side anyway. And we always do an update immediately before reading the stats anyway.
--- drivers/net/ethernet/cadence/macb.h | 2 ++ drivers/net/ethernet/cadence/macb_main.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/macb.h +2 -0
@@ -1191,6 +1191,8 @@ struct macb {struct clk *rx_clk;struct clk *tsu_clk;struct net_device *dev; +/* Protects hw_stats and ethtool_stats */ +spinlock_t stats_lock;union {struct macb_stats macb;struct gem_stats gem;
drivers/net/ethernet/cadence/macb_main.c +10 -2
@@ -1702,10 +1702,12 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)if (status &MACB_BIT (ISR_ROVR )) {/* We missed at least one packet */ +spin_lock (&bp->stats_lock);if (macb_is_gem (bp)) bp->hw_stats.gem.rx_overruns++;else bp->hw_stats.macb.rx_overruns++; +spin_unlock (&bp->stats_lock);if (bp->caps &MACB_CAPS_ISR_CLEAR_ON_WRITE )queue_writel (queue,ISR ,MACB_BIT (ISR_ROVR ));
@@ -2748,6 +2750,7 @@ static struct net_device_stats *gem_get_stats(struct macb *bp)if (!netif_running (bp->dev))return nstat; +spin_lock_irq (&bp->stats_lock);gem_update_stats (bp); nstat->rx_errors = (hwstat->rx_frame_check_sequence_errors +
@@ -2777,6 +2780,7 @@ static struct net_device_stats *gem_get_stats(struct macb *bp) nstat->tx_aborted_errors = hwstat->tx_excessive_collisions; nstat->tx_carrier_errors = hwstat->tx_carrier_sense_errors; nstat->tx_fifo_errors = hwstat->tx_underrun; +spin_unlock_irq (&bp->stats_lock);return nstat; }
@@ -2784,12 +2788,13 @@ static struct net_device_stats *gem_get_stats(struct macb *bp)static void gem_get_ethtool_stats (struct net_device *dev,struct ethtool_stats *stats,u64 *data) { -struct macb *bp; +struct macb *bp =netdev_priv (dev); - bp =netdev_priv (dev); +spin_lock_irq (&bp->stats_lock);gem_update_stats (bp);memcpy (data, &bp->ethtool_stats,sizeof (u64) * (GEM_STATS_LEN +QUEUE_STATS_LEN *MACB_MAX_QUEUES )); +spin_unlock_irq (&bp->stats_lock); }static int gem_get_sset_count (struct net_device *dev,int sset)
@@ -2839,6 +2844,7 @@ static struct net_device_stats *macb_get_stats(struct net_device *dev)return gem_get_stats (bp);/* read stats from hardware */ +spin_lock_irq (&bp->stats_lock);macb_update_stats (bp);/* Convert HW stats into netdevice stats */
@@ -2872,6 +2878,7 @@ static struct net_device_stats *macb_get_stats(struct net_device *dev) nstat->tx_carrier_errors = hwstat->tx_carrier_errors; nstat->tx_fifo_errors = hwstat->tx_underruns;/* Don't know about heartbeat or window errors... */ +spin_unlock_irq (&bp->stats_lock);return nstat; }
@@ -4564,6 +4571,7 @@ static int macb_probe(struct platform_device *pdev)device_set_wakeup_capable (&pdev->dev, bp->wol &MACB_WOL_HAS_MAGIC_PACKET );spin_lock_init (&bp->lock); +spin_lock_init (&bp->stats_lock);/* setup capabilities */ macb_configure_caps (bp, macb_config);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 358/462 ASoC: es8328: fix route from DAC to output
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit 5b0c02f9b8acf2a791e531bbc09acae2d51f4f9b ]
The ES8328 codec driver, which is also used for the ES8388 chip that appears to have an identical register map, claims that the output can either take the route from DAC->Mixer->Output or through DAC->Output directly. To the best of what I could find, this is not true, and creates problems.
Without DACCONTROL17 bit index 7 set for the left channel, as well as DACCONTROL20 bit index 7 set for the right channel, I cannot get any analog audio out on Left Out 2 and Right Out 2 respectively, despite the DAPM routes claiming that this should be possible. Furthermore, the same is the case for Left Out 1 and Right Out 1, showing that those two don't have a direct route from DAC to output bypassing the mixer either.
Those control bits toggle whether the DACs are fed (stale bread?) into their respective mixers. If one "unmutes" the mixer controls in alsamixer, then sure, the audio output works, but if it doesn't work without the mixer being fed the DAC input then evidently it's not a direct output from the DAC.
ES8328/ES8388 are seemingly not alone in this. ES8323, which uses a separate driver for what appears to be a very similar register map, simply flips those two bits on in its probe function, and then pretends there is no power management whatsoever for the individual controls. Fair enough.
My theory as to why nobody has noticed this up to this point is that everyone just assumes it's their fault when they had to unmute an additional control in ALSA.
Fix this in the es8328 driver by removing the erroneous direct route, then get rid of the playback switch controls and have those bits tied to the mixer's widget instead, which until now had no register to play with.
--- sound/soc/codecs/es8328.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
sound/soc/codecs/es8328.c +4 -11
@@ -234,7 +234,6 @@ static const struct snd_kcontrol_new es8328_right_line_controls =/* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = { -SOC_DAPM_SINGLE ("Playback Switch" ,ES8328_DACCONTROL17 ,7 ,1 ,0 ),SOC_DAPM_SINGLE ("Left Bypass Switch" ,ES8328_DACCONTROL17 ,6 ,1 ,0 ),SOC_DAPM_SINGLE ("Right Playback Switch" ,ES8328_DACCONTROL18 ,7 ,1 ,0 ),SOC_DAPM_SINGLE ("Right Bypass Switch" ,ES8328_DACCONTROL18 ,6 ,1 ,0 ),
@@ -244,7 +243,6 @@ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = {static const struct snd_kcontrol_new es8328_right_mixer_controls[] = {SOC_DAPM_SINGLE ("Left Playback Switch" ,ES8328_DACCONTROL19 ,7 ,1 ,0 ),SOC_DAPM_SINGLE ("Left Bypass Switch" ,ES8328_DACCONTROL19 ,6 ,1 ,0 ), -SOC_DAPM_SINGLE ("Playback Switch" ,ES8328_DACCONTROL20 ,7 ,1 ,0 ),SOC_DAPM_SINGLE ("Right Bypass Switch" ,ES8328_DACCONTROL20 ,6 ,1 ,0 ), };
@@ -337,10 +335,10 @@ static const struct snd_soc_dapm_widget es8328_dapm_widgets[] = {SND_SOC_DAPM_DAC ("Left DAC" ,"Left Playback" ,ES8328_DACPOWER ,ES8328_DACPOWER_LDAC_OFF ,1 ), -SND_SOC_DAPM_MIXER ("Left Mixer" ,SND_SOC_NOPM ,0 ,0 , +SND_SOC_DAPM_MIXER ("Left Mixer" ,ES8328_DACCONTROL17 ,7 ,0 , &es8328_left_mixer_controls[0 ],ARRAY_SIZE (es8328_left_mixer_controls)), -SND_SOC_DAPM_MIXER ("Right Mixer" ,SND_SOC_NOPM ,0 ,0 , +SND_SOC_DAPM_MIXER ("Right Mixer" ,ES8328_DACCONTROL20 ,7 ,0 , &es8328_right_mixer_controls[0 ], ARRAY_SIZE(es8328_right_mixer_controls)),
@@ -419,19 +417,14 @@ static const struct snd_soc_dapm_route es8328_dapm_routes[] = { { "Right Line Mux", "PGA", "Right PGA Mux" }, { "Right Line Mux", "Differential", "Differential Mux" }, - { "Left Out 1", NULL, "Left DAC" }, - { "Right Out 1", NULL, "Right DAC" }, - { "Left Out 2", NULL, "Left DAC" }, - { "Right Out 2", NULL, "Right DAC" }, - - { "Left Mixer", "Playback Switch", "Left DAC" }, + { "Left Mixer", NULL, "Left DAC" }, { "Left Mixer", "Left Bypass Switch", "Left Line Mux" }, { "Left Mixer", "Right Playback Switch", "Right DAC" }, { "Left Mixer", "Right Bypass Switch", "Right Line Mux" }, { "Right Mixer", "Left Playback Switch", "Left DAC" }, { "Right Mixer", "Left Bypass Switch", "Left Line Mux" }, - { "Right Mixer", "Playback Switch", "Right DAC" }, + { "Right Mixer", NULL, "Right DAC" }, { "Right Mixer", "Right Bypass Switch", "Right Line Mux" }, { "DAC DIG", NULL, "DAC STM" },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 359/462 ipvs: Always clear ipvs_property flag in skb_scrub_packet()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philo Lu <[email protected]>
[ Upstream commit de2c211868b9424f9aa9b3432c4430825bafb41b ]
We found an issue when using bpf_redirect with ipvs NAT mode after commit ff70202b2d1a ("dev_forward_skb: do not scrub skb mark within the same name space"). Particularly, we use bpf_redirect to return the skb directly back to the netif it comes from, i.e., xnet is false in skb_scrub_packet(), and then ipvs_property is preserved and SNAT is skipped in the rx path.
ipvs_property has been already cleared when netns is changed in commit 2b5ec1a5f973 ("netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed"). This patch just clears it in spite of netns.
--- net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/skbuff.c +1 -1
@@ -5361,11 +5361,11 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) skb->offload_fwd_mark =0 ; skb->offload_l3_fwd_mark =0 ;#endif +ipvs_reset (skb);if (!xnet)return ; -ipvs_reset (skb); skb->mark =0 ; skb->tstamp =0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 360/462 tcp: Defer ts_recent changes until req is owned
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Hai <[email protected]>
[ Upstream commit 8d52da23b6c68a0f6bad83959ebb61a2cf623c4e ]
Recently a bug was discovered where the server had entered TCP_ESTABLISHED state, but the upper layers were not notified.
The same 5-tuple packet may be processed by different CPUSs, so two CPUs may receive different ack packets at the same time when the state is TCP_NEW_SYN_RECV.
In that case, req->ts_recent in tcp_check_req may be changed concurrently, which will probably cause the newsk's ts_recent to be incorrectly large. So that tcp_validate_incoming will fail. At this point, newsk will not be able to enter the TCP_ESTABLISHED.
cpu1 cpu2tcp_check_req
tcp_check_req
req->ts_recent = rcv_tsval = t1
req->ts_recent = rcv_tsval = t2
syn_recv_sock
tcp_sk(child)->rx_opt.ts_recent = req->ts_recent = t2 // t1 < t2tcp_child_process
tcp_rcv_state_process
tcp_validate_incoming
tcp_paws_check
if ((s32)(rx_opt->ts_recent - rx_opt->rcv_tsval) <= paws_win)
// t2 - t1 > paws_win, failed
tcp_v4_do_rcv
tcp_rcv_state_process
// TCP_ESTABLISHEDThe cpu2's skb or a newly received skb will call tcp_v4_do_rcv to get the newsk into the TCP_ESTABLISHED state, but at this point it is no longer possible to notify the upper layer application. A notification mechanism could be added here, but the fix is more complex, so the current fix is used.
In tcp_check_req, req->ts_recent is used to assign a value to tcp_sk(child)->rx_opt.ts_recent, so removing the change in req->ts_recent and changing tcp_sk(child)->rx_opt.ts_recent directly after owning the req fixes this bug.
--- net/ipv4/tcp_minisocks.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
net/ipv4/tcp_minisocks.c +4 -6
@@ -726,12 +726,6 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,/* In sequence, PAWS is OK. */ -/* TODO: We probably should defer ts_recent change once -* we take ownership of @req. -*/ -if (tmp_opt.saw_tstamp && !after (TCP_SKB_CB (skb)->seq,tcp_rsk (req)->rcv_nxt)) -WRITE_ONCE (req->ts_recent, tmp_opt.rcv_tsval); -if (TCP_SKB_CB (skb)->seq ==tcp_rsk (req)->rcv_isn) {/* Truncate SYN, it is out of window starting at tcp_rsk(req)->rcv_isn + 1. */
@@ -780,6 +774,10 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,if (!child) goto listen_overflow; +if (own_req && tmp_opt.saw_tstamp && + !after (TCP_SKB_CB (skb)->seq,tcp_rsk (req)->rcv_nxt)) +tcp_sk (child)->rx_opt.ts_recent = tmp_opt.rcv_tsval; +if (own_req &&rsk_drop_req (req)) {reqsk_queue_removed (&inet_csk (sk)->icsk_accept_queue, req);inet_csk_reqsk_queue_drop_and_put (sk, req);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 361/462 net: mvpp2: cls: Fixed Non IP flow, with vlan tag flow defination.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Chaudhari <[email protected]>
[ Upstream commit 2d253726ff7106b39a44483b6864398bba8a2f74 ]
Non IP flow, with vlan tag not working as expected while running below command for vlan-priority. fixed that.
ethtool -N eth1 flow-type ether vlan 0x8000 vlan-mask 0x1fff action 0 loc 0
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c +1 -1
@@ -318,7 +318,7 @@ static const struct mvpp2_cls_flow cls_flows[MVPP2_N_PRS_FLOWS] = { MVPP2_PRS_RI_VLAN_MASK),/* Non IP flow, with vlan tag */ MVPP2_DEF_FLOW (MVPP22_FLOW_ETHERNET ,MVPP2_FL_NON_IP_TAG , -MVPP22_CLS_HEK_OPT_VLAN , +MVPP22_CLS_HEK_TAGGED , 0, 0), };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 362/462 net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yongjun <[email protected]>
[ Upstream commit 9faad250ce66ed4159fa095a269690d7cfdb3ce3 ]
Simplify the return expression.
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
--- net/ipv6/rpl_iptunnel.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
net/ipv6/rpl_iptunnel.c +1 -6
@@ -190,18 +190,13 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt) {struct dst_entry *dst =skb_dst (skb);struct rpl_iptunnel_encap *tinfo; -int err =0 ;if (skb->protocol !=htons (ETH_P_IPV6 ))return -EINVAL ; tinfo =rpl_encap_lwtunnel (dst->lwtstate); - err =rpl_do_srh_inline (skb, rlwt, tinfo->srh); -if (err) -return err; - -return 0 ; +return rpl_do_srh_inline (skb, rlwt, tinfo->srh); }static int rpl_output (struct net *net,struct sock *sk,struct sk_buff *skb)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 363/462 net: use indirect call helpers for dst_input
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Vazquez <[email protected]>
[ Upstream commit e43b21906439ed14dda84f9784d38c03d0464607 ]
This patch avoids the indirect call for the common case:ip_local_deliver and ip6_input
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
--- include/net/dst.h | 6 +++++- net/ipv4/ip_input.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
include/net/dst.h +5 -1
@@ -18,6 +18,7 @@#include <linux/refcount.h> #include <net/neighbour.h> #include <asm/processor.h> +#include <linux/indirect_call_wrapper.h> struct sk_buff ;
@@ -436,10 +437,13 @@ static inline int dst_output(struct net *net, struct sock *sk, struct sk_buff *sreturn skb_dst (skb)->output (net, sk, skb); } +INDIRECT_CALLABLE_DECLARE(int ip6_input(struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int ip_local_deliver(struct sk_buff *));/* Input packet from network to transport. */ static inline int dst_input (struct sk_buff *skb) { -return skb_dst (skb)->input (skb); +return INDIRECT_CALL_INET (skb_dst (skb)->input, + ip6_input, ip_local_deliver, skb); }static inline struct dst_entry *dst_check (struct dst_entry *dst,u32 cookie)
net/ipv4/ip_input.c +1 -0
@@ -253,6 +253,7 @@ int ip_local_deliver(struct sk_buff *skb) net,NULL , skb, skb->dev,NULL , ip_local_deliver_finish); } +EXPORT_SYMBOL (ip_local_deliver);static inline bool ip_rcv_options (struct sk_buff *skb,struct net_device *dev) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 364/462 net: use indirect call helpers for dst_output
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Vazquez <[email protected]>
[ Upstream commit 6585d7dc491d9d5e323ed52ee32ad071e04c9dfa ]
This patch avoids the indirect call for the common case:ip6_output and ip_output
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
--- include/net/dst.h | 8 +++++++- net/ipv4/ip_output.c | 1 + net/ipv6/ip6_output.c | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)
include/net/dst.h +7 -1
@@ -431,10 +431,16 @@ static inline void dst_set_expires(struct dst_entry *dst, int timeout) dst->expires = expires; } +INDIRECT_CALLABLE_DECLARE(int ip6_output(struct net *, struct sock *, +struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int ip_output(struct net *, struct sock *, +struct sk_buff *));/* Output packet to network from transport. */ static inline int dst_output (struct net *net,struct sock *sk,struct sk_buff *skb) { -return skb_dst (skb)->output (net, sk, skb); +return INDIRECT_CALL_INET (skb_dst (skb)->output, + ip6_output, ip_output, + net, sk, skb); } INDIRECT_CALLABLE_DECLARE(int ip6_input(struct sk_buff *));
net/ipv4/ip_output.c +1 -0
@@ -441,6 +441,7 @@ int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb) ip_finish_output, !(IPCB(skb)->flags & IPSKB_REROUTED)); } +EXPORT_SYMBOL (ip_output);/* * copy saddr and daddr, possibly using 64bit load/stores
net/ipv6/ip6_output.c +1 -0
@@ -236,6 +236,7 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) ip6_finish_output, !(IP6CB(skb)->flags & IP6SKB_REROUTED)); } +EXPORT_SYMBOL (ip6_output);bool ip6_autoflowlabel (struct net *net,const struct ipv6_pinfo *np) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 365/462 include: net: add static inline dst_dev_overhead() to dst.h
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit 0600cf40e9b36fe17f9c9f04d4f9cef249eaa5e7 ]
Add static inline dst_dev_overhead() function to include/net/dst.h. This helper function is used by ioam6_iptunnel, rpl_iptunnel and seg6_iptunnel to get the dev's overhead based on a cache entry (dst_entry). If the cache is empty, the default and generic value skb->mac_len is returned. Otherwise, LL_RESERVED_SPACE() over dst's dev is returned.
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
--- include/net/dst.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/net/dst.h +9 -0
@@ -431,6 +431,15 @@ static inline void dst_set_expires(struct dst_entry *dst, int timeout) dst->expires = expires; } +static inline unsigned int dst_dev_overhead (struct dst_entry *dst, +struct sk_buff *skb) +{ +if (likely (dst)) +return LL_RESERVED_SPACE (dst->dev); + +return skb->mac_len; +} + INDIRECT_CALLABLE_DECLARE(int ip6_output(struct net *, struct sock *,struct sk_buff *)); INDIRECT_CALLABLE_DECLARE(int ip_output(struct net *, struct sock *,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 366/462 net: ipv6: rpl_iptunnel: mitigate 2-realloc issue
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit 985ec6f5e6235242191370628acb73d7a9f0c0ea ]
This patch mitigates the two-reallocations issue with rpl_iptunnel by providing the dst_entry (in the cache) to the first call to skb_cow_head(). As a result, the very first iteration would still trigger two reallocations (i.e., empty cache), while next iterations would only trigger a single reallocation.
Performance tests before/after applying this patch, which clearly shows there is no impact (it even shows improvement):
- before: https://ibb.co/nQJhqwc
- after: https://ibb.co/4ZvW6wV
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
--- net/ipv6/rpl_iptunnel.c | 46 ++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
net/ipv6/rpl_iptunnel.c +25 -21
@@ -125,7 +125,8 @@ static void rpl_destroy_state(struct lwtunnel_state *lwt) }static int rpl_do_srh_inline (struct sk_buff *skb,const struct rpl_lwt *rlwt, -const struct ipv6_rpl_sr_hdr *srh) +const struct ipv6_rpl_sr_hdr *srh, +struct dst_entry *cache_dst) {struct ipv6_rpl_sr_hdr *isrh, *csrh;const struct ipv6hdr *oldhdr;
@@ -153,7 +154,7 @@ static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt, hdrlen = ((csrh->hdrlen +1 ) <<3 ); - err =skb_cow_head (skb, hdrlen + skb->mac_len); + err =skb_cow_head (skb, hdrlen +dst_dev_overhead (cache_dst, skb));if (unlikely (err)) {kfree (buf);return err;
@@ -186,7 +187,8 @@ static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt,return 0 ; } -static int rpl_do_srh (struct sk_buff *skb,const struct rpl_lwt *rlwt) +static int rpl_do_srh (struct sk_buff *skb,const struct rpl_lwt *rlwt, +struct dst_entry *cache_dst) {struct dst_entry *dst =skb_dst (skb);struct rpl_iptunnel_encap *tinfo;
@@ -196,7 +198,7 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt) tinfo =rpl_encap_lwtunnel (dst->lwtstate); -return rpl_do_srh_inline (skb, rlwt, tinfo->srh); +return rpl_do_srh_inline (skb, rlwt, tinfo->srh, cache_dst); }static int rpl_output (struct net *net,struct sock *sk,struct sk_buff *skb)
@@ -208,14 +210,14 @@ static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb) rlwt =rpl_lwt_lwtunnel (orig_dst->lwtstate); - err =rpl_do_srh (skb, rlwt); -if (unlikely (err)) - goto drop; -local_bh_disable (); dst =dst_cache_get (&rlwt->cache);local_bh_enable (); + err =rpl_do_srh (skb, rlwt, dst); +if (unlikely (err)) + goto drop; +if (unlikely (!dst)) {struct ipv6hdr *hdr =ipv6_hdr (skb);struct flowi6 fl6;
@@ -237,15 +239,15 @@ static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)local_bh_disable ();dst_cache_set_ip6 (&rlwt->cache, dst, &fl6.saddr);local_bh_enable (); + + err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev)); +if (unlikely (err)) + goto drop; }skb_dst_drop (skb);skb_dst_set (skb, dst); - err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev)); -if (unlikely (err)) - goto drop; -return dst_output (net, sk, skb); drop:
@@ -262,12 +264,13 @@ static int rpl_input(struct sk_buff *skb) rlwt =rpl_lwt_lwtunnel (orig_dst->lwtstate); - err =rpl_do_srh (skb, rlwt); -if (unlikely (err)) - goto drop; -local_bh_disable (); dst =dst_cache_get (&rlwt->cache); +local_bh_enable (); + + err =rpl_do_srh (skb, rlwt, dst); +if (unlikely (err)) + goto drop;skb_dst_drop (skb);
@@ -275,17 +278,18 @@ static int rpl_input(struct sk_buff *skb)ip6_route_input (skb); dst =skb_dst (skb);if (!dst->error) { +local_bh_disable ();dst_cache_set_ip6 (&rlwt->cache, dst, &ipv6_hdr (skb)->saddr); +local_bh_enable (); } + + err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev)); +if (unlikely (err)) + goto drop; }else {skb_dst_set (skb, dst); } -local_bh_enable (); - - err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev)); -if (unlikely (err)) - goto drop;return dst_input (skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 367/462 net: ipv6: fix dst ref loop on input in rpl lwt
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit 13e55fbaec176119cff68a7e1693b251c8883c5f ]
Prevent a dst ref loop on input in rpl_iptunnel.
--- net/ipv6/rpl_iptunnel.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/ipv6/rpl_iptunnel.c +12 -2
@@ -259,10 +259,18 @@ static int rpl_input(struct sk_buff *skb) {struct dst_entry *orig_dst =skb_dst (skb);struct dst_entry *dst =NULL ; +struct lwtunnel_state *lwtst;struct rpl_lwt *rlwt;int err; - rlwt =rpl_lwt_lwtunnel (orig_dst->lwtstate); +/* We cannot dereference "orig_dst" once ip6_route_input() or +* skb_dst_drop() is called. However, in order to detect a dst loop, we +* need the address of its lwtstate. So, save the address of lwtstate +* now and use it later as a comparison. +*/ + lwtst = orig_dst->lwtstate; + + rlwt =rpl_lwt_lwtunnel (lwtst);local_bh_disable (); dst =dst_cache_get (&rlwt->cache);
@@ -277,7 +285,9 @@ static int rpl_input(struct sk_buff *skb)if (!dst) {ip6_route_input (skb); dst =skb_dst (skb); -if (!dst->error) { + +/* cache only if we don't create a dst reference loop */ +if (!dst->error && lwtst != dst->lwtstate) {local_bh_disable ();dst_cache_set_ip6 (&rlwt->cache, dst, &ipv6_hdr (skb)->saddr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/462 x86/CPU: Fix warm boot hang regression on AMD SC1100 SoC systems
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Senior <[email protected]>
[ Upstream commit bebe35bb738b573c32a5033499cd59f20293f2a3 ]
I still have some Soekris net4826 in a Community Wireless Network I volunteer with. These devices use an AMD SC1100 SoC. I am running OpenWrt on them, which uses a patched kernel, that naturally has evolved over time. I haven't updated the ones in the field in a number of years (circa 2017), but have one in a test bed, where I have intermittently tried out test builds.
A few years ago, I noticed some trouble, particularly when "warm booting", that is, doing a reboot without removing power, and noticed the device was hanging after the kernel message:
[ 0.081615] Working around Cyrix MediaGX virtual DMA bugs.
If I removed power and then restarted, it would boot fine, continuing through the message above, thusly:
[ 0.081615] Working around Cyrix MediaGX virtual DMA bugs. [ 0.090076] Enable Memory-Write-back mode on Cyrix/NSC processor. [ 0.100000] Enable Memory access reorder on Cyrix/NSC processor. [ 0.100070] Last level iTLB entries: 4KB 0, 2MB 0, 4MB 0 [ 0.110058] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0 [ 0.120037] CPU: NSC Geode(TM) Integrated Processor by National Semi (family: 0x5, model: 0x9, stepping: 0x1) [...]
In order to continue using modern tools, like ssh, to interact with the software on these old devices, I need modern builds of the OpenWrt firmware on the devices. I confirmed that the warm boot hang was still an issue in modern OpenWrt builds (currently using a patched linux v6.6.65).
Last night, I decided it was time to get to the bottom of the warm boot hang, and began bisecting. From preserved builds, I narrowed down the bisection window from late February to late May 2019. During this period, the OpenWrt builds were using 4.14.x. I was able to build using period-correct Ubuntu 18.04.6. After a number of bisection iterations, I identified a kernel bump from 4.14.112 to 4.14.113 as the commit that introduced the warm boot hang.
https://github.com/openwrt/openwrt/commit/07aaa7e3d62ad32767d7067107db64b6ade81537
Looking at the upstream changes in the stable kernel between 4.14.112 and 4.14.113 (tig v4.14.112..v4.14.113), I spotted a likely suspect:
So, I tried reverting just that kernel change on top of the breaking OpenWrt commit, and my warm boot hang went away.
Presumably, the warm boot hang is due to some register not getting cleared in the same way that a loss of power does. That is approximately as much as I understand about the problem.
More poking/prodding and coaching from Jonas Gorski, it looks like this test patch fixes the problem on my board: Tested against v6.6.67 and v4.14.113.
--- arch/x86/kernel/cpu/cyrix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/cyrix.c +2 -2
@@ -152,8 +152,8 @@ static void geode_configure(void)u8 ccr3;local_irq_save (flags); -/* Suspend on halt power saving and enable #SUSP pin */ -setCx86 (CX86_CCR2 ,getCx86 (CX86_CCR2 ) |0x88 ); +/* Suspend on halt power saving */ +setCx86 (CX86_CCR2 ,getCx86 (CX86_CCR2 ) |0x08 ); ccr3 =getCx86 (CX86_CCR3 );setCx86 (CX86_CCR3 , (ccr3 &0x0f ) |0x10 );/* enable MAPEN */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/462 ftrace: Avoid potential division by zero in function_stat_show()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Kuratov <[email protected]>
commit a1a7eb89ca0b89dc1c326eeee2596f263291aca3 upstream.
Check whether denominator expression x * (x - 1) * 1000 mod {2^32, 2^64} produce zero and skip stddev computation in that case.
For now don't care about rec->counter * rec->counter overflow because rec->time * rec->time overflow will likely happen earlier.
--- kernel/trace/ftrace.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
kernel/trace/ftrace.c +12 -15
@@ -510,6 +510,7 @@ static int function_stat_show(struct seqstatic struct trace_seq s;unsigned long long avg;unsigned long long stddev; +unsigned long long stddev_denom;#endif mutex_lock (&ftrace_profile_lock);
@@ -531,23 +532,19 @@ static int function_stat_show(struct seq#ifdef CONFIG_FUNCTION_GRAPH_TRACER seq_puts (m," " ); -/* Sample standard deviation (s^2) */ -if (rec->counter <=1 ) - stddev =0 ; -else { -/* -* Apply Welford's method: -* s^2 = 1 / (n * (n-1)) * (n * \Sum (x_i)^2 - (\Sum x_i)^2) -*/ +/* +* Variance formula: +* s^2 = 1 / (n * (n-1)) * (n * \Sum (x_i)^2 - (\Sum x_i)^2) +* Maybe Welford's method is better here? +* Divide only by 1000 for ns^2 -> us^2 conversion. +* trace_print_graph_duration will divide by 1000 again. +*/ + stddev =0 ; + stddev_denom = rec->counter * (rec->counter -1 ) *1000 ; +if (stddev_denom) { stddev = rec->counter * rec->time_squared - rec->time * rec->time; - -/* -* Divide only 1000 for ns^2 -> us^2 conversion. -* trace_print_graph_duration will divide 1000 again. -*/ - stddev =div64_ul (stddev, - rec->counter * (rec->counter -1 ) *1000 ); + stddev =div64_ul (stddev, stddev_denom); }trace_seq_init (&s);
Greg Kroah-Hartman
maintainerPATCH 370/462 perf/core: Fix low freq setting via IOC_PERIOD
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kan Liang <[email protected]>
commit 0d39844150546fa1415127c5fbae26db64070dd3 upstream.
A low attr::freq value cannot be set via IOC_PERIOD on some platforms.
The perf_event_check_period() introduced in:
81ec3f3c4c4d ("perf/x86: Add check_period PMU callback")
was intended to check the period, rather than the frequency. A low frequency may be mistakenly rejected by limit_period().
Fix it.
--- kernel/events/core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
kernel/events/core.c +9 -8
@@ -5603,14 +5603,15 @@ static int _perf_event_period(struct perif (!value)return -EINVAL ; -if (event->attr.freq && value > sysctl_perf_event_sample_rate) -return -EINVAL ; - -if (perf_event_check_period (event, value)) -return -EINVAL ; - -if (!event->attr.freq && (value & (1ULL <<63 ))) -return -EINVAL ; +if (event->attr.freq) { +if (value > sysctl_perf_event_sample_rate) +return -EINVAL ; + }else { +if (perf_event_check_period (event, value)) +return -EINVAL ; +if (value & (1ULL <<63 )) +return -EINVAL ; + }event_function_call (event, __perf_event_period, &value);
Greg Kroah-Hartman
maintainerPATCH 371/462 i2c: npcm: disable interrupt enable bit before devm_request_irq
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyrone Ting <[email protected]>
commit dd1998e243f5fa25d348a384ba0b6c84d980f2b2 upstream.
The customer reports that there is a soft lockup issue related to the i2c driver. After checking, the i2c module was doing a tx transfer and the bmc machine reboots in the middle of the i2c transaction, the i2c module keeps the status without being reset.
Due to such an i2c module status, the i2c irq handler keeps getting triggered since the i2c irq handler is registered in the kernel booting process after the bmc machine is doing a warm rebooting.
The continuous triggering is stopped by the soft lockup watchdog timer.
Disable the interrupt enable bit in the i2c module before calling devm_request_irq to fix this issue since the i2c relative status bit is read-only.
Here is the soft lockup log.
[ 28.176395] watchdog: BUG: soft lockup - CPU#0 stuck for 26s! [swapper/0:1] [ 28.183351] Modules linked in: [ 28.186407] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.15.120-yocto-s-dirty-bbebc78 #1 [ 28.201174] pstate: 40000005 (nZcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 28.208128] pc : __do_softirq+0xb0/0x368 [ 28.212055] lr : __do_softirq+0x70/0x368 [ 28.215972] sp : ffffff8035ebca00 [ 28.219278] x29: ffffff8035ebca00 x28: 0000000000000002 x27: ffffff80071a3780 [ 28.226412] x26: ffffffc008bdc000 x25: ffffffc008bcc640 x24: ffffffc008be50c0 [ 28.233546] x23: ffffffc00800200c x22: 0000000000000000 x21: 000000000000001b [ 28.240679] x20: 0000000000000000 x19: ffffff80001c3200 x18: ffffffffffffffff [ 28.247812] x17: ffffffc02d2e0000 x16: ffffff8035eb8b40 x15: 00001e8480000000 [ 28.254945] x14: 02c3647e37dbfcb6 x13: 02c364f2ab14200c x12: 0000000002c364f2 [ 28.262078] x11: 00000000fa83b2da x10: 000000000000b67e x9 : ffffffc008010250 [ 28.269211] x8 : 000000009d983d00 x7 : 7fffffffffffffff x6 : 0000036d74732434 [ 28.276344] x5 : 00ffffffffffffff x4 : 0000000000000015 x3 : 0000000000000198 [ 28.283476] x2 : ffffffc02d2e0000 x1 : 00000000000000e0 x0 : ffffffc008bdcb40 [ 28.290611] Call trace: [ 28.293052] __do_softirq+0xb0/0x368 [ 28.296625] __irq_exit_rcu+0xe0/0x100 [ 28.300374] irq_exit+0x14/0x20 [ 28.303513] handle_domain_irq+0x68/0x90 [ 28.307440] gic_handle_irq+0x78/0xb0 [ 28.311098] call_on_irq_stack+0x20/0x38 [ 28.315019] do_interrupt_handler+0x54/0x5c [ 28.319199] el1_interrupt+0x2c/0x4c [ 28.322777] el1h_64_irq_handler+0x14/0x20 [ 28.326872] el1h_64_irq+0x74/0x78 [ 28.330269] __setup_irq+0x454/0x780 [ 28.333841] request_threaded_irq+0xd0/0x1b4 [ 28.338107] devm_request_threaded_irq+0x84/0x100 [ 28.342809] npcm_i2c_probe_bus+0x188/0x3d0 [ 28.346990] platform_probe+0x6c/0xc4 [ 28.350653] really_probe+0xcc/0x45c [ 28.354227] __driver_probe_device+0x8c/0x160 [ 28.358578] driver_probe_device+0x44/0xe0 [ 28.362670] __driver_attach+0x124/0x1d0 [ 28.366589] bus_for_each_dev+0x7c/0xe0 [ 28.370426] driver_attach+0x28/0x30 [ 28.373997] bus_add_driver+0x124/0x240 [ 28.377830] driver_register+0x7c/0x124 [ 28.381662] __platform_driver_register+0x2c/0x34 [ 28.386362] npcm_i2c_init+0x3c/0x5c [ 28.389937] do_one_initcall+0x74/0x230 [ 28.393768] kernel_init_freeable+0x24c/0x2b4 [ 28.398126] kernel_init+0x28/0x130 [ 28.401614] ret_from_fork+0x10/0x20 [ 28.405189] Kernel panic - not syncing: softlockup: hung tasks [ 28.411011] SMP: stopping secondary CPUs [ 28.414933] Kernel Offset: disabled [ 28.418412] CPU features: 0x00000000,00000802 [ 28.427644] Rebooting in 20 seconds..
--- drivers/i2c/busses/i2c-npcm7xx.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/i2c/busses/i2c-npcm7xx.c +7 -0
@@ -2305,6 +2305,13 @@ static int npcm_i2c_probe_bus(struct plaif (irq <0 )return irq; +/* +* Disable the interrupt to avoid the interrupt handler being triggered +* incorrectly by the asynchronous interrupt status since the machine +* might do a warm reset during the last smbus/i2c transfer session. +*/ +npcm_i2c_int_enable (bus, false); + ret =devm_request_irq (bus->dev, irq, npcm_i2c_bus_irq,0 ,dev_name (bus->dev), bus);if (ret)
Greg Kroah-Hartman
maintainerPATCH 372/462 usbnet: gl620a: fix endpoint checking in genelink_bind()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
commit 1cf9631d836b289bd5490776551961c883ae8a4f upstream.
Syzbot reports [1] a warning in usb_submit_urb() triggered by inconsistencies between expected and actually present endpoints in gl620a driver. Since genelink_bind() does not properly verify whether specified eps are in fact provided by the device, in this case, an artificially manufactured one, one may get a mismatch.
Fix the issue by resorting to a usbnet utility function usbnet_get_endpoints(), usually reserved for this very problem. Check for endpoints and return early before proceeding further if any are missing.
[1] Syzbot report:
usb 5-1: Manufacturer: syz
usb 5-1: SerialNumber: syz
usb 5-1: config 0 descriptor??
gl620a 5-1:0.23 usb0: register 'gl620a' at usb-dummy_hcd.0-1, ...
------------[ cut here ]------------ usb 5-1: BOGUS urb xfer, pipe 3 != type 1 WARNING: CPU: 2 PID: 1841 at drivers/usb/core/urb.c:503 usb_submit_urb+0xe4b/0x1730 drivers/usb/core/urb.c:503 Modules linked in: CPU: 2 UID: 0 PID: 1841 Comm: kworker/2:2 Not tainted 6.12.0-syzkaller-07834-g06afb0f36106 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: mld mld_ifc_work RIP: 0010:usb_submit_urb+0xe4b/0x1730 drivers/usb/core/urb.c:503 ... Call Trace: <TASK> usbnet_start_xmit+0x6be/0x2780 drivers/net/usb/usbnet.c:1467 __netdev_start_xmit include/linux/netdevice.h:5002 [inline] netdev_start_xmit include/linux/netdevice.h:5011 [inline] xmit_one net/core/dev.c:3590 [inline] dev_hard_start_xmit+0x9a/0x7b0 net/core/dev.c:3606 sch_direct_xmit+0x1ae/0xc30 net/sched/sch_generic.c:343 __dev_xmit_skb net/core/dev.c:3827 [inline] __dev_queue_xmit+0x13d4/0x43e0 net/core/dev.c:4400 dev_queue_xmit include/linux/netdevice.h:3168 [inline] neigh_resolve_output net/core/neighbour.c:1514 [inline] neigh_resolve_output+0x5bc/0x950 net/core/neighbour.c:1494 neigh_output include/net/neighbour.h:539 [inline] ip6_finish_output2+0xb1b/0x2070 net/ipv6/ip6_output.c:141 __ip6_finish_output net/ipv6/ip6_output.c:215 [inline] ip6_finish_output+0x3f9/0x1360 net/ipv6/ip6_output.c:226 NF_HOOK_COND include/linux/netfilter.h:303 [inline] ip6_output+0x1f8/0x540 net/ipv6/ip6_output.c:247 dst_output include/net/dst.h:450 [inline] NF_HOOK include/linux/netfilter.h:314 [inline] NF_HOOK include/linux/netfilter.h:308 [inline] mld_sendpack+0x9f0/0x11d0 net/ipv6/mcast.c:1819 mld_send_cr net/ipv6/mcast.c:2120 [inline] mld_ifc_work+0x740/0xca0 net/ipv6/mcast.c:2651 process_one_work+0x9c5/0x1ba0 kernel/workqueue.c:3229 process_scheduled_works kernel/workqueue.c:3310 [inline] worker_thread+0x6c8/0xf00 kernel/workqueue.c:3391 kthread+0x2c1/0x3a0 kernel/kthread.c:389 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK>
--- drivers/net/usb/gl620a.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/usb/gl620a.c +1 -3
@@ -179,9 +179,7 @@ static int genelink_bind(struct usbnet * { dev->hard_mtu =GL_RCV_BUF_SIZE ; dev->net->hard_header_len +=4 ; - dev->in =usb_rcvbulkpipe (dev->udev, dev->driver_info->in); - dev->out =usb_sndbulkpipe (dev->udev, dev->driver_info->out); -return 0 ; +return usbnet_get_endpoints (dev, intf); }static const struct driver_info genelink_info = {
Greg Kroah-Hartman
maintainerPATCH 373/462 phy: tegra: xusb: reset VBUS & ID OVERRIDE
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: BH Hsieh <[email protected]>
commit 55f1a5f7c97c3c92ba469e16991a09274410ceb7 upstream.
Observed VBUS_OVERRIDE & ID_OVERRIDE might be programmed with unexpected value prior to XUSB PADCTL driver, this could also occur in virtualization scenario.
For example, UEFI firmware programs ID_OVERRIDE=GROUNDED to set a type-c port to host mode and keeps the value to kernel. If the type-c port is connected a usb host, below errors can be observed right after usb host mode driver gets probed. The errors would keep until usb role class driver detects the type-c port as device mode and notifies usb device mode driver to set both ID_OVERRIDE and VBUS_OVERRIDE to correct value by XUSB PADCTL driver.
[ 173.765814] usb usb3-port2: Cannot enable. Maybe the USB cable is bad? [ 173.765837] usb usb3-port2: config error
Taking virtualization into account, asserting XUSB PADCTL reset would break XUSB functions used by other guest OS, hence only reset VBUS & ID OVERRIDE of the port in utmi_phy_init.
--- drivers/phy/tegra/xusb-tegra186.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/phy/tegra/xusb-tegra186.c +11 -0
@@ -510,6 +510,7 @@ static int tegra186_utmi_phy_exit(structunsigned int index = lane->index;struct device *dev = padctl->dev;int err; +u32 reg; port =tegra_xusb_find_usb2_port (padctl, index);if (!port) {
@@ -517,6 +518,16 @@ static int tegra186_utmi_phy_exit(structreturn -ENODEV ; } +if (port->mode ==USB_DR_MODE_OTG || + port->mode ==USB_DR_MODE_PERIPHERAL ) { +/* reset VBUS&ID OVERRIDE */ + reg =padctl_readl (padctl,USB2_VBUS_ID ); + reg &= ~VBUS_OVERRIDE ; + reg &= ~ID_OVERRIDE (~0 ); + reg |=ID_OVERRIDE_FLOATING ; +padctl_writel (padctl, reg,USB2_VBUS_ID ); + } +if (port->supply && port->mode ==USB_DR_MODE_HOST ) { err =regulator_disable (port->supply);if (err) {
Greg Kroah-Hartman
maintainerPATCH 374/462 phy: exynos5-usbdrd: fix MPLL_MULTIPLIER and SSC_REFCLKSEL masks in refclk
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kaustabh Chakraborty <[email protected]>
commit e2158c953c973adb49383ddea2504faf08d375b7 upstream.
In exynos5_usbdrd_{pipe3,utmi}_set_refclk(), the masks PHYCLKRST_MPLL_MULTIPLIER_MASK and PHYCLKRST_SSC_REFCLKSEL_MASK are not inverted when applied to the register values. Fix it.
--- drivers/phy/samsung/phy-exynos5-usbdrd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/phy/samsung/phy-exynos5-usbdrd.c +6 -6
@@ -288,9 +288,9 @@ exynos5_usbdrd_pipe3_set_refclk(struct p reg |=PHYCLKRST_REFCLKSEL_EXT_REFCLK ;/* FSEL settings corresponding to reference clock */ - reg &= ~PHYCLKRST_FSEL_PIPE_MASK | -PHYCLKRST_MPLL_MULTIPLIER_MASK | -PHYCLKRST_SSC_REFCLKSEL_MASK ; + reg &= ~(PHYCLKRST_FSEL_PIPE_MASK | +PHYCLKRST_MPLL_MULTIPLIER_MASK | +PHYCLKRST_SSC_REFCLKSEL_MASK );switch (phy_drd->extrefclk) {case EXYNOS5_FSEL_50MHZ : reg |= (PHYCLKRST_MPLL_MULTIPLIER_50M_REF |
@@ -332,9 +332,9 @@ exynos5_usbdrd_utmi_set_refclk(struct ph reg &= ~PHYCLKRST_REFCLKSEL_MASK ; reg |=PHYCLKRST_REFCLKSEL_EXT_REFCLK ; - reg &= ~PHYCLKRST_FSEL_UTMI_MASK | -PHYCLKRST_MPLL_MULTIPLIER_MASK | -PHYCLKRST_SSC_REFCLKSEL_MASK ; + reg &= ~(PHYCLKRST_FSEL_UTMI_MASK | +PHYCLKRST_MPLL_MULTIPLIER_MASK | +PHYCLKRST_SSC_REFCLKSEL_MASK ); reg |=PHYCLKRST_FSEL (phy_drd->extrefclk);return reg;
Greg Kroah-Hartman
maintainerPATCH 375/462 mptcp: always handle address removal under msk socket lock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit f865c24bc55158313d5779fc81116023a6940ca3 upstream.
Syzkaller reported a lockdep splat in the PM control path:
WARNING: CPU: 0 PID: 6693 at ./include/net/sock.h:1711 sock_owned_by_me include/net/sock.h:1711 [inline] WARNING: CPU: 0 PID: 6693 at ./include/net/sock.h:1711 msk_owned_by_me net/mptcp/protocol.h:363 [inline] WARNING: CPU: 0 PID: 6693 at ./include/net/sock.h:1711 mptcp_pm_nl_addr_send_ack+0x57c/0x610 net/mptcp/pm_netlink.c:788 Modules linked in: CPU: 0 UID: 0 PID: 6693 Comm: syz.0.205 Not tainted 6.14.0-rc2-syzkaller-00303-gad1b832bf1cf #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 12/27/2024 RIP: 0010:sock_owned_by_me include/net/sock.h:1711 [inline] RIP: 0010:msk_owned_by_me net/mptcp/protocol.h:363 [inline] RIP: 0010:mptcp_pm_nl_addr_send_ack+0x57c/0x610 net/mptcp/pm_netlink.c:788 Code: 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc e8 ca 7b d3 f5 eb b9 e8 c3 7b d3 f5 90 0f 0b 90 e9 dd fb ff ff e8 b5 7b d3 f5 90 <0f> 0b 90 e9 3e fb ff ff 44 89 f1 80 e1 07 38 c1 0f 8c eb fb ff ff RSP: 0000:ffffc900034f6f60 EFLAGS: 00010283 RAX: ffffffff8bee3c2b RBX: 0000000000000001 RCX: 0000000000080000 RDX: ffffc90004d42000 RSI: 000000000000a407 RDI: 000000000000a408 RBP: ffffc900034f7030 R08: ffffffff8bee37f6 R09: 0100000000000000 R10: dffffc0000000000 R11: ffffed100bcc62e4 R12: ffff88805e6316e0 R13: ffff88805e630c00 R14: dffffc0000000000 R15: ffff88805e630c00 FS: 00007f7e9a7e96c0(0000) GS:ffff8880b8600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2fd18ff8 CR3: 0000000032c24000 CR4: 00000000003526f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> mptcp_pm_remove_addr+0x103/0x1d0 net/mptcp/pm.c:59 mptcp_pm_remove_anno_addr+0x1f4/0x2f0 net/mptcp/pm_netlink.c:1486 mptcp_nl_remove_subflow_and_signal_addr net/mptcp/pm_netlink.c:1518 [inline] mptcp_pm_nl_del_addr_doit+0x118d/0x1af0 net/mptcp/pm_netlink.c:1629 genl_family_rcv_msg_doit net/netlink/genetlink.c:1115 [inline] genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline] genl_rcv_msg+0xb1f/0xec0 net/netlink/genetlink.c:1210 netlink_rcv_skb+0x206/0x480 net/netlink/af_netlink.c:2543 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1219 netlink_unicast_kernel net/netlink/af_netlink.c:1322 [inline] netlink_unicast+0x7f6/0x990 net/netlink/af_netlink.c:1348 netlink_sendmsg+0x8de/0xcb0 net/netlink/af_netlink.c:1892 sock_sendmsg_nosec net/socket.c:718 [inline] __sock_sendmsg+0x221/0x270 net/socket.c:733 ____sys_sendmsg+0x53a/0x860 net/socket.c:2573 ___sys_sendmsg net/socket.c:2627 [inline] __sys_sendmsg+0x269/0x350 net/socket.c:2659 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f7e9998cde9 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f7e9a7e9038 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f7e99ba5fa0 RCX: 00007f7e9998cde9 RDX: 000000002000c094 RSI: 0000400000000000 RDI: 0000000000000007 RBP: 00007f7e99a0e2a0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000000 R14: 00007f7e99ba5fa0 R15: 00007fff49231088
Indeed the PM can try to send a RM_ADDR over a msk without acquiring first the msk socket lock.
The bugged code-path comes from an early optimization: when there are no subflows, the PM should (usually) not send RM_ADDR notifications.
The above statement is incorrect, as without locks another process could concurrent create a new subflow and cause the RM_ADDR generation.
Additionally the supposed optimization is not very effective even performance-wise, as most mptcp sockets should have at least one
subflow: the MPC one.
Address the issue removing the buggy code path, the existing "slow-path" will handle correctly even the edge case.
--- net/mptcp/pm_netlink.c | 6 ------ 1 file changed, 6 deletions(-)
net/mptcp/pm_netlink.c +0 -6
@@ -807,11 +807,6 @@ static int mptcp_nl_remove_subflow_and_sstruct sock *sk = (struct sock *)msk;bool remove_subflow; -if (list_empty (&msk->conn_list)) { -mptcp_pm_remove_anno_addr (msk, addr, false); - goto next; - } -lock_sock (sk); remove_subflow =lookup_subflow_by_saddr (&msk->conn_list, addr);mptcp_pm_remove_anno_addr (msk, addr, remove_subflow);
@@ -819,7 +814,6 @@ static int mptcp_nl_remove_subflow_and_smptcp_pm_remove_subflow (msk, addr->id);release_sock (sk); -next:sock_put (sk);cond_resched (); }
Greg Kroah-Hartman
maintainerPATCH 376/462 vmlinux.lds: Ensure that const vars with relocations are mapped R/O
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit 68f3ea7ee199ef77551e090dfef5a49046ea8443 upstream.
In the kernel, there are architectures (x86, arm64) that perform boot-time relocation (for KASLR) without relying on PIE codegen. In this case, all const global objects are emitted into .rodata, including const objects with fields that will be fixed up by the boot-time relocation code. This implies that .rodata (and .text in some cases) need to be writable at boot, but they will usually be mapped read-only as soon as the boot completes.
When using PIE codegen, the compiler will emit const global objects into .data.rel.ro rather than .rodata if the object contains fields that need such fixups at boot-time. This permits the linker to annotate such regions as requiring read-write access only at load time, but not at execution time (in user space), while keeping .rodata truly const (in user space, this is important for reducing the CoW footprint of dynamic executables).
This distinction does not matter for the kernel, but it does imply that const data will end up in writable memory if the .data.rel.ro sections are not treated in a special way, as they will end up in the writable .data segment by default.
So emit .data.rel.ro into the .rodata segment.
--- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -420,7 +420,7 @@ . = ALIGN((align)); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ __start_rodata = .; \ - *(.rodata) *(.rodata.*) \ + *(.rodata) *(.rodata.*) *(.data.rel.ro*) \ SCHED_DATA \RO_AFTER_INIT_DATA /* Read only after init */ \ . = ALIGN(8); \
Greg Kroah-Hartman
maintainerPATCH 377/462 sched/core: Prevent rescheduling when interrupts are disabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 82c387ef7568c0d96a918a5a78d9cad6256cfa15 upstream.
David reported a warning observed while loop testing kexec jump:
Interrupts enabled after irqrouter_resume+0x0/0x50
WARNING: CPU: 0 PID: 560 at drivers/base/syscore.c:103 syscore_resume+0x18a/0x220 kernel_kexec+0xf6/0x180 __do_sys_reboot+0x206/0x250 do_syscall_64+0x95/0x180
The corresponding interrupt flag trace:
hardirqs last enabled at (15573): [<ffffffffa8281b8e>] __up_console_sem+0x7e/0x90 hardirqs last disabled at (15580): [<ffffffffa8281b73>] __up_console_sem+0x63/0x90
That means __up_console_sem() was invoked with interrupts enabled. Further instrumentation revealed that in the interrupt disabled section of kexec jump one of the syscore_suspend() callbacks woke up a task, which set the NEED_RESCHED flag. A later callback in the resume path invoked cond_resched() which in turn led to the invocation of the scheduler:
__cond_resched+0x21/0x60 down_timeout+0x18/0x60 acpi_os_wait_semaphore+0x4c/0x80 acpi_ut_acquire_mutex+0x3d/0x100 acpi_ns_get_node+0x27/0x60 acpi_ns_evaluate+0x1cb/0x2d0 acpi_rs_set_srs_method_data+0x156/0x190 acpi_pci_link_set+0x11c/0x290 irqrouter_resume+0x54/0x60 syscore_resume+0x6a/0x200 kernel_kexec+0x145/0x1c0 __do_sys_reboot+0xeb/0x240 do_syscall_64+0x95/0x180
This is a long standing problem, which probably got more visible with the recent printk changes. Something does a task wakeup and the scheduler sets the NEED_RESCHED flag. cond_resched() sees it set and invokes schedule() from a completely bogus context. The scheduler enables interrupts after context switching, which causes the above warning at the end.
Quite some of the code paths in syscore_suspend()/resume() can result in triggering a wakeup with the exactly same consequences. They might not have done so yet, but as they share a lot of code with normal operations it's just a question of time.
The problem only affects the PREEMPT_NONE and PREEMPT_VOLUNTARY scheduling models. Full preemption is not affected as cond_resched() is disabled and the preemption check preemptible() takes the interrupt disabled flag into account.
Cure the problem by adding a corresponding check into cond_resched().
--- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/core.c +1 -1
@@ -6125,7 +6125,7 @@ SYSCALL_DEFINE0(sched_yield)#ifndef CONFIG_PREEMPTION int __sched _cond_resched(void) { -if (should_resched (0 )) { +if (should_resched (0 ) && !irqs_disabled ()) {preempt_schedule_common ();return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 378/462 intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit c157d351460bcf202970e97e611cb6b54a3dd4a4 upstream.
The Intel idle driver is preferred over the ACPI processor idle driver, but fails to implement the work around for Core2 generation CPUs, where the TSC stops in C2 and deeper C-states. This causes stalls and boot delays, when the clocksource watchdog does not catch the unstable TSC before the CPU goes deep idle for the first time.
The ACPI driver marks the TSC unstable when it detects that the CPU supports C2 or deeper and the CPU does not have a non-stop TSC.
Add the equivivalent work around to the Intel idle driver to cure that.
--- drivers/idle/intel_idle.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/idle/intel_idle.c +4 -0
@@ -56,6 +56,7 @@#include <asm/nospec-branch.h> #include <asm/mwait.h> #include <asm/msr.h> +#include <asm/tsc.h> #define INTEL_IDLE_VERSION "0.5.1"
@@ -1295,6 +1296,9 @@ static void __init intel_idle_init_cstatif (intel_idle_state_needs_timer_stop (state)) state->flags |=CPUIDLE_FLAG_TIMER_STOP ; +if (cx->type >ACPI_STATE_C1 && !boot_cpu_has (X86_FEATURE_NONSTOP_TSC )) +mark_tsc_unstable ("TSC halts in idle" ); + state->enter = intel_idle; state->enter_s2idle = intel_idle_s2idle; }
Greg Kroah-Hartman
maintainerPATCH 379/462 pfifo_tail_enqueue: Drop new packet when sch->limit == 0
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quang Le <[email protected]>
commit 647cef20e649c576dff271e018d5d15d998b629d upstream.
Expected behaviour:
In case we reach scheduler's limit, pfifo_tail_enqueue() will drop a packet in scheduler's queue and decrease scheduler's qlen by one. Then, pfifo_tail_enqueue() enqueue new packet and increase scheduler's qlen by one. Finally, pfifo_tail_enqueue() return NET_XMIT_CN status code.
Weird behaviour:
In case we set sch->limit == 0 and trigger pfifo_tail_enqueue() on a scheduler that has no packet, the 'drop a packet' step will do nothing. This means the scheduler's qlen still has value equal 0. Then, we continue to enqueue new packet and increase scheduler's qlen by one. In summary, we can leverage pfifo_tail_enqueue() to increase qlen by one and return NET_XMIT_CN status code.
The problem is:
Let's say we have two qdiscs: Qdisc_A and Qdisc_B.
- Qdisc_A's type must have '->graft()' function to create parent/child relationship. Let's say Qdisc_A's type is hfsc. Enqueue packet to this qdisc will trigger hfsc_enqueue.
- Qdisc_B's type is pfifo_head_drop. Enqueue packet to this qdisc will trigger pfifo_tail_enqueue.
- Qdisc_B is configured to have sch->limit == 0.
- Qdisc_A is configured to route the enqueued's packet to Qdisc_B.
Enqueue packet through Qdisc_A will lead to:
- hfsc_enqueue(Qdisc_A) -> pfifo_tail_enqueue(Qdisc_B)
- Qdisc_B->q.qlen += 1
- pfifo_tail_enqueue() return NET_XMIT_CN
- hfsc_enqueue() check for NET_XMIT_SUCCESS and see NET_XMIT_CN => hfsc_enqueue() don't increase qlen of Qdisc_A.
The whole process lead to a situation where Qdisc_A->q.qlen == 0 and Qdisc_B->q.qlen == 1. Replace 'hfsc' with other type (for example: 'drr') still lead to the same problem. This violate the design where parent's qlen should equal to the sum of its childrens'qlen.
Bug impact: This issue can be used for user->kernel privilege escalation when it is reachable.
--- net/sched/sch_fifo.c | 3 +++ 1 file changed, 3 insertions(+)
net/sched/sch_fifo.c +3 -0
@@ -39,6 +39,9 @@ static int pfifo_tail_enqueue(struct sk_ {unsigned int prev_backlog; +if (unlikely (READ_ONCE (sch->limit) ==0 )) +return qdisc_drop (skb, sch, to_free); +if (likely (sch->q.qlen < sch->limit))return qdisc_enqueue_tail (skb, sch);
Greg Kroah-Hartman
maintainerPATCH 380/462 drop_monitor: fix incorrect initialization order
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gavrilov Ilia <[email protected]>
[ Upstream commit 07b598c0e6f06a0f254c88dafb4ad50f8a8c6eea ]
Syzkaller reports the following bug:
BUG: spinlock bad magic on CPU#1, syz-executor.0/7995 lock: 0xffff88805303f3e0, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 CPU: 1 PID: 7995 Comm: syz-executor.0 Tainted: G E 5.10.209+ #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x119/0x179 lib/dump_stack.c:118 debug_spin_lock_before kernel/locking/spinlock_debug.c:83 [inline] do_raw_spin_lock+0x1f6/0x270 kernel/locking/spinlock_debug.c:112 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:117 [inline] _raw_spin_lock_irqsave+0x50/0x70 kernel/locking/spinlock.c:159 reset_per_cpu_data+0xe6/0x240 [drop_monitor] net_dm_cmd_trace+0x43d/0x17a0 [drop_monitor] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739 genl_family_rcv_msg net/netlink/genetlink.c:783 [inline] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800 netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2497 genl_rcv+0x29/0x40 net/netlink/genetlink.c:811 netlink_unicast_kernel net/netlink/af_netlink.c:1322 [inline] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1348 netlink_sendmsg+0x914/0xe00 net/netlink/af_netlink.c:1916 sock_sendmsg_nosec net/socket.c:651 [inline] __sock_sendmsg+0x157/0x190 net/socket.c:663 ____sys_sendmsg+0x712/0x870 net/socket.c:2378 ___sys_sendmsg+0xf8/0x170 net/socket.c:2432 __sys_sendmsg+0xea/0x1b0 net/socket.c:2461 do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x62/0xc7 RIP: 0033:0x7f3f9815aee9 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f3f972bf0c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f3f9826d050 RCX: 00007f3f9815aee9 RDX: 0000000020000000 RSI: 0000000020001300 RDI: 0000000000000007 RBP: 00007f3f981b63bd R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000006e R14: 00007f3f9826d050 R15: 00007ffe01ee6768
If drop_monitor is built as a kernel module, syzkaller may have time to send a netlink NET_DM_CMD_START message during the module loading. This will call the net_dm_monitor_start() function that uses a spinlock that has not yet been initialized.
To fix this, let's place resource initialization above the registration of a generic netlink family.
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with Syzkaller.
--- net/core/drop_monitor.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
net/core/drop_monitor.c +14 -15
@@ -1727,30 +1727,30 @@ static int __init init_net_drop_monitor(void)return -ENOSPC ; } - rc =genl_register_family (&net_drop_monitor_family); -if (rc) { -pr_err ("Could not create drop monitor netlink family\n" ); -return rc; +for_each_possible_cpu (cpu) { +net_dm_cpu_data_init (cpu); +net_dm_hw_cpu_data_init (cpu); } -WARN_ON (net_drop_monitor_family.mcgrp_offset !=NET_DM_GRP_ALERT ); rc =register_netdevice_notifier (&dropmon_net_notifier);if (rc <0 ) {pr_crit ("Failed to register netdevice notifier\n" ); +return rc; + } + + rc =genl_register_family (&net_drop_monitor_family); +if (rc) { +pr_err ("Could not create drop monitor netlink family\n" ); goto out_unreg; } +WARN_ON (net_drop_monitor_family.mcgrp_offset !=NET_DM_GRP_ALERT ); rc =0 ; -for_each_possible_cpu (cpu) { -net_dm_cpu_data_init (cpu); -net_dm_hw_cpu_data_init (cpu); - } - goto out; out_unreg: -genl_unregister_family (&net_drop_monitor_family); +WARN_ON (unregister_netdevice_notifier (&dropmon_net_notifier)); out:return rc; }
@@ -1759,19 +1759,18 @@ static void exit_net_drop_monitor(void) {int cpu; -BUG_ON (unregister_netdevice_notifier (&dropmon_net_notifier)); -/* * Because of the module_get/put we do in the trace state change path * we are guarnateed not to have any current users when we get here */ +BUG_ON (genl_unregister_family (&net_drop_monitor_family)); + +BUG_ON (unregister_netdevice_notifier (&dropmon_net_notifier));for_each_possible_cpu (cpu) {net_dm_hw_cpu_data_fini (cpu);net_dm_cpu_data_fini (cpu); } - -BUG_ON (genl_unregister_family (&net_drop_monitor_family)); }module_init (init_net_drop_monitor);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/462 kernel/acct.c: use #elif instead of #end and #elif
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Su <[email protected]>
[ Upstream commit 35189b8ff18ee0c6f7c04f4c674584d1149d5c55 ]
Cleanup: use #elif instead of #end and #elif.
Stable-dep-of: 56d5f3eba3f5 ("acct: perform last write from workqueue")
--- kernel/acct.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
kernel/acct.c +2 -5
@@ -397,9 +397,7 @@ static comp2_t encode_comp2_t(u64 value) return (value & (MAXFRACT2>>1)) | (exp << (MANTSIZE2-1)); } } -#endif - -#if ACCT_VERSION ==3 +#elif ACCT_VERSION == 3/* * encode an u64 into a 32 bit IEEE float */
@@ -516,8 +514,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)/* backward-compatible 16 bit fields */ ac.ac_uid16 = ac.ac_uid; ac.ac_gid16 = ac.ac_gid; -#endif -#if ACCT_VERSION ==3 +#elif ACCT_VERSION ==3 {struct pid_namespace *ns = acct->ns;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/462 kernel/acct.c: use dedicated helper to access rlimit values
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yang <[email protected]>
[ Upstream commit 3c91dda97eea704ac257ddb138d1154adab8db62 ]
Use rlimit() helper instead of manually writing whole chain from task to rlimit value. See patch "posix-cpu-timers: Use dedicated helper to access rlimit values".
Stable-dep-of: 56d5f3eba3f5 ("acct: perform last write from workqueue")
--- kernel/acct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/acct.c +1 -1
@@ -494,7 +494,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)/* * Accounting records are not subject to resource limits. */ - flim = current->signal->rlim[RLIMIT_FSIZE ].rlim_cur; + flim =rlimit (RLIMIT_FSIZE ); current->signal->rlim[RLIMIT_FSIZE ].rlim_cur =RLIM_INFINITY ;/* Perform file operations on behalf of whoever enabled accounting */ orig_cred =override_creds (file->f_cred);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/462 acct: perform last write from workqueue
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 56d5f3eba3f5de0efdd556de4ef381e109b973a9 ]
In [1] it was reported that the acct(2) system call can be used to trigger NULL deref in cases where it is set to write to a file that triggers an internal lookup. This can e.g., happen when pointing acc(2) to /sys/power/resume. At the point the where the write to this file happens the calling task has already exited and called exit_fs(). A lookup will thus trigger a NULL-deref when accessing current->fs.
Reorganize the code so that the the final write happens from the workqueue but with the caller's credentials. This preserves the (strange) permission model and has almost no regression risk.
This api should stop to exist though.
--- kernel/acct.c | 120 +++++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 50 deletions(-)
kernel/acct.c +70 -50
@@ -85,48 +85,50 @@ struct bsd_acct_struct {atomic_long_t count;struct rcu_head rcu;struct mutex lock; -int active; +bool active; +bool check_space;unsigned long needcheck;struct file *file;struct pid_namespace *ns;struct work_struct work;struct completion done; +acct_t ac; }; -static void do_acct_process (struct bsd_acct_struct *acct); +static void fill_ac (struct bsd_acct_struct *acct); +static void acct_write_process (struct bsd_acct_struct *acct);/* * Check the amount of free space and suspend/resume accordingly. */ -static int check_free_space (struct bsd_acct_struct *acct) +static bool check_free_space (struct bsd_acct_struct *acct) {struct kstatfs sbuf; -if (time_is_after_jiffies (acct->needcheck)) - goto out; +if (!acct->check_space) +return acct->active;/* May block */ if (vfs_statfs (&acct->file->f_path, &sbuf)) - goto out; +return acct->active;if (acct->active) {u64 suspend = sbuf.f_blocks *SUSPEND ;do_div (suspend,100 );if (sbuf.f_bavail <= suspend) { - acct->active =0 ; + acct->active = false;pr_info ("Process accounting paused\n" ); } }else {u64 resume = sbuf.f_blocks *RESUME ;do_div (resume,100 );if (sbuf.f_bavail >= resume) { - acct->active =1 ; + acct->active = true;pr_info ("Process accounting resumed\n" ); } } acct->needcheck = jiffies +ACCT_TIMEOUT *HZ ; -out:return acct->active; }
@@ -171,7 +173,11 @@ static void acct_pin_kill(struct fs_pin *pin) {struct bsd_acct_struct *acct =to_acct (pin);mutex_lock (&acct->lock); -do_acct_process (acct); +/* +* Fill the accounting struct with the exiting task's info +* before punting to the workqueue. +*/ +fill_ac (acct);schedule_work (&acct->work);wait_for_completion (&acct->done);cmpxchg (&acct->ns->bacct, pin,NULL );
@@ -184,6 +190,9 @@ static void close_work(struct work_struct *work) { struct bsd_acct_struct *acct = container_of(work, struct bsd_acct_struct, work);struct file *file = acct->file; + +/* We were fired by acct_pin_kill() which holds acct->lock. */ +acct_write_process (acct);if (file->f_op->flush) file->f_op->flush (file,NULL );__fput_sync (file);
@@ -426,13 +435,27 @@ static u32 encode_float(u64 value)* do_exit() or when switching to a different output file. */ -static void fill_ac (acct_t *ac) +static void fill_ac (struct bsd_acct_struct *acct) {struct pacct_struct *pacct = ¤t->signal->pacct; +struct file *file = acct->file; +acct_t *ac = &acct->ac;u64 elapsed, run_time;time64_t btime;struct tty_struct *tty; +lockdep_assert_held (&acct->lock); + +if (time_is_after_jiffies (acct->needcheck)) { + acct->check_space = false; + +/* Don't fill in @ac if nothing will be written. */ +if (!acct->active) +return ; + }else { + acct->check_space = true; + } +/* * Fill the accounting struct with the needed info as recorded * by the different kernel functions.
@@ -480,64 +503,61 @@ static void fill_ac(acct_t *ac) ac->ac_majflt =encode_comp_t (pacct->ac_majflt); ac->ac_exitcode = pacct->ac_exitcode;spin_unlock_irq (¤t->sighand->siglock); -} -/* -* do_acct_process does all actual work. Caller holds the reference to file. -*/ -static void do_acct_process (struct bsd_acct_struct *acct) -{ -acct_t ac; -unsigned long flim; -const struct cred *orig_cred; -struct file *file = acct->file; - -/* -* Accounting records are not subject to resource limits. -*/ - flim =rlimit (RLIMIT_FSIZE ); - current->signal->rlim[RLIMIT_FSIZE ].rlim_cur =RLIM_INFINITY ; -/* Perform file operations on behalf of whoever enabled accounting */ - orig_cred =override_creds (file->f_cred); -/* -* First check to see if there is enough free_space to continue -* the process accounting system. -*/ -if (!check_free_space (acct)) - goto out; - -fill_ac (&ac);/* we really need to bite the bullet and change layout */ - ac.ac_uid =from_kuid_munged (file->f_cred->user_ns, orig_cred->uid); - ac.ac_gid =from_kgid_munged (file->f_cred->user_ns, orig_cred->gid); + ac->ac_uid =from_kuid_munged (file->f_cred->user_ns,current_uid ()); + ac->ac_gid =from_kgid_munged (file->f_cred->user_ns,current_gid ());#if ACCT_VERSION ==1 ||ACCT_VERSION ==2 /* backward-compatible 16 bit fields */ - ac.ac_uid16 = ac.ac_uid; - ac.ac_gid16 = ac.ac_gid; + ac->ac_uid16 = ac->ac_uid; + ac->ac_gid16 = ac->ac_gid;#elif ACCT_VERSION ==3 {struct pid_namespace *ns = acct->ns; - ac.ac_pid =task_tgid_nr_ns (current, ns); + ac->ac_pid =task_tgid_nr_ns (current, ns);rcu_read_lock (); - ac.ac_ppid =task_tgid_nr_ns (rcu_dereference (current->real_parent), - ns); + ac->ac_ppid =task_tgid_nr_ns (rcu_dereference (current->real_parent), ns);rcu_read_unlock (); }#endif +} + +static void acct_write_process (struct bsd_acct_struct *acct) +{ +struct file *file = acct->file; +const struct cred *cred; +acct_t *ac = &acct->ac; + +/* Perform file operations on behalf of whoever enabled accounting */ + cred =override_creds (file->f_cred); +/* -* Get freeze protection. If the fs is frozen, just skip the write -* as we could deadlock the system otherwise. +* First check to see if there is enough free_space to continue +* the process accounting system. Then get freeze protection. If +* the fs is frozen, just skip the write as we could deadlock +* the system otherwise. */ -if (file_start_write_trylock (file)) { +if (check_free_space (acct) &&file_start_write_trylock (file)) {/* it's been opened O_APPEND, so position is irrelevant */ loff_t pos =0 ; -__kernel_write (file, &ac,sizeof (acct_t), &pos); +__kernel_write (file, ac,sizeof (acct_t), &pos);file_end_write (file); } -out: + +revert_creds (cred); +} + +static void do_acct_process (struct bsd_acct_struct *acct) +{ +unsigned long flim; + +/* Accounting records are not subject to resource limits. */ + flim =rlimit (RLIMIT_FSIZE ); + current->signal->rlim[RLIMIT_FSIZE ].rlim_cur =RLIM_INFINITY ; +fill_ac (acct); +acct_write_process (acct); current->signal->rlim[RLIMIT_FSIZE ].rlim_cur = flim; -revert_creds (orig_cred); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/462 smb: client: Add check for next_buffer in receive_encrypted_standard()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit 860ca5e50f73c2a1cef7eefc9d39d04e275417f7 ]
Add check for the return value of cifs_buf_get() and cifs_small_buf_get() in receive_encrypted_standard() to prevent null pointer dereference.
--- fs/cifs/smb2ops.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/cifs/smb2ops.c +4 -0
@@ -4938,6 +4938,10 @@ receive_encrypted_standard(struct TCP_Server_Info *server, next_buffer = (char *)cifs_buf_get (); else next_buffer = (char *)cifs_small_buf_get (); +if (!next_buffer) { +cifs_server_dbg (VFS ,"No memory for (large) SMB response\n" ); +return -1 ; + }memcpy (next_buffer, buf + next_cmd, pdu_length - next_cmd); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/462 drm/amdgpu: Check extended configuration space register when system uses large bar
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Jun <[email protected]>
[ Upstream commit e372baeb3d336b20fd9463784c577fd8824497cd ]
Some customer platforms do not enable mmconfig for various reasons, such as bios bug, and therefore cannot access the GPU extend configuration space through mmio.
When the system enters the d3cold state and resumes, the amdgpu driver fails to resume because the extend configuration space registers of GPU can't be restored. At this point, Usually we only see some failure dmesg log printed by amdgpu driver, it is difficult to find the root cause.
Therefor print a warnning message if the system can't access the extended configuration space register when using large bar.
Stable-dep-of: 099bffc7cadf ("drm/amdgpu: disable BAR resize on Dell G5 SE")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -0
@@ -1098,6 +1098,10 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev))return 0 ; +/* PCI_EXT_CAP_ID_VNDR extended capability is located at 0x100 */ +if (!pci_find_ext_capability (adev->pdev,PCI_EXT_CAP_ID_VNDR )) +DRM_WARN ("System can't access extended configuration space,please check!!\n" ); +/* skip if the bios has already enabled large BAR */ if (adev->gmc.real_vram_size && (pci_resource_len (adev->pdev,0 ) >= adev->gmc.real_vram_size))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/462 drm/amdgpu: disable BAR resize on Dell G5 SE
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 099bffc7cadff40bfab1517c3461c53a7a38a0d7 ]
There was a quirk added to add a workaround for a Sapphire RX 5600 XT Pulse that didn't allow BAR resizing. However, the quirk caused a regression with runtime pm on Dell laptops using those chips, rather than narrowing the scope of the resizing quirk, add a quirk to prevent amdgpu from resizing the BAR on those Dell platforms unless runtime pm is disabled.
v2: update commit message, add runpm check
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -1098,6 +1098,13 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev))return 0 ; +/* resizing on Dell G5 SE platforms causes problems with runtime pm */ +if ((amdgpu_runtime_pm !=0 ) && + adev->pdev->vendor ==PCI_VENDOR_ID_ATI && + adev->pdev->device ==0x731f && + adev->pdev->subsystem_vendor ==PCI_VENDOR_ID_DELL ) +return 0 ; +/* PCI_EXT_CAP_ID_VNDR extended capability is located at 0x100 */ if (!pci_find_ext_capability (adev->pdev,PCI_EXT_CAP_ID_VNDR ))DRM_WARN ("System can't access extended configuration space,please check!!\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/462 efi: Dont map the entire mokvar table to determine its size
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Jones <[email protected]>
[ Upstream commit 2b90e7ace79774a3540ce569e000388f8d22c9e0 ]
Currently, when validating the mokvar table, we (re)map the entire table on each iteration of the loop, adding space as we discover new entries. If the table grows over a certain size, this fails due to limitations of early_memmap(), and we get a failure and traceback:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:139 __early_ioremap+0xef/0x220 ... Call Trace: <TASK> ? __early_ioremap+0xef/0x220 ? __warn.cold+0x93/0xfa ? __early_ioremap+0xef/0x220 ? report_bug+0xff/0x140 ? early_fixup_exception+0x5d/0xb0 ? early_idt_handler_common+0x2f/0x3a ? __early_ioremap+0xef/0x220 ? efi_mokvar_table_init+0xce/0x1d0 ? setup_arch+0x864/0xc10 ? start_kernel+0x6b/0xa10 ? x86_64_start_reservations+0x24/0x30 ? x86_64_start_kernel+0xed/0xf0 ? common_startup_64+0x13e/0x141 </TASK> ---[ end trace 0000000000000000 ]--- mokvar: Failed to map EFI MOKvar config table pa=0x7c4c3000, size=265187.
Mapping the entire structure isn't actually necessary, as we don't ever need more than one entry header mapped at once.
Changes efi_mokvar_table_init() to only map each entry header, not the entire table, when determining the table size. Since we're not mapping any data past the variable name, it also changes the code to enforce that each variable name is NUL terminated, rather than attempting to verify it in place.
--- drivers/firmware/efi/mokvar-table.c | 41 +++++++++-------------------- 1 file changed, 13 insertions(+), 28 deletions(-)
drivers/firmware/efi/mokvar-table.c +13 -28
@@ -103,7 +103,6 @@ void __init efi_mokvar_table_init(void)void *va =NULL ;unsigned long cur_offset =0 ;unsigned long offset_limit; -unsigned long map_size =0 ;unsigned long map_size_needed =0 ;unsigned long size;struct efi_mokvar_table_entry *mokvar_entry;
@@ -134,48 +133,34 @@ void __init efi_mokvar_table_init(void)*/ err = -EINVAL ;while (cur_offset +sizeof (*mokvar_entry) <= offset_limit) { - mokvar_entry = va + cur_offset; - map_size_needed = cur_offset +sizeof (*mokvar_entry); -if (map_size_needed > map_size) { -if (va) -early_memunmap (va, map_size); -/* -* Map a little more than the fixed size entry -* header, anticipating some data. It's safe to -* do so as long as we stay within current memory -* descriptor. -*/ - map_size =min (map_size_needed +2 *EFI_PAGE_SIZE , - offset_limit); - va =early_memremap (efi.mokvar_table, map_size); -if (!va) { -pr_err ("Failed to map EFI MOKvar config table pa=0x%lx, size=%lu.\n" , - efi.mokvar_table, map_size); -return ; - } - mokvar_entry = va + cur_offset; +if (va) +early_memunmap (va,sizeof (*mokvar_entry)); + va =early_memremap (efi.mokvar_table + cur_offset,sizeof (*mokvar_entry)); +if (!va) { +pr_err ("Failed to map EFI MOKvar config table pa=0x%lx, size=%zu.\n" , + efi.mokvar_table + cur_offset,sizeof (*mokvar_entry)); +return ; } + mokvar_entry = va;/* Check for last sentinel entry */ if (mokvar_entry->name[0 ] =='\0' ) {if (mokvar_entry->data_size !=0 )break ; err =0 ; + map_size_needed = cur_offset +sizeof (*mokvar_entry);break ; } -/* Sanity check that the name is null terminated */ - size =strnlen (mokvar_entry->name, -sizeof (mokvar_entry->name)); -if (size >=sizeof (mokvar_entry->name)) -break ; +/* Enforce that the name is NUL terminated */ + mokvar_entry->name[sizeof (mokvar_entry->name) -1 ] ='\0' ;/* Advance to the next entry */ - cur_offset = map_size_needed + mokvar_entry->data_size; + cur_offset +=sizeof (*mokvar_entry) + mokvar_entry->data_size; }if (va) -early_memunmap (va, map_size); +early_memunmap (va,sizeof (*mokvar_entry));if (err) {pr_err ("EFI MOKvar config table is not valid\n" );return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 388/462 Revert "of: reserved-memory: Fix using wrong number of cells to get property alignment"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
commit 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 upstream.
This reverts commit 267b21d0bef8e67dbe6c591c9991444e58237ec9.
Turns out some DTs do depend on this behavior. Specifically, a downstream Pixel 6 DT. Revert the change at least until we can decide if the DT spec can be changed instead.
--- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/of/of_reserved_mem.c +2 -2
@@ -94,12 +94,12 @@ static int __init __reserved_mem_alloc_s prop =of_get_flat_dt_prop (node,"alignment" , &len);if (prop) { -if (len != dt_root_size_cells *sizeof (__be32)) { +if (len != dt_root_addr_cells *sizeof (__be32)) {pr_err ("invalid alignment property in '%s' node.\n" , uname);return -EINVAL ; } - align =dt_mem_next_cell (dt_root_size_cells, &prop); + align =dt_mem_next_cell (dt_root_addr_cells, &prop); } nomap =of_get_flat_dt_prop (node,"no-map" ,NULL ) !=NULL ;
Greg Kroah-Hartman
maintainerPATCH 389/462 HID: appleir: Fix potential NULL dereference at raw event handle
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
commit 2ff5baa9b5275e3acafdf7f2089f74cccb2f38d1 upstream.
Syzkaller reports a NULL pointer dereference issue in input_event().
BUG: KASAN: null-ptr-deref in instrument_atomic_read include/linux/instrumented.h:68 [inline] BUG: KASAN: null-ptr-deref in _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] BUG: KASAN: null-ptr-deref in is_event_supported drivers/input/input.c:67 [inline] BUG: KASAN: null-ptr-deref in input_event+0x42/0xa0 drivers/input/input.c:395 Read of size 8 at addr 0000000000000028 by task syz-executor199/2949 CPU: 0 UID: 0 PID: 2949 Comm: syz-executor199 Not tainted 6.13.0-rc4-syzkaller-00076-gf097a36ef88d #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 kasan_report+0xd9/0x110 mm/kasan/report.c:602 check_region_inline mm/kasan/generic.c:183 [inline] kasan_check_range+0xef/0x1a0 mm/kasan/generic.c:189 instrument_atomic_read include/linux/instrumented.h:68 [inline] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] is_event_supported drivers/input/input.c:67 [inline] input_event+0x42/0xa0 drivers/input/input.c:395 input_report_key include/linux/input.h:439 [inline] key_down drivers/hid/hid-appleir.c:159 [inline] appleir_raw_event+0x3e5/0x5e0 drivers/hid/hid-appleir.c:232 __hid_input_report.constprop.0+0x312/0x440 drivers/hid/hid-core.c:2111 hid_ctrl+0x49f/0x550 drivers/hid/usbhid/hid-core.c:484 __usb_hcd_giveback_urb+0x389/0x6e0 drivers/usb/core/hcd.c:1650 usb_hcd_giveback_urb+0x396/0x450 drivers/usb/core/hcd.c:1734 dummy_timer+0x17f7/0x3960 drivers/usb/gadget/udc/dummy_hcd.c:1993 __run_hrtimer kernel/time/hrtimer.c:1739 [inline] __hrtimer_run_queues+0x20a/0xae0 kernel/time/hrtimer.c:1803 hrtimer_run_softirq+0x17d/0x350 kernel/time/hrtimer.c:1820 handle_softirqs+0x206/0x8d0 kernel/softirq.c:561 __do_softirq kernel/softirq.c:595 [inline] invoke_softirq kernel/softirq.c:435 [inline] __irq_exit_rcu+0xfa/0x160 kernel/softirq.c:662 irq_exit_rcu+0x9/0x30 kernel/softirq.c:678 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1049 [inline] sysvec_apic_timer_interrupt+0x90/0xb0 arch/x86/kernel/apic/apic.c:1049 </IRQ> <TASK> asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:702 __mod_timer+0x8f6/0xdc0 kernel/time/timer.c:1185 add_timer+0x62/0x90 kernel/time/timer.c:1295 schedule_timeout+0x11f/0x280 kernel/time/sleep_timeout.c:98 usbhid_wait_io+0x1c7/0x380 drivers/hid/usbhid/hid-core.c:645 usbhid_init_reports+0x19f/0x390 drivers/hid/usbhid/hid-core.c:784 hiddev_ioctl+0x1133/0x15b0 drivers/hid/usbhid/hiddev.c:794 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl fs/ioctl.c:892 [inline] __x64_sys_ioctl+0x190/0x200 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xcd/0x250 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK>
This happens due to the malformed report items sent by the emulated device which results in a report, that has no fields, being added to the report list. Due to this appleir_input_configured() is never called, hidinput_connect() fails which results in the HID_CLAIMED_INPUT flag is not being set. However, it does not make appleir_probe() fail and lets the event callback to be called without the associated input device.
Thus, add a check for the HID_CLAIMED_INPUT flag and leave the event hook early if the driver didn't claim any input_dev for some reason. Moreover, some other hid drivers accessing input_dev in their event callbacks do have similar checks, too.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/hid/hid-appleir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-appleir.c +1 -1
@@ -188,7 +188,7 @@ static int appleir_raw_event(struct hid_static const u8 flatbattery[] = {0x25 ,0x87 ,0xe0 };unsigned long flags; -if (len !=5 ) +if (len !=5 || !(hid->claimed &HID_CLAIMED_INPUT )) goto out;if (!memcmp (data, keydown,sizeof (keydown))) {
Greg Kroah-Hartman
maintainerPATCH 390/462 gpio: aggregator: protect driver attr handlers against module unload
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Koichiro Den <[email protected]>
commit 12f65d1203507f7db3ba59930fe29a3b8eee9945 upstream.
Both new_device_store and delete_device_store touch module global resources (e.g. gpio_aggregator_lock). To prevent race conditions with module unload, a reference needs to be held.
Add try_module_get() in these handlers.
For new_device_store, this eliminates what appears to be the most dangerous
scenario: if an id is allocated from gpio_aggregator_idr but platform_device_register has not yet been called or completed, a concurrent module unload could fail to unregister/delete the device, leaving behind a dangling platform device/GPIO forwarder. This can result in various issues. The following simple reproducer demonstrates these problems:
#!/bin/bash
while :; do
# note: whether 'gpiochip0 0' exists or not does not matter. echo 'gpiochip0 0' > /sys/bus/platform/drivers/gpio-aggregator/new_device
done &
while :; do
modprobe gpio-aggregator
modprobe -r gpio-aggregator
done &
wait
Starting with the following warning, several kinds of warnings will appear and the system may become unstable:
------------[ cut here ]------------ list_del corruption, ffff888103e2e980->next is LIST_POISON1 (dead000000000100) WARNING: CPU: 1 PID: 1327 at lib/list_debug.c:56 __list_del_entry_valid_or_report+0xa3/0x120 [...] RIP: 0010:__list_del_entry_valid_or_report+0xa3/0x120 [...] Call Trace: <TASK> ? __list_del_entry_valid_or_report+0xa3/0x120 ? __warn.cold+0x93/0xf2 ? __list_del_entry_valid_or_report+0xa3/0x120 ? report_bug+0xe6/0x170 ? __irq_work_queue_local+0x39/0xe0 ? handle_bug+0x58/0x90 ? exc_invalid_op+0x13/0x60 ? asm_exc_invalid_op+0x16/0x20 ? __list_del_entry_valid_or_report+0xa3/0x120 gpiod_remove_lookup_table+0x22/0x60 new_device_store+0x315/0x350 [gpio_aggregator] kernfs_fop_write_iter+0x137/0x1f0 vfs_write+0x262/0x430 ksys_write+0x60/0xd0 do_syscall_64+0x6c/0x180 entry_SYSCALL_64_after_hwframe+0x76/0x7e [...] </TASK> ---[ end trace 0000000000000000 ]---
--- drivers/gpio/gpio-aggregator.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/gpio/gpio-aggregator.c +17 -3
@@ -173,10 +173,15 @@ static ssize_t new_device_store(struct dstruct platform_device *pdev;int res, id; +if (!try_module_get (THIS_MODULE )) +return -ENOENT ; +/* kernfs guarantees string termination, so count + 1 is safe */ aggr =kzalloc (sizeof (*aggr) + count +1 ,GFP_KERNEL ); -if (!aggr) -return -ENOMEM ; +if (!aggr) { + res = -ENOMEM ; + goto put_module; + }memcpy (aggr->args, buf, count +1 );
@@ -215,6 +220,7 @@ static ssize_t new_device_store(struct d } aggr->pdev = pdev; +module_put (THIS_MODULE );return count; remove_table:
@@ -229,6 +235,8 @@ free_table:kfree (aggr->lookups); free_ga:kfree (aggr); +put_module: +module_put (THIS_MODULE );return res; }
@@ -257,13 +265,19 @@ static ssize_t delete_device_store(strucif (error)return error; +if (!try_module_get (THIS_MODULE )) +return -ENOENT ; +mutex_lock (&gpio_aggregator_lock); aggr =idr_remove (&gpio_aggregator_idr, id);mutex_unlock (&gpio_aggregator_lock); -if (!aggr) +if (!aggr) { +module_put (THIS_MODULE );return -ENOENT ; + }gpio_aggregator_free (aggr); +module_put (THIS_MODULE );return count; }static DRIVER_ATTR_WO (delete_device);
Greg Kroah-Hartman
maintainerPATCH 391/462 ALSA: hda: intel: Add Dell ALC3271 to power_save denylist
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hoku Ishibe <[email protected]>
commit 1ee5aa765c22a0577ec552d460bf2035300b4b51 upstream.
Dell XPS 13 7390 with the Realtek ALC3271 codec experiences persistent humming noise when the power_save mode is enabled. This issue occurs when the codec enters power saving mode, leading to unwanted noise from the speakers.
This patch adds the affected model (PCI ID 0x1028:0x0962) to the power_save denylist to ensure power_save is disabled by default, preventing power-off related noise issues.
Steps to Reproduce
1. Boot the system with snd_hda_intel loaded.
2. Verify that power_save mode is enabled:
```sh cat /sys/module/snd_hda_intel/parameters/power_save ````
output: 10 (default power save timeout)
3. Wait for the power save timeout
4. Observe a persistent humming noise from the speakers
5. Disable power_save manually:
```sh echo 0 | sudo tee /sys/module/snd_hda_intel/parameters/power_save ````
6. Confirm that the noise disappears immediately.
This issue has been observed on my system, and this patch successfully eliminates the unwanted noise. If other users experience similar issues, additional reports would be helpful.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2280,6 +2280,8 @@ static const struct snd_pci_quirk power_SND_PCI_QUIRK (0x1631 ,0xe017 ,"Packard Bell NEC IMEDIA 5204" ,0 ),/* KONTRON SinglePC may cause a stall at runtime resume */ SND_PCI_QUIRK (0x1734 ,0x1232 ,"KONTRON SinglePC" ,0 ), +/* Dell ALC3271 */ + SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0), {} };#endif /* CONFIG_PM */
Greg Kroah-Hartman
maintainerPATCH 392/462 ALSA: hda/realtek: update ALC222 depop optimize
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit ca0dedaff92307591f66c9206933fbdfe87add10 upstream.
Add ALC222 its own depop functions for alc_init and alc_shutup.
[note: this fixes pop noise issues on the models with two headphone
jacks -- tiwai ]
--- sound/pci/hda/patch_realtek.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
sound/pci/hda/patch_realtek.c +76 -0
@@ -3768,6 +3768,79 @@ static void alc225_shutup(struct hda_cod } } +static void alc222_init (struct hda_codec *codec) +{ +struct alc_spec *spec = codec->spec; +hda_nid_t hp_pin =alc_get_hp_pin (spec); +bool hp1_pin_sense, hp2_pin_sense; + +if (!hp_pin) +return ; + +msleep (30 ); + + hp1_pin_sense =snd_hda_jack_detect (codec, hp_pin); + hp2_pin_sense =snd_hda_jack_detect (codec,0x14 ); + +if (hp1_pin_sense || hp2_pin_sense) { +msleep (2 ); + +if (hp1_pin_sense) +snd_hda_codec_write (codec, hp_pin,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT ); +if (hp2_pin_sense) +snd_hda_codec_write (codec,0x14 ,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT ); +msleep (75 ); + +if (hp1_pin_sense) +snd_hda_codec_write (codec, hp_pin,0 , +AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_UNMUTE ); +if (hp2_pin_sense) +snd_hda_codec_write (codec,0x14 ,0 , +AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_UNMUTE ); + +msleep (75 ); + } +} + +static void alc222_shutup (struct hda_codec *codec) +{ +struct alc_spec *spec = codec->spec; +hda_nid_t hp_pin =alc_get_hp_pin (spec); +bool hp1_pin_sense, hp2_pin_sense; + +if (!hp_pin) + hp_pin =0x21 ; + + hp1_pin_sense =snd_hda_jack_detect (codec, hp_pin); + hp2_pin_sense =snd_hda_jack_detect (codec,0x14 ); + +if (hp1_pin_sense || hp2_pin_sense) { +msleep (2 ); + +if (hp1_pin_sense) +snd_hda_codec_write (codec, hp_pin,0 , +AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_MUTE ); +if (hp2_pin_sense) +snd_hda_codec_write (codec,0x14 ,0 , +AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_MUTE ); + +msleep (75 ); + +if (hp1_pin_sense) +snd_hda_codec_write (codec, hp_pin,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL ,0x0 ); +if (hp2_pin_sense) +snd_hda_codec_write (codec,0x14 ,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL ,0x0 ); + +msleep (75 ); + } +alc_auto_setup_eapd (codec, false); +alc_shutup_pins (codec); +} +static void alc_default_init (struct hda_codec *codec) {struct alc_spec *spec = codec->spec;
@@ -10289,8 +10362,11 @@ static int patch_alc269(struct hda_codec spec->codec_variant =ALC269_TYPE_ALC300 ; spec->gen.mixer_nid =0 ;/* no loopback on ALC300 */ break ; +case 0x10ec0222 :case 0x10ec0623 : spec->codec_variant =ALC269_TYPE_ALC623 ; + spec->shutup = alc222_shutup; + spec->init_hook = alc222_init;break ;case 0x10ec0700 :case 0x10ec0701 :
Greg Kroah-Hartman
maintainerPATCH 393/462 drm/radeon: Fix rs400_gpu_init for ATI mobility radeon Xpress 200M
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Thier <[email protected]>
commit 29ffeb73b216ce3eff10229eb077cf9b7812119d upstream.
num_gb_pipes was set to a wrong value using r420_pipe_config
This have lead to HyperZ glitches on fast Z clearing.
--- drivers/gpu/drm/radeon/r300.c | 3 ++- drivers/gpu/drm/radeon/radeon_asic.h | 1 + drivers/gpu/drm/radeon/rs400.c | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r300.c +2 -1
@@ -361,7 +361,8 @@ int r300_mc_wait_for_idle(struct radeon_return -1 ; } -static void r300_gpu_init (struct radeon_device *rdev) +/* rs400_gpu_init also calls this! */ +void r300_gpu_init (struct radeon_device *rdev) {uint32_t gb_tile_config, tmp;
drivers/gpu/drm/radeon/radeon_asic.h +1 -0
@@ -165,6 +165,7 @@ void r200_set_safe_registers(struct rade*/ extern int r300_init (struct radeon_device *rdev);extern void r300_fini (struct radeon_device *rdev); +extern void r300_gpu_init (struct radeon_device *rdev);extern int r300_suspend (struct radeon_device *rdev);extern int r300_resume (struct radeon_device *rdev);extern int r300_asic_reset (struct radeon_device *rdev,bool hard);
drivers/gpu/drm/radeon/rs400.c +16 -2
@@ -257,8 +257,22 @@ int rs400_mc_wait_for_idle(struct radeonstatic void rs400_gpu_init (struct radeon_device *rdev) { -/* FIXME: is this correct ? */ -r420_pipes_init (rdev); +/* Earlier code was calling r420_pipes_init and then +* rs400_mc_wait_for_idle(rdev). The problem is that +* at least on my Mobility Radeon Xpress 200M RC410 card +* that ends up in this code path ends up num_gb_pipes == 3 +* while the card seems to have only one pipe. With the +* r420 pipe initialization method. +* +* Problems shown up as HyperZ glitches, see: +* https://bugs.freedesktop.org/show_bug.cgi?id=110897 +* +* Delegating initialization to r300 code seems to work +* and results in proper pipe numbers. The rs400 cards +* are said to be not r400, but r300 kind of cards. +*/ +r300_gpu_init (rdev); +if (rs400_mc_wait_for_idle (rdev)) {pr_warn ("rs400: Failed to wait MC idle while programming pipes. Bad things might happen. %08x\n" ,RREG32 (RADEON_MC_STATUS ));
Greg Kroah-Hartman
maintainerPATCH 394/462 platform/x86: thinkpad_acpi: Add battery quirk for ThinkPad X131e
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingcong Bai <[email protected]>
commit d0d10eaedcb53740883d7e5d53c5e15c879b48fb upstream.
Based on the dmesg messages from the original reporter:
[ 4.964073] ACPI: \_SB_.PCI0.LPCB.EC__.HKEY: BCTG evaluated but flagged as error [ 4.964083] thinkpad_acpi: Error probing battery 2
Lenovo ThinkPad X131e also needs this battery quirk.
--- drivers/platform/x86/thinkpad_acpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/thinkpad_acpi.c +1 -0
@@ -9718,6 +9718,7 @@ static const struct tpacpi_quirk battery* Individual addressing is broken on models that expose the * primary battery as BAT1. */ +TPACPI_Q_LNV ('G' ,'8' , true),/* ThinkPad X131e */ TPACPI_Q_LNV ('8' ,'F' , true),/* Thinkpad X120e */ TPACPI_Q_LNV ('J' ,'7' , true),/* B5400 */ TPACPI_Q_LNV('J', 'I', true), /* Thinkpad 11e */
Greg Kroah-Hartman
maintainerPATCH 395/462 x86/cacheinfo: Validate CPUID leaf 0x2 EDX output
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed S. Darwish <[email protected]>
commit 8177c6bedb7013cf736137da586cf783922309dd upstream.
CPUID leaf 0x2 emits one-byte descriptors in its four output registers EAX, EBX, ECX, and EDX. For these descriptors to be valid, the most significant bit (MSB) of each register must be clear.
The historical Git commit:
019361a20f016 ("- pre6: Intel: start to add Pentium IV specific stuff (128-byte cacheline etc)...")
introduced leaf 0x2 output parsing. It only validated the MSBs of EAX, EBX, and ECX, but left EDX unchecked.
Validate EDX's most-significant bit.
--- arch/x86/kernel/cpu/cacheinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/cacheinfo.c +1 -1
@@ -795,7 +795,7 @@ void init_intel_cacheinfo(struct cpuinfocpuid (2 , ®s[0 ], ®s[1 ], ®s[2 ], ®s[3 ]);/* If bit 31 is set, this is an unknown format */ -for (j =0 ; j <3 ; j++) +for (j =0 ; j <4 ; j++)if (regs[j] & (1 <<31 )) regs[j] =0 ;
Greg Kroah-Hartman
maintainerPATCH 396/462 x86/cpu: Validate CPUID leaf 0x2 EDX output
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed S. Darwish <[email protected]>
commit 1881148215c67151b146450fb89ec22fd92337a7 upstream.
CPUID leaf 0x2 emits one-byte descriptors in its four output registers EAX, EBX, ECX, and EDX. For these descriptors to be valid, the most significant bit (MSB) of each register must be clear.
Leaf 0x2 parsing at intel.c only validated the MSBs of EAX, EBX, and ECX, but left EDX unchecked.
Validate EDX's most-significant bit as well.
--- arch/x86/kernel/cpu/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/intel.c +1 -1
@@ -911,7 +911,7 @@ static void intel_detect_tlb(struct cpuicpuid (2 , ®s[0 ], ®s[1 ], ®s[2 ], ®s[3 ]);/* If bit 31 is set, this is an unknown format */ -for (j =0 ; j <3 ; j++) +for (j =0 ; j <4 ; j++)if (regs[j] & (1 <<31 )) regs[j] =0 ;
Greg Kroah-Hartman
maintainerPATCH 397/462 x86/cpu: Properly parse CPUID leaf 0x2 TLB descriptor 0x63
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed S. Darwish <[email protected]>
commit f6bdaab79ee4228a143ee1b4cb80416d6ffc0c63 upstream.
CPUID leaf 0x2's one-byte TLB descriptors report the number of entries for specific TLB types, among other properties.
Typically, each emitted descriptor implies the same number of entries for its respective TLB type(s). An emitted 0x63 descriptor is an
exception: it implies 4 data TLB entries for 1GB pages and 32 data TLB entries for 2MB or 4MB pages.
For the TLB descriptors parsing code, the entry count for 1GB pages is encoded at the intel_tlb_table[] mapping, but the 2MB/4MB entry count is totally ignored.
Update leaf 0x2's parsing logic 0x2 to account for 32 data TLB entries for 2MB/4MB pages implied by the 0x63 descriptor.
--- arch/x86/kernel/cpu/intel.c | 60 ++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 21 deletions(-)
arch/x86/kernel/cpu/intel.c +39 -21
@@ -747,26 +747,37 @@ static unsigned int intel_size_cache(str }#endif -#define TLB_INST_4K 0x01 -#define TLB_INST_4M 0x02 -#define TLB_INST_2M_4M 0x03 - -#define TLB_INST_ALL 0x05 -#define TLB_INST_1G 0x06 - -#define TLB_DATA_4K 0x11 -#define TLB_DATA_4M 0x12 -#define TLB_DATA_2M_4M 0x13 -#define TLB_DATA_4K_4M 0x14 - -#define TLB_DATA_1G 0x16 - -#define TLB_DATA0_4K 0x21 -#define TLB_DATA0_4M 0x22 -#define TLB_DATA0_2M_4M 0x23 - -#define STLB_4K 0x41 -#define STLB_4K_2M 0x42 +#define TLB_INST_4K 0x01 +#define TLB_INST_4M 0x02 +#define TLB_INST_2M_4M 0x03 + +#define TLB_INST_ALL 0x05 +#define TLB_INST_1G 0x06 + +#define TLB_DATA_4K 0x11 +#define TLB_DATA_4M 0x12 +#define TLB_DATA_2M_4M 0x13 +#define TLB_DATA_4K_4M 0x14 + +#define TLB_DATA_1G 0x16 +#define TLB_DATA_1G_2M_4M 0x17 + +#define TLB_DATA0_4K 0x21 +#define TLB_DATA0_4M 0x22 +#define TLB_DATA0_2M_4M 0x23 + +#define STLB_4K 0x41 +#define STLB_4K_2M 0x42 + +/* +* All of leaf 0x2's one-byte TLB descriptors implies the same number of +* entries for their respective TLB types. The 0x63 descriptor is an +* exception: it implies 4 dTLB entries for 1GB pages 32 dTLB entries +* for 2MB or 4MB pages. Encode descriptor 0x63 dTLB entry count for +* 2MB/4MB pages here, as its count for dTLB 1GB pages is already at the +* intel_tlb_table[] mapping. +*/ +#define TLB_0x63_2M_4M_ENTRIES 32static const struct _tlb_table intel_tlb_table[] = { {0x01 ,TLB_INST_4K ,32 ," TLB_INST 4 KByte pages, 4-way set associative" },
@@ -788,7 +799,8 @@ static const struct _tlb_table intel_tlb { 0x5c, TLB_DATA_4K_4M, 128, " TLB_DATA 4 KByte and 4 MByte pages" }, { 0x5d, TLB_DATA_4K_4M, 256, " TLB_DATA 4 KByte and 4 MByte pages" }, { 0x61, TLB_INST_4K, 48, " TLB_INST 4 KByte pages, full associative" }, - { 0x63, TLB_DATA_1G, 4, " TLB_DATA 1 GByte pages, 4-way set associative" }, + { 0x63, TLB_DATA_1G_2M_4M, 4, " TLB_DATA 1 GByte pages, 4-way set associative" + " (plus 32 entries TLB_DATA 2 MByte or 4 MByte pages, not encoded here)" }, { 0x6b, TLB_DATA_4K, 256, " TLB_DATA 4 KByte pages, 8-way associative" }, { 0x6c, TLB_DATA_2M_4M, 128, " TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" }, { 0x6d, TLB_DATA_1G, 16, " TLB_DATA 1 GByte pages, fully associative" },
@@ -888,6 +900,12 @@ static void intel_tlb_lookup(const unsigif (tlb_lld_4m[ENTRIES ] < intel_tlb_table[k].entries) tlb_lld_4m[ENTRIES ] = intel_tlb_table[k].entries;break ; +case TLB_DATA_1G_2M_4M : +if (tlb_lld_2m[ENTRIES ] < TLB_0x63_2M_4M_ENTRIES) + tlb_lld_2m[ENTRIES ] = TLB_0x63_2M_4M_ENTRIES; +if (tlb_lld_4m[ENTRIES ] < TLB_0x63_2M_4M_ENTRIES) + tlb_lld_4m[ENTRIES ] = TLB_0x63_2M_4M_ENTRIES; + fallthrough;case TLB_DATA_1G :if (tlb_lld_1g[ENTRIES ] < intel_tlb_table[k].entries) tlb_lld_1g[ENTRIES ] = intel_tlb_table[k].entries;
Greg Kroah-Hartman
maintainerPATCH 398/462 wifi: cfg80211: regulatory: improve invalid hints checking
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
commit 59b348be7597c4a9903cb003c69e37df20c04a30 upstream.
Syzbot keeps reporting an issue [1] that occurs when erroneous symbols sent from userspace get through into user_alpha2[] via regulatory_hint_user() call. Such invalid regulatory hints should be rejected.
While a sanity check from commit 47caf685a685 ("cfg80211: regulatory:
reject invalid hints") looks to be enough to deter these very cases, there is a way to get around it due to 2 reasons.
1) The way isalpha() works, symbols other than latin lower and upper letters may be used to determine a country/domain. For instance, greek letters will also be considered upper/lower letters and for such characters isalpha() will return true as well. However, ISO-3166-1 alpha2 codes should only hold latin characters.
2) While processing a user regulatory request, between reg_process_hint_user() and regulatory_hint_user() there happens to be a call to queue_regulatory_request() which modifies letters in request->alpha2[] with toupper(). This works fine for latin symbols, less so for weird letter characters from the second part of _ctype[].
Syzbot triggers a warning in is_user_regdom_saved() by first sending over an unexpected non-latin letter that gets malformed by toupper() into a character that ends up failing isalpha() check.
Prevent this by enhancing is_an_alpha2() to ensure that incoming symbols are latin letters and nothing else.
[1] Syzbot report:
------------[ cut here ]------------ Unexpected user alpha2: A� WARNING: CPU: 1 PID: 964 at net/wireless/reg.c:442 is_user_regdom_saved net/wireless/reg.c:440 [inline] WARNING: CPU: 1 PID: 964 at net/wireless/reg.c:442 restore_alpha2 net/wireless/reg.c:3424 [inline] WARNING: CPU: 1 PID: 964 at net/wireless/reg.c:442 restore_regulatory_settings+0x3c0/0x1e50 net/wireless/reg.c:3516 Modules linked in: CPU: 1 UID: 0 PID: 964 Comm: kworker/1:2 Not tainted 6.12.0-rc5-syzkaller-00044-gc1e939a21eb1 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 Workqueue: events_power_efficient crda_timeout_work RIP: 0010:is_user_regdom_saved net/wireless/reg.c:440 [inline] RIP: 0010:restore_alpha2 net/wireless/reg.c:3424 [inline] RIP: 0010:restore_regulatory_settings+0x3c0/0x1e50 net/wireless/reg.c:3516 ... Call Trace: <TASK> crda_timeout_work+0x27/0x50 net/wireless/reg.c:542 process_one_work kernel/workqueue.c:3229 [inline] process_scheduled_works+0xa65/0x1850 kernel/workqueue.c:3310 worker_thread+0x870/0xd30 kernel/workqueue.c:3391 kthread+0x2f2/0x390 kernel/kthread.c:389 ret_from_fork+0x4d/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK>
--- net/wireless/reg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/wireless/reg.c +2 -1
@@ -385,7 +385,8 @@ static bool is_an_alpha2(const char *alp {if (!alpha2)return false; -return isalpha (alpha2[0 ]) &&isalpha (alpha2[1 ]); +return isascii (alpha2[0 ]) &&isalpha (alpha2[0 ]) && +isascii (alpha2[1 ]) &&isalpha (alpha2[1 ]); }static bool alpha2_equal (const char *alpha2_x,const char *alpha2_y)
Greg Kroah-Hartman
maintainerPATCH 399/462 wifi: nl80211: reject cooked mode if it is set along with other flags
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaliy Shevtsov <[email protected]>
commit 49f27f29446a5bfe633dd2cc0cfebd48a1a5e77f upstream.
It is possible to set both MONITOR_FLAG_COOK_FRAMES and MONITOR_FLAG_ACTIVE flags simultaneously on the same monitor interface from the userspace. This causes a sub-interface to be created with no IEEE80211_SDATA_IN_DRIVER bit set because the monitor interface is in the cooked state and it takes precedence over all other states. When the interface is then being deleted the kernel calls WARN_ONCE() from check_sdata_in_driver() because of missing that bit.
Fix this by rejecting MONITOR_FLAG_COOK_FRAMES if it is set along with other flags.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- net/wireless/nl80211.c | 5 +++++ 1 file changed, 5 insertions(+)
net/wireless/nl80211.c +5 -0
@@ -3658,6 +3658,11 @@ static int parse_monitor_flags(struct nlif (flags[flag]) *mntrflags |= (1 <<flag); +/* cooked monitor mode is incompatible with other modes */ +if (*mntrflags &MONITOR_FLAG_COOK_FRAMES && + *mntrflags !=MONITOR_FLAG_COOK_FRAMES ) +return -EOPNOTSUPP ; + *mntrflags |=MONITOR_FLAG_CHANGED ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 400/462 rapidio: add check for rio_add_net() in rio_scan_alloc_net()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit e842f9a1edf306bf36fe2a4d847a0b0d458770de upstream.
The return value of rio_add_net() should be checked. If it fails, put_device() should be called to free the memory and give up the reference initialized in rio_add_net().
--- drivers/rapidio/rio-scan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/rapidio/rio-scan.c +4 -1
@@ -871,7 +871,10 @@ static struct rio_net *rio_scan_alloc_nedev_set_name (&net->dev,"rnet_%d" , net->id); net->dev.parent = &mport->dev; net->dev.release = rio_scan_release_dev; -rio_add_net (net); +if (rio_add_net (net)) { +put_device (&net->dev); + net =NULL ; + } }return net;
Greg Kroah-Hartman
maintainerPATCH 401/462 rapidio: fix an API misues when rio_add_net() fails
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit b2ef51c74b0171fde7eb69b6152d3d2f743ef269 upstream.
rio_add_net() calls device_register() and fails when device_register() fails. Thus, put_device() should be used rather than kfree(). Add "mport->net = NULL;" to avoid a use after free issue.
--- drivers/rapidio/devices/rio_mport_cdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rapidio/devices/rio_mport_cdev.c +2 -1
@@ -1739,7 +1739,8 @@ static int rio_mport_add_riodev(struct m err =rio_add_net (net);if (err) {rmcd_debug (RDEV ,"failed to register net, err=%d" , err); -kfree (net); +put_device (&net->dev); + mport->net =NULL ; goto cleanup; } }
Greg Kroah-Hartman
maintainerPATCH 402/462 s390/traps: Fix test_monitor_call() inline assembly
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit 5623bc23a1cb9f9a9470fa73b3a20321dc4c4870 upstream.
The test_monitor_call() inline assembly uses the xgr instruction, which also modifies the condition code, to clear a register. However the clobber list of the inline assembly does not specify that the condition code is modified, which may lead to incorrect code generation.
Use the lhi instruction instead to clear the register without that the condition code is modified. Furthermore this limits clearing to the lower 32 bits of val, since its type is int.
--- arch/s390/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/traps.c +3 -3
@@ -276,10 +276,10 @@ static void __init test_monitor_call(voireturn ; asmvolatile (" mc 0,0\n" -"0: xgr %0,%0\n" +"0: lhi %[val],0\n" "1:\n" - EX_TABLE(0b,1b) - : "+d" (val)); + EX_TABLE(0b, 1b) + : [val] "+d" (val)); if (!val)panic ("Monitor call doesn't work!\n" ); }
Greg Kroah-Hartman
maintainerPATCH 403/462 block: fix conversion of GPT partition name to 7-bit
In reply to Greg Kroah-Hartman5.10-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
@@ -672,7 +672,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 404/462 mm/page_alloc: fix uninitialized variable
In reply to Greg Kroah-Hartman5.10-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
@@ -4668,6 +4668,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 405/462 wifi: iwlwifi: limit printed string from FW file
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 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
@@ -1127,7 +1127,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 406/462 HID: google: fix unused variable warning under !CONFIG_ACPI
In reply to Greg Kroah-Hartman5.10-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
@@ -266,11 +266,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 static struct platform_driver cbas_ec_driver = { .probe = cbas_ec_probe,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/462 HID: intel-ish-hid: Fix use-after-free issue in ishtp_hid_remove()
In reply to Greg Kroah-Hartman5.10-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
@@ -263,12 +263,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 408/462 nvmet-tcp: Fix a possible sporadic response drops in weakly ordered arch
In reply to Greg Kroah-Hartman5.10-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
@@ -527,10 +527,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);
@@ -539,7 +545,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 ;
@@ -794,8 +800,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 409/462 net: gso: fix ownership in __udp_gso_segment
In reply to Greg Kroah-Hartman5.10-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
@@ -280,13 +280,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 410/462 caif_virtio: fix wrong pointer check in cfv_probe()
In reply to Greg Kroah-Hartman5.10-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
@@ -746,7 +746,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 411/462 hwmon: (pmbus) Initialise page count in pmbus_identify()
In reply to Greg Kroah-Hartman5.10-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 412/462 hwmon: (ntc_thermistor) Fix the ncpXXxh103 sensor table
In reply to Greg Kroah-Hartman5.10-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
@@ -177,40 +177,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 413/462 hwmon: (ad7314) Validate leading zero bits and return error
In reply to Greg Kroah-Hartman5.10-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 414/462 ALSA: usx2y: validate nrpacks module parameter on probe
In reply to Greg Kroah-Hartman5.10-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); +#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 .... */
@@ -406,6 +412,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 415/462 llc: do not use skb_get() before dev_queue_xmit()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 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_unit_data_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 416/462 hwmon: fix a NULL vs IS_ERR_OR_NULL() check in xgene_hwmon_probe()
In reply to Greg Kroah-Hartman5.10-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 417/462 drm/sched: Fix preprocessor guard
In reply to Greg Kroah-Hartman5.10-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 418/462 be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink
In reply to Greg Kroah-Hartman5.10-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
@@ -5681,8 +5681,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 419/462 ppp: Fix KMSAN uninit-value warning with bpf
In reply to Greg Kroah-Hartman5.10-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
@@ -1629,10 +1640,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 )
@@ -2311,14 +2322,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 420/462 vlan: enforce underlying device type
In reply to Greg Kroah-Hartman5.10-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
@@ -128,7 +128,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 421/462 net-timestamp: support TCP GSO case for a few missing flags
In reply to Greg Kroah-Hartman5.10-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 ; }
@@ -115,8 +118,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 422/462 net: ipv6: fix dst ref loop in ila lwtunnel
In reply to Greg Kroah-Hartman5.10-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 423/462 net: ipv6: fix missing dst ref drop in ila lwtunnel
In reply to Greg Kroah-Hartman5.10-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 424/462 gpio: rcar: Fix missing of_node_put() call
In reply to Greg Kroah-Hartman5.10-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
@@ -421,7 +421,12 @@ static int gpio_rcar_parse_dt(struct gpio_rcar_priv *p, unsigned int *npins) p->has_both_edge_trigger = info->has_both_edge_trigger; 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 425/462 Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection"
In reply to Greg Kroah-Hartman5.10-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 426/462 usb: renesas_usbhs: Call clk_put()
In reply to Greg Kroah-Hartman5.10-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 427/462 usb: renesas_usbhs: Use devm_usb_get_phy()
In reply to Greg Kroah-Hartman5.10-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 428/462 usb: quirks: Add DELAY_INIT and NO_LPM for Prolific Mass Storage Card Reader
In reply to Greg Kroah-Hartman5.10-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 429/462 usb: renesas_usbhs: Flush the notify_hotplug_work
In reply to Greg Kroah-Hartman5.10-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 430/462 usb: atm: cxacru: fix a flaw in existing endpoint checks
In reply to Greg Kroah-Hartman5.10-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
@@ -1134,7 +1134,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 */
@@ -1182,13 +1185,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 431/462 usb: typec: ucsi: increase timeout for PPM reset operations
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 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 432/462 usb: typec: tcpci_rt1711h: Unmask alert interrupts to fix functionality
In reply to Greg Kroah-Hartman5.10-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 433/462 usb: gadget: Set self-powered based on MaxPower and bmAttributes
In reply to Greg Kroah-Hartman5.10-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
@@ -915,10 +915,11 @@ static int set_config(struct usb_composielse power =min (power,900U ); 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)
@@ -2365,7 +2366,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 ); }
@@ -2394,8 +2397,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 434/462 usb: gadget: Fix setting self-powered state on suspend
In reply to Greg Kroah-Hartman5.10-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
@@ -2366,7 +2366,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 435/462 usb: gadget: Check bmAttributes only if configuration is valid
In reply to Greg Kroah-Hartman5.10-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
@@ -916,7 +916,7 @@ static int set_config(struct usb_composi power =min (power,900U ); 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 436/462 xhci: pci: Fix indentation in the PCI device ID definitions
In reply to Greg Kroah-Hartman5.10-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
@@ -27,8 +27,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
@@ -37,8 +37,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 437/462 Squashfs: check the inode number is not the invalid value of zero
In reply to Greg Kroah-Hartman5.10-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 438/462 mei: me: add panther lake P DID
In reply to Greg Kroah-Hartman5.10-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 439/462 intel_th: pci: Add Arrow Lake support
In reply to Greg Kroah-Hartman5.10-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 440/462 intel_th: pci: Add Panther Lake-H support
In reply to Greg Kroah-Hartman5.10-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 441/462 intel_th: pci: Add Panther Lake-P/U support
In reply to Greg Kroah-Hartman5.10-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 442/462 slimbus: messaging: Free transaction ID in delayed interrupt scenario
In reply to Greg Kroah-Hartman5.10-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 443/462 eeprom: digsy_mtc: Make GPIO lookup table match the device
In reply to Greg Kroah-Hartman5.10-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 444/462 mtd: rawnand: cadence: fix unchecked dereference
In reply to Greg Kroah-Hartman5.10-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 445/462 spi-mxs: Fix chipselect glitch
In reply to Greg Kroah-Hartman5.10-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 446/462 nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link
In reply to Greg Kroah-Hartman5.10-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
@@ -295,6 +295,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;
@@ -403,6 +404,7 @@ static int nilfs_rename(struct inode *ol 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)
@@ -426,9 +428,11 @@ static int nilfs_rename(struct inode *ol 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);
@@ -438,13 +442,10 @@ static int nilfs_rename(struct inode *olreturn 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 447/462 nilfs2: eliminate staggered calls to kunmap in nilfs_rename
In reply to Greg Kroah-Hartman5.10-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
@@ -428,13 +428,14 @@ static int nilfs_rename(struct inode *ol 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 448/462 nilfs2: handle errors that nilfs_prepare_chunk() may return
In reply to Greg Kroah-Hartman5.10-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
@@ -403,8 +403,10 @@ static int nilfs_rename(struct inode *ol 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)
@@ -427,28 +429,27 @@ static int nilfs_rename(struct inode *ol*/ 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 449/462 media: uvcvideo: Only save async fh if success
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit d9fecd096f67a4469536e040a8a10bbfb665918b upstream.
Now we keep a reference to the active fh for any call to uvc_ctrl_set, regardless if it is an actual set or if it is a just a try or if the device refused the operation.
We should only keep the file handle if the device actually accepted applying the operation.
---
--- drivers/media/usb/uvc/uvc_ctrl.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +10 -6
@@ -1526,7 +1526,9 @@ int uvc_ctrl_begin(struct uvc_video_chai }static int uvc_ctrl_commit_entity (struct uvc_device *dev, -struct uvc_entity *entity,int rollback) +struct uvc_fh *handle, +struct uvc_entity *entity, +int rollback) {struct uvc_control *ctrl;unsigned int i;
@@ -1570,6 +1572,10 @@ static int uvc_ctrl_commit_entity(structif (ret <0 )return ret; + +if (!rollback && handle && + ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) + ctrl->handle = handle; }return 0 ;
@@ -1585,7 +1591,8 @@ int __uvc_ctrl_commit(struct uvc_fh *han/* Find the control. */ list_for_each_entry (entity, &chain->entities, chain) { - ret =uvc_ctrl_commit_entity (chain->dev, entity, rollback); + ret =uvc_ctrl_commit_entity (chain->dev, handle, entity, + rollback);if (ret <0 ) goto done; }
@@ -1709,9 +1716,6 @@ int uvc_ctrl_set(struct uvc_fh *handle, mapping->set (mapping, value,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); -if (ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) - ctrl->handle = handle; - ctrl->dirty =1 ; ctrl->modified =1 ;return 0 ;
@@ -2040,7 +2044,7 @@ int uvc_ctrl_restore_values(struct uvc_d ctrl->dirty =1 ; } - ret =uvc_ctrl_commit_entity (dev, entity,0 ); + ret =uvc_ctrl_commit_entity (dev,NULL , entity,0 );if (ret <0 )return ret; }
Greg Kroah-Hartman
maintainerPATCH 450/462 media: uvcvideo: Remove dangling pointers
In reply to Greg Kroah-Hartman5.10-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
@@ -1306,6 +1306,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) {
@@ -1316,7 +1350,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);
@@ -1575,7 +1610,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 ;
@@ -2369,6 +2404,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
@@ -593,6 +593,8 @@ static int uvc_v4l2_release(struct fileuvc_trace (UVC_TRACE_CALLS ,"uvc_v4l2_release\n" ); +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
@@ -453,7 +453,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 */
@@ -699,6 +703,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 {
@@ -871,6 +876,8 @@ int uvc_ctrl_set(struct uvc_fh *handle,int 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);