5.10.110-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 131/599 hwrng: cavium - HW_RANDOM_CAVIUM should depend on ARCH_THUNDER
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit ab7d88549e2f7ae116afd303f32e1950cb790a1d ]
The Cavium ThunderX Random Number Generator is only present on Cavium ThunderX SoCs, and not available as an independent PCIe endpoint. Hence add a dependency on ARCH_THUNDER, to prevent asking the user about this driver when configuring a kernel without Cavium Thunder SoC support.
--- drivers/char/hw_random/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/Kconfig +1 -1
@@ -427,7 +427,7 @@ config HW_RANDOM_MESON config HW_RANDOM_CAVIUM tristate "Cavium ThunderX Random Number Generator support" - depends on HW_RANDOM && PCI && ARM64 + depends on HW_RANDOM && PCI && ARCH_THUNDER default HW_RANDOM help This driver provides kernel-side support for the Random Number
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 132/599 crypto: sun8i-ss - really disable hash on A80
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 881fc7fba6c3e7d77d608b9a50b01a89d5e0c61b ]
When adding hashes support to sun8i-ss, I have added them only on A83T. But I forgot that 0 is a valid algorithm ID, so hashes are enabled on A80 but with an incorrect ID.
Anyway, even with correct IDs, hashes do not work on A80 and I cannot find why.
So let's disable all of them on A80.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +2 -0
@@ -30,6 +30,8 @@static const struct ss_variant ss_a80_variant = { .alg_cipher = {SS_ALG_AES ,SS_ALG_DES ,SS_ALG_3DES , }, + .alg_hash = {SS_ID_NOTSUPP ,SS_ID_NOTSUPP ,SS_ID_NOTSUPP ,SS_ID_NOTSUPP , + }, .op_mode = {SS_OP_ECB ,SS_OP_CBC , }, .ss_clks = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 133/599 crypto: authenc - Fix sleep in atomic context in decrypt_tail
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 66eae850333d639fc278d6f915c6fc01499ea893 ]
The function crypto_authenc_decrypt_tail discards its flags argument and always relies on the flags from the original request when starting its sub-request.
This is clearly wrong as it may cause the SLEEPABLE flag to be set when it shouldn't.
--- crypto/authenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/authenc.c +1 -1
@@ -253,7 +253,7 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req, dst =scatterwalk_ffwd (areq_ctx->dst, req->dst, req->assoclen);skcipher_request_set_tfm (skreq, ctx->enc); -skcipher_request_set_callback (skreq,aead_request_flags (req), +skcipher_request_set_callback (skreq, flags, req->base.complete, req->base.data);skcipher_request_set_crypt (skreq, src, dst, req->cryptlen - authsize, req->iv);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 134/599 crypto: mxs-dcp - Fix scatterlist processing
In reply to Greg Kroah-HartmanFrom: Tomas Paukrt <[email protected]>
[ Upstream commit 28e9b6d8199a3f124682b143800c2dacdc3d70dd ]
This patch fixes a bug in scatterlist processing that may cause incorrect AES block encryption/decryption.
--- drivers/crypto/mxs-dcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/mxs-dcp.c +1 -1
@@ -330,7 +330,7 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)memset (key +AES_KEYSIZE_128 ,0 ,AES_KEYSIZE_128 ); } -for_each_sg (req->src, src,sg_nents (src), i) { +for_each_sg (req->src, src,sg_nents (req->src), i) { src_buf =sg_virt (src); len =sg_dma_len (src); tlen += len;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 135/599 thermal: int340x: Check for NULL after calling kmemdup()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 38b16d6cfe54c820848bcfc999bc5e8a7da1cefb ]
As the potential failure of the allocation, kmemdup() may return NULL.
Then, 'bin_attr_data_vault.private' will be NULL, but 'bin_attr_data_vault.size' is not 0, which is not consistent.
Therefore, it is better to check the return value of kmemdup() to avoid the confusion.
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +5 -0
@@ -466,6 +466,11 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv) priv->data_vault =kmemdup (obj->package.elements[0 ].buffer.pointer, obj->package.elements[0 ].buffer.length,GFP_KERNEL ); +if (!priv->data_vault) { +kfree (buffer.pointer); +return ; + } + bin_attr_data_vault.private = priv->data_vault; bin_attr_data_vault.size = obj->package.elements[0 ].buffer.length;kfree (buffer.pointer);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 136/599 spi: tegra114: Add missing IRQ check in tegra_spi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 4f92724d4b92c024e721063f520d66e11ca4b54b ]
This func misses checking for platform_get_irq()'s call and may passes the negative error codes to request_threaded_irq(), which takes unsigned IRQ #, causing it to fail with -EINVAL, overriding an original error code. Stop calling request_threaded_irq() with invalid IRQ #s.
--- drivers/spi/spi-tegra114.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/spi/spi-tegra114.c +4 -0
@@ -1353,6 +1353,10 @@ static int tegra_spi_probe(struct platform_device *pdev) tspi->phys = r->start; spi_irq =platform_get_irq (pdev,0 ); +if (spi_irq <0 ) { + ret = spi_irq; + goto exit_free_master; + } tspi->irq = spi_irq; tspi->clk =devm_clk_get (&pdev->dev,"spi" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/599 arm64/mm: avoid fixmap race condition when create pud mapping
In reply to Greg Kroah-HartmanFrom: Jianyong Wu <[email protected]>
[ Upstream commit ee017ee353506fcec58e481673e4331ff198a80e ]
The 'fixmap' is a global resource and is used recursively by create pud mapping(), leading to a potential race condition in the presence of a concurrent call to alloc_init_pud():
kernel_init thread virtio-mem workqueue thread
================== ===========================
alloc_init_pud(...) alloc_init_pud(...)
pudp = pud_set_fixmap_offset(...) pudp = pud_set_fixmap_offset(...)
READ_ONCE(*pudp)
pud_clear_fixmap(...)
READ_ONCE(*pudp) // CRASH!
As kernel may sleep during creating pud mapping, introduce a mutex lock to serialise use of the fixmap entries by alloc_init_pud(). However, there is no need for locking in early boot stage and it doesn't work well with KASLR enabled when early boot. So, enable lock when system_state doesn't equal to "SYSTEM_BOOTING".
--- arch/arm64/mm/mmu.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/mm/mmu.c +9 -0
@@ -61,6 +61,7 @@ static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss __maybe_unused; static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss __maybe_unused;static DEFINE_SPINLOCK (swapper_pgdir_lock); +static DEFINE_MUTEX (fixmap_lock);void set_swapper_pgd (pgd_t *pgdp,pgd_t pgd) {
@@ -314,6 +315,12 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, }BUG_ON (p4d_bad (p4d)); +/* +* No need for locking during early boot. And it doesn't work as +* expected with KASLR enabled. +*/ +if (system_state !=SYSTEM_BOOTING ) +mutex_lock (&fixmap_lock); pudp =pud_set_fixmap_offset (p4dp, addr); do { pud_t old_pud = READ_ONCE(*pudp);
@@ -344,6 +351,8 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, }while (pudp++, addr = next, addr != end);pud_clear_fixmap (); +if (system_state !=SYSTEM_BOOTING ) +mutex_unlock (&fixmap_lock); } static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 138/599 selftests/x86: Add validity check and allow field splitting
In reply to Greg Kroah-HartmanFrom: Muhammad Usama Anjum <[email protected]>
[ Upstream commit b06e15ebd5bfb670f93c7f11a29b8299c1178bc6 ]
Add check to test if CC has a string. CC can have multiple sub-strings like "ccache gcc". Erorr pops up if it is treated as single string and double quotes are used around it. This can be fixed by removing the quotes and not treating CC as a single string.
--- tools/testing/selftests/x86/check_cc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/x86/check_cc.sh +1 -1
@@ -7,7 +7,7 @@ CC="$1" TESTPROG="$2" shift 2 -if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then +if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then echo 1 else echo 0
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 139/599 crypto: rockchip - ECB does not need IV
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 973d74e93820d99d8ea203882631c76edab699c9 ]
When loading rockchip crypto module, testmgr complains that ivsize of ecb-des3-ede-rk is not the same than generic implementation.
In fact ECB does not use an IV.
--- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 1 - 1 file changed, 1 deletion(-)
drivers/crypto/rockchip/rk3288_crypto_skcipher.c +0 -1
@@ -506,7 +506,6 @@ struct rk_crypto_tmp rk_ecb_des3_ede_alg = { .exit = rk_ablk_exit_tfm, .min_keysize = DES3_EDE_KEY_SIZE, .max_keysize = DES3_EDE_KEY_SIZE, - .ivsize = DES_BLOCK_SIZE, .setkey = rk_tdes_setkey, .encrypt = rk_des3_ede_ecb_encrypt, .decrypt = rk_des3_ede_ecb_decrypt,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 140/599 audit: log AUDIT_TIME_* records only from rules
In reply to Greg Kroah-HartmanFrom: Richard Guy Briggs <[email protected]>
[ Upstream commit 272ceeaea355214b301530e262a0df8600bfca95 ]
AUDIT_TIME_* events are generated when there are syscall rules present that are not related to time keeping. This will produce noisy log entries that could flood the logs and hide events we really care about.
Rather than immediately produce the AUDIT_TIME_* records, store the data in the context and log it at syscall exit time respecting the filter rules.
Note: This eats the audit_buffer, unlike any others in show_special().
Please see https://bugzilla.redhat.com/show_bug.cgi?id=1991919
--- kernel/audit.h | 4 +++ kernel/auditsc.c | 87 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 71 insertions(+), 20 deletions(-)
kernel/audit.h +4 -0
@@ -191,6 +191,10 @@ struct audit_context {struct {char *name; } module; +struct { +struct audit_ntp_data ntp_data; +struct timespec64 tk_injoffset; + } time; };int fds[2 ];struct audit_proctitle proctitle;
kernel/auditsc.c +67 -20
110 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 141/599 EVM: fix the evm= __setup handler return value
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f2544f5e6c691679d56bb38637d2f347075b36fa ]
__setup() handlers should return 1 if the parameter is handled. Returning 0 causes the entire string to be added to init's environment strings (limited to 32 strings), unnecessarily polluting it.
Using the documented string "evm=fix" causes an Unknown parameter message:
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5 evm=fix", will be passed to user space.
and that string is added to init's environment string space:
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
evm=fixWith this change, using "evm=fix" acts as expected and an invalid option ("evm=evm") causes a warning to be printed:
evm: invalid "evm" mode
but init's environment is not polluted with this string, as expected.
--- security/integrity/evm/evm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/evm/evm_main.c +1 -1
@@ -62,7 +62,7 @@ static int __init evm_set_fixmode(char *str)else pr_err ("invalid \"%s\" mode" , str); -return 0 ; +return 1 ; }__setup ("evm=" , evm_set_fixmode);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 142/599 crypto: ccree - dont attempt 0 len DMA mappings
In reply to Greg Kroah-HartmanFrom: Gilad Ben-Yossef <[email protected]>
[ Upstream commit 1fb37b5692c915edcc2448a6b37255738c7c77e0 ]
Refuse to try mapping zero bytes as this may cause a fault on some configurations / platforms and it seems the prev. attempt is not enough and we need to be more explicit.
scatterlists")
--- drivers/crypto/ccree/cc_buffer_mgr.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/crypto/ccree/cc_buffer_mgr.c +7 -0
@@ -258,6 +258,13 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg, {int ret =0 ; +if (!nbytes) { + *mapped_nents =0 ; + *lbytes =0 ; + *nents =0 ; +return 0 ; + } + *nents =cc_get_sgl_nents (dev, sg, nbytes, lbytes);if (*nents > max_sg_nents) { *nents =0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 143/599 spi: pxa2xx-pci: Balance reference count for PCI DMA device
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 609d7ffdc42199a0ec949db057e3b4be6745d6c5 ]
The pci_get_slot() increases its reference count, the caller must decrement the reference count by calling pci_dev_put().
--- drivers/spi/spi-pxa2xx-pci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx-pci.c +16 -1
@@ -74,14 +74,23 @@ static bool lpss_dma_filter(struct dma_chan *chan, void *param)return true; } +static void lpss_dma_put_device (void *dma_dev) +{ +pci_dev_put (dma_dev); +} +static int lpss_spi_setup (struct pci_dev *dev,struct pxa_spi_info *c) {struct pci_dev *dma_dev; +int ret; c->num_chipselect =1 ; c->max_clk_rate =50000000 ; dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (PCI_SLOT (dev->devfn),0 )); + ret =devm_add_action_or_reset (&dev->dev, lpss_dma_put_device, dma_dev); +if (ret) +return ret;if (c->tx_param) {struct dw_dma_slave *slave = c->tx_param;
@@ -105,8 +114,9 @@ static int lpss_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)static int mrfld_spi_setup (struct pci_dev *dev,struct pxa_spi_info *c) { -struct pci_dev *dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (21 ,0 ));struct dw_dma_slave *tx, *rx; +struct pci_dev *dma_dev; +int ret;switch (PCI_FUNC (dev->devfn)) {case 0 :
@@ -131,6 +141,11 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)return -ENODEV ; } + dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (21 ,0 )); + ret =devm_add_action_or_reset (&dev->dev, lpss_dma_put_device, dma_dev); +if (ret) +return ret; + tx = c->tx_param; tx->dma_dev = &dma_dev->dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 144/599 hwmon: (pmbus) Add mutex to regulator ops
In reply to Greg Kroah-HartmanFrom: Patrick Rudolph <[email protected]>
[ Upstream commit 686d303ee6301261b422ea51e64833d7909a2c36 ]
On PMBUS devices with multiple pages, the regulator ops need to be protected with the update mutex. This prevents accidentally changing the page in a separate thread while operating on the PMBUS_OPERATION register.
Tested on Infineon xdpe11280 while a separate thread polls for sensor data.
--- drivers/hwmon/pmbus/pmbus_core.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +13 -3
@@ -2255,10 +2255,14 @@ static int pmbus_regulator_is_enabled(struct regulator_dev *rdev) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev);int ret; +mutex_lock (&data->update_lock); ret =pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); +if (ret <0 )return ret;
@@ -2269,11 +2273,17 @@ static int _pmbus_regulator_on_off(struct regulator_dev *rdev, bool enable) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev); +int ret; -return pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; }static int pmbus_regulator_enable (struct regulator_dev *rdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 145/599 hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
In reply to Greg Kroah-HartmanFrom: Armin Wolf <[email protected]>
[ Upstream commit 647d6f09bea7dacf4cdb6d4ea7e3051883955297 ]
If the watchdog was already enabled by the BIOS after booting, the watchdog infrastructure needs to regularly send keepalives to prevent a unexpected reset.WDOG_ACTIVE only serves as an status indicator for userspace, we want to use WDOG_HW_RUNNING instead.
Since my Fujitsu Esprimo P720 does not support the watchdog, this change is compile-tested only.
--- drivers/hwmon/sch56xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/sch56xx-common.c +1 -1
@@ -424,7 +424,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,if (nowayout)set_bit (WDOG_NO_WAY_OUT , &data->wddev.status);if (output_enable &SCH56XX_WDOG_OUTPUT_ENABLE ) -set_bit (WDOG_ACTIVE , &data->wddev.status); +set_bit (WDOG_HW_RUNNING , &data->wddev.status);/* Since the watchdog uses a downcounter there is no register to read the BIOS set timeout from (if any was set at all) ->
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 146/599 nvme: cleanup __nvme_check_ids
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit fd8099e7918cd2df39ef306dd1d1af7178a15b81 ]
Pass the actual nvme_ns_ids used for the comparison instead of the ns_head that isn't needed and use a more descriptive function name.
--- drivers/nvme/host/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/nvme/host/core.c +4 -5
@@ -3681,16 +3681,15 @@ static struct nvme_ns_head *nvme_find_ns_head(struct nvme_subsystem *subsys,return NULL ; } -static int __nvme_check_ids (struct nvme_subsystem *subsys, -struct nvme_ns_head *new) +static int nvme_subsys_check_duplicate_ids (struct nvme_subsystem *subsys, +struct nvme_ns_ids *ids) {struct nvme_ns_head *h;lockdep_assert_held (&subsys->lock);list_for_each_entry (h, &subsys->nsheads, entry) { -if (nvme_ns_ids_valid (&new->ids) && -nvme_ns_ids_equal (&new->ids, &h->ids)) +if (nvme_ns_ids_valid (ids) &&nvme_ns_ids_equal (ids, &h->ids))return -EINVAL ; }
@@ -3724,7 +3723,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl, head->ids = *ids;kref_init (&head->ref); - ret =__nvme_check_ids (ctrl->subsys, head); + ret =nvme_subsys_check_duplicate_ids (ctrl->subsys, &head->ids);if (ret) {dev_err (ctrl->device,"duplicate IDs for nsid %d\n" , nsid);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 147/599 block: dont delete queue kobject before its children
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0f69288253e9fc7c495047720e523b9f1aba5712 ]
kobjects aren't supposed to be deleted before their child kobjects are deleted. Apparently this is usually benign; however, a WARN will be triggered if one of the child kobjects has a named attribute group:
sysfs group 'modes' not found for kobject 'crypto'
WARNING: CPU: 0 PID: 1 at fs/sysfs/group.c:278 sysfs_remove_group+0x72/0x80
...
Call Trace:
sysfs_remove_groups+0x29/0x40 fs/sysfs/group.c:312
__kobject_del+0x20/0x80 lib/kobject.c:611
kobject_cleanup+0xa4/0x140 lib/kobject.c:696
kobject_release lib/kobject.c:736 [inline]
kref_put include/linux/kref.h:65 [inline]
kobject_put+0x53/0x70 lib/kobject.c:753
blk_crypto_sysfs_unregister+0x10/0x20 block/blk-crypto-sysfs.c:159
blk_unregister_queue+0xb0/0x110 block/blk-sysfs.c:962
del_gendisk+0x117/0x250 block/genhd.c:610Fix this by moving the kobject_del() and the corresponding kobject_uevent() to the correct place.
--- block/blk-sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-sysfs.c +5 -3
@@ -958,15 +958,17 @@ void blk_unregister_queue(struct gendisk *disk)*/ if (queue_is_mq (q))blk_mq_unregister_dev (disk_to_dev (disk), q); - -kobject_uevent (&q->kobj,KOBJ_REMOVE ); -kobject_del (&q->kobj);blk_trace_remove_sysfs (disk_to_dev (disk));mutex_lock (&q->sysfs_lock);if (q->elevator)elv_unregister_queue (q);mutex_unlock (&q->sysfs_lock); + +/* Now that we've deleted all child objects, we can delete the queue. */ +kobject_uevent (&q->kobj,KOBJ_REMOVE ); +kobject_del (&q->kobj); +mutex_unlock (&q->sysfs_dir_lock);kobject_put (&disk_to_dev (disk)->kobj);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 148/599 PM: hibernate: fix __setup handler error handling
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ba7ffcd4c4da374b0f64666354eeeda7d3827131 ]
If an invalid value is used in "resumedelay=<seconds>", it is silently ignored. Add a warning message and then let the __setup handler return 1 to indicate that the kernel command line option has been handled.
--- kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
@@ -1323,7 +1323,7 @@ static int __init resumedelay_setup(char *str)int rc =kstrtouint (str,0 , &resume_delay);if (rc) -return rc; +pr_warn ("resumedelay: bad option string '%s'\n" , str);return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 149/599 PM: suspend: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7a64ca17e4dd50d5f910769167f3553902777844 ]
If an invalid option is given for "test_suspend=<option>", the entire string is added to init's environment, so return 1 instead of 0 from the __setup handler.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid"
and
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid--- kernel/power/suspend_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/power/suspend_test.c +4 -4
@@ -157,22 +157,22 @@ static int __init setup_test_suspend(char *value) value++; suspend_type =strsep (&value,"," );if (!suspend_type) -return 0 ; +return 1 ; repeat =strsep (&value,"," );if (repeat) {if (kstrtou32 (repeat,0 , &test_repeat_count_max)) -return 0 ; +return 1 ; }for (i =PM_SUSPEND_MIN ; i <PM_SUSPEND_MAX ; i++)if (!strcmp (pm_labels[i], suspend_type)) { test_state_label = pm_labels[i]; -return 0 ; +return 1 ; }printk (warn_bad_state, suspend_type); -return 0 ; +return 1 ; }__setup ("test_suspend" , setup_test_suspend);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 150/599 spi: spi-zynqmp-gqspi: Handle error for dma_set_mask
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 13262fc26c1837c51a5131dbbdd67a2387f8bfc7 ]
As the potential failure of the dma_set_mask(),
it should be better to check it and return error
if fails.
--- drivers/spi/spi-zynqmp-gqspi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-zynqmp-gqspi.c +4 -1
@@ -1165,7 +1165,10 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) goto clk_dis_all; } -dma_set_mask (&pdev->dev,DMA_BIT_MASK (44 )); + ret =dma_set_mask (&pdev->dev,DMA_BIT_MASK (44 )); +if (ret) + goto clk_dis_all; + ctlr->bits_per_word_mask =SPI_BPW_MASK (8 ); ctlr->num_chipselect =GQSPI_DEFAULT_NUM_CS ; ctlr->mem_ops = &zynqmp_qspi_mem_ops;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 151/599 hwrng: atmel - disable trng on failure path
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit a223ea9f89ab960eb254ba78429efd42eaf845eb ]
Call atmel_trng_disable() on failure path of probe.
--- drivers/char/hw_random/atmel-rng.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/hw_random/atmel-rng.c +1 -0
@@ -114,6 +114,7 @@ static int atmel_trng_probe(struct platform_device *pdev) err_register:clk_disable_unprepare (trng->clk); +atmel_trng_disable (trng);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 152/599 crypto: sun8i-ss - call finalize with bh disabled
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit b169b3766242b6f3336e24a6c8ee1522978b57a7 ]
Doing ipsec produces a spinlock recursion warning.
This is due to not disabling BH during crypto completion function.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 3 +++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +3 -0
@@ -11,6 +11,7 @@* You could find a link for the datasheet in Documentation/arm/sunxi.rst */ +#include <linux/bottom_half.h> #include <linux/crypto.h> #include <linux/dma-mapping.h> #include <linux/io.h>
@@ -271,7 +272,9 @@ static int sun8i_ss_handle_cipher_request(struct crypto_engine *engine, void *ar struct skcipher_request *breq = container_of(areq, struct skcipher_request, base); err =sun8i_ss_cipher (breq); +local_bh_disable ();crypto_finalize_skcipher_request (engine, breq, err); +local_bh_enable ();return 0 ; }
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c +3 -0
@@ -9,6 +9,7 @@* * You could find the datasheet in Documentation/arm/sunxi.rst */ +#include <linux/bottom_half.h> #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <linux/scatterlist.h>
@@ -440,6 +441,8 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) theend:kfree (pad);kfree (result); +local_bh_disable ();crypto_finalize_hash_request (engine, breq, err); +local_bh_enable ();return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 153/599 crypto: sun8i-ce - call finalize with bh disabled
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit f75a749b6d78aeae2ce90e14fcc4b7b3ba46126d ]
Doing ipsec produces a spinlock recursion warning.
This is due to not disabling BH during crypto completion function.
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 3 +++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +3 -0
@@ -11,6 +11,7 @@* You could find a link for the datasheet in Documentation/arm/sunxi.rst */ +#include <linux/bottom_half.h> #include <linux/crypto.h> #include <linux/dma-mapping.h> #include <linux/io.h>
@@ -280,7 +281,9 @@ static int sun8i_ce_cipher_run(struct crypto_engine *engine, void *areq) flow = rctx->flow; err =sun8i_ce_run_task (ce, flow,crypto_tfm_alg_name (breq->base.tfm)); +local_bh_disable ();crypto_finalize_skcipher_request (engine, breq, err); +local_bh_enable ();return 0 ; }
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +3 -0
@@ -9,6 +9,7 @@* * You could find the datasheet in Documentation/arm/sunxi.rst */ +#include <linux/bottom_half.h> #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <linux/scatterlist.h>
@@ -412,6 +413,8 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) theend:kfree (buf);kfree (result); +local_bh_disable ();crypto_finalize_hash_request (engine, breq, err); +local_bh_enable ();return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 154/599 crypto: amlogic - call finalize with bh disabled
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit dba633342994ce47d347bcf5522ba28301247b79 ]
Doing ipsec produces a spinlock recursion warning.
This is due to not disabling BH during crypto completion function.
--- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/amlogic/amlogic-gxl-cipher.c +2 -0
@@ -265,7 +265,9 @@ static int meson_handle_cipher_request(struct crypto_engine *engine, struct skcipher_request *breq = container_of(areq, struct skcipher_request, base); err =meson_cipher (breq); +local_bh_disable ();crypto_finalize_skcipher_request (engine, breq, err); +local_bh_enable ();return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 155/599 crypto: vmx - add missing dependencies
In reply to Greg Kroah-HartmanFrom: Petr Vorel <[email protected]>
[ Upstream commit 647d41d3952d726d4ae49e853a9eff68ebad3b3f ]
vmx-crypto module depends on CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS, thus add them.
These dependencies are likely to be enabled, but if CRYPTO_DEV_VMX=y && !CRYPTO_MANAGER_DISABLE_TESTS
and either of CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS is built as module or disabled, alg_test() from crypto/testmgr.c complains during boot about failing to allocate the generic fallback implementations (2 == ENOENT):
[ 0.540953] Failed to allocate xts(aes) fallback: -2 [ 0.541014] alg: skcipher: failed to allocate transform for p8_aes_xts: -2 [ 0.541120] alg: self-tests for p8_aes_xts (xts(aes)) failed (rc=-2) [ 0.544440] Failed to allocate ctr(aes) fallback: -2 [ 0.544497] alg: skcipher: failed to allocate transform for p8_aes_ctr: -2 [ 0.544603] alg: self-tests for p8_aes_ctr (ctr(aes)) failed (rc=-2) [ 0.547992] Failed to allocate cbc(aes) fallback: -2 [ 0.548052] alg: skcipher: failed to allocate transform for p8_aes_cbc: -2 [ 0.548156] alg: self-tests for p8_aes_cbc (cbc(aes)) failed (rc=-2) [ 0.550745] Failed to allocate transformation for 'aes': -2 [ 0.550801] alg: cipher: Failed to load transform for p8_aes: -2 [ 0.550892] alg: self-tests for p8_aes (aes) failed (rc=-2)
--- drivers/crypto/vmx/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/vmx/Kconfig +4 -0
@@ -2,7 +2,11 @@ config CRYPTO_DEV_VMX_ENCRYPT tristate "Encryption acceleration support on P8 CPU" depends on CRYPTO_DEV_VMX + select CRYPTO_AES + select CRYPTO_CBC + select CRYPTO_CTR select CRYPTO_GHASH + select CRYPTO_XTS default m help Support for VMX cryptographic acceleration instructions on Power8 CPU.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 156/599 clocksource/drivers/timer-ti-dm: Fix regression from errata i940 fix
In reply to Greg Kroah-HartmanFrom: Drew Fustini <[email protected]>
[ Upstream commit bceaae3bac0ce27c549bb050336d8d08abc2ee54 ]
The existing fix for errata i940 causes a conflict for IPU2 which is using timer 3 and 4. From arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi:
&ipu2 {
mboxes = <&mailbox6 &mbox_ipu2_ipc3x>;
ti,timers = <&timer3>;
ti,watchdog-timers = <&timer4>, <&timer9>;
};The conflict was noticed when booting mainline on the BeagleBoard X15 which has a TI AM5728 SoC:
remoteproc remoteproc1: 55020000.ipu is available remoteproc remoteproc1: powering up 55020000.ipu remoteproc remoteproc1: Booting fw image dra7-ipu2-fw.xem4 omap-rproc 55020000.ipu: could not get timer platform device omap-rproc 55020000.ipu: omap_rproc_enable_timers failed: -19 remoteproc remoteproc1: can't start rproc 55020000.ipu: -19
This change modifies the errata fix to instead use timer 15 and 16 which resolves the timer conflict.
It does not appear to introduce any latency regression. Results from cyclictest with original errata fix using dmtimer 3 and 4:
# cyclictest --mlockall --smp --priority=80 --interval=200 --distance=0 policy: fifo: loadavg: 0.02 0.03 0.05
T: 0 ( 1449) P:80 I:200 C: 800368 Min: 0 Act: 32 Avg: 22 Max: 128 T: 1 ( 1450) P:80 I:200 C: 800301 Min: 0 Act: 12 Avg: 23 Max: 70
The results after the change to dmtimer 15 and 16:
# cyclictest --mlockall --smp --priority=80 --interval=200 --distance=0 policy: fifo: loadavg: 0.36 0.19 0.07
T: 0 ( 1711) P:80 I:200 C: 759599 Min: 0 Act: 6 Avg: 22 Max: 108 T: 1 ( 1712) P:80 I:200 C: 759539 Min: 0 Act: 19 Avg: 23 Max: 79
--- arch/arm/boot/dts/dra7-l4.dtsi | 5 ++--- arch/arm/boot/dts/dra7.dtsi | 8 ++++---- drivers/clocksource/timer-ti-dm-systimer.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +2 -3
@@ -3448,8 +3448,7 @@ ti,timer-pwm; }; }; - - target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ + timer15_target: target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x2c000 0x4>, <0x2c010 0x4>;
@@ -3477,7 +3476,7 @@ }; }; - target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ + timer16_target: target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x2e000 0x4>, <0x2e010 0x4>;
arch/arm/boot/dts/dra7.dtsi +4 -4
@@ -1093,20 +1093,20 @@ }; /* Local timers, see ARM architected timer wrap erratum i940 */ -&timer3_target { +&timer15_target { ti,no-reset-on-init; ti,no-idle; timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER3_CLKCTRL 24>; + assigned-clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>; assigned-clock-parents = <&timer_sys_clk_div>; }; }; -&timer4_target { +&timer16_target { ti,no-reset-on-init; ti,no-idle; timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER4_CLKCTRL 24>; + assigned-clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>; assigned-clock-parents = <&timer_sys_clk_div>; }; };
drivers/clocksource/timer-ti-dm-systimer.c +2 -2
@@ -694,9 +694,9 @@ static int __init dmtimer_percpu_quirk_init(struct device_node *np, u32 pa)return 0 ; } -if (pa ==0x48034000 )/* dra7 dmtimer3 */ +if (pa ==0x4882c000 )/* dra7 dmtimer15 */ return dmtimer_percpu_timer_init (np,0 ); -else if (pa ==0x48036000 )/* dra7 dmtimer4 */ +else if (pa ==0x4882e000 )/* dra7 dmtimer16 */ return dmtimer_percpu_timer_init (np,1 );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 157/599 clocksource/drivers/exynos_mct: Refactor resources allocation
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 7cd925a8823d16de5614d3f0aabea9948747accd ]
Move interrupts allocation from exynos4_timer_resources() into separate function together with the interrupt number parsing code from mct_init_dt(), so the code for managing interrupts is kept together. While touching exynos4_timer_resources() function, move of_iomap() to it. No functional changes.
--- drivers/clocksource/exynos_mct.c | 50 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 20 deletions(-)
drivers/clocksource/exynos_mct.c +30 -20
@@ -494,11 +494,14 @@ static int exynos4_mct_dying_cpu(unsigned int cpu)return 0 ; } -static int __init exynos4_timer_resources (struct device_node *np,void __iomem *base) +static int __init exynos4_timer_resources (struct device_node *np) { -int err, cpu;struct clk *mct_clk, *tick_clk; + reg_base =of_iomap (np,0 ); +if (!reg_base) +panic ("%s: unable to ioremap mct address space\n" , __func__); + tick_clk =of_clk_get_by_name (np,"fin_pll" );if (IS_ERR (tick_clk))panic ("%s: unable to determine tick clock rate\n" , __func__);
@@ -509,9 +512,27 @@ static int __init exynos4_timer_resources(struct device_node *np, void __iomem *panic ("%s: unable to retrieve mct clock instance\n" , __func__);clk_prepare_enable (mct_clk); - reg_base = base; -if (!reg_base) -panic ("%s: unable to ioremap mct address space\n" , __func__); +return 0 ; +} + +static int __init exynos4_timer_interrupts (struct device_node *np, +unsigned int int_type) +{ +int nr_irqs, i, err, cpu; + + mct_int_type = int_type; + +/* This driver uses only one global timer interrupt */ + mct_irqs[MCT_G0_IRQ ] =irq_of_parse_and_map (np,MCT_G0_IRQ ); + +/* +* Find out the number of local irqs specified. The local +* timer irqs are specified after the four global timer +* irqs are specified. +*/ + nr_irqs =of_irq_count (np); +for (i =MCT_L0_IRQ ; i < nr_irqs; i++) + mct_irqs[i] =irq_of_parse_and_map (np, i);if (mct_int_type ==MCT_INT_PPI ) {
@@ -571,24 +592,13 @@ static int __init exynos4_timer_resources(struct device_node *np, void __iomem *static int __init mct_init_dt (struct device_node *np,unsigned int int_type) { -u32 nr_irqs, i;int ret; - mct_int_type = int_type; - -/* This driver uses only one global timer interrupt */ - mct_irqs[MCT_G0_IRQ ] =irq_of_parse_and_map (np,MCT_G0_IRQ ); - -/* -* Find out the number of local irqs specified. The local -* timer irqs are specified after the four global timer -* irqs are specified. -*/ - nr_irqs =of_irq_count (np); -for (i =MCT_L0_IRQ ; i < nr_irqs; i++) - mct_irqs[i] =irq_of_parse_and_map (np, i); + ret =exynos4_timer_resources (np); +if (ret) +return ret; - ret =exynos4_timer_resources (np,of_iomap (np,0 )); + ret =exynos4_timer_interrupts (np, int_type);if (ret)return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 158/599 clocksource/drivers/exynos_mct: Handle DTS with higher number of interrupts
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ab8da93dc06d82f464c47ab30e6c75190702f369 ]
The driver statically defines maximum number of interrupts it can handle, however it does not respect that limit when configuring them. When provided with a DTS with more interrupts than assumed, the driver will overwrite static array mct_irqs leading to silent memory corruption.
Validate the interrupts coming from DTS to avoid this. This does not change the fact that such DTS might not boot at all, because it is simply incompatible, however at least some warning will be printed.
--- drivers/clocksource/exynos_mct.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/clocksource/exynos_mct.c +9 -1
@@ -531,6 +531,11 @@ static int __init exynos4_timer_interrupts(struct device_node *np,* irqs are specified. */ nr_irqs =of_irq_count (np); +if (nr_irqs >ARRAY_SIZE (mct_irqs)) { +pr_err ("exynos-mct: too many (%d) interrupts configured in DT\n" , + nr_irqs); + nr_irqs =ARRAY_SIZE (mct_irqs); + }for (i =MCT_L0_IRQ ; i < nr_irqs; i++) mct_irqs[i] =irq_of_parse_and_map (np, i);
@@ -543,11 +548,14 @@ static int __init exynos4_timer_interrupts(struct device_node *np, mct_irqs[MCT_L0_IRQ], err); }else {for_each_possible_cpu (cpu) { -int mct_irq = mct_irqs[MCT_L0_IRQ + cpu]; +int mct_irq;struct mct_clock_event_device *pcpu_mevt =per_cpu_ptr (&percpu_mct_tick, cpu); pcpu_mevt->evt.irq =-1 ; +if (MCT_L0_IRQ + cpu >=ARRAY_SIZE (mct_irqs)) +break ; + mct_irq = mct_irqs[MCT_L0_IRQ + cpu];irq_set_status_flags (mct_irq,IRQ_NOAUTOEN ); if (request_irq(mct_irq,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 159/599 clocksource/drivers/timer-microchip-pit64b: Use notrace
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit ff10ee97cb203262e88d9c8bc87369cbd4004a0c ]
Use notrace for mchp_pit64b_sched_read_clk() to avoid recursive call of prepare_ftrace_return() when issuing:
echo function_graph > /sys/kernel/debug/tracing/current_tracer
--- drivers/clocksource/timer-microchip-pit64b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/timer-microchip-pit64b.c +1 -1
@@ -121,7 +121,7 @@ static u64 mchp_pit64b_clksrc_read(struct clocksource *cs)return mchp_pit64b_cnt_read (mchp_pit64b_cs_base); } -static u64 mchp_pit64b_sched_read_clk (void ) +static u64 notrace mchp_pit64b_sched_read_clk(void) {return mchp_pit64b_cnt_read (mchp_pit64b_cs_base); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 160/599 clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
In reply to Greg Kroah-HartmanFrom: Guillaume Ranquet <[email protected]>
[ Upstream commit 4467b8bad2401794fb89a0268c8c8257180bf60f ]
of_base->base can either be iomapped using of_io_request_and_map() or of_iomap() depending whether or not an of_base->name has been set.
Thus check of_base->base against NULL as of_iomap() does not return a PTR_ERR() in case of error.
--- drivers/clocksource/timer-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +3 -3
@@ -157,9 +157,9 @@ static __init int timer_of_base_init(struct device_node *np, of_base->base = of_base->name ?of_io_request_and_map (np, of_base->index, of_base->name) :of_iomap (np, of_base->index); -if (IS_ERR (of_base->base)) { -pr_err ("Failed to iomap (%s)\n" , of_base->name); -return PTR_ERR (of_base->base); +if (IS_ERR_OR_NULL (of_base->base)) { +pr_err ("Failed to iomap (%s:%s)\n" , np->name, of_base->name); +return of_base->base ?PTR_ERR (of_base->base) : -ENOMEM ; }return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 161/599 ACPI: APEI: fix return value of __setup handlers
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f3303ff649dbf7dcdc6a6e1a922235b12b3028f4 ]
__setup() handlers should return 1 to indicate that the boot option has been handled. Returning 0 causes a boot option to be listed in the Unknown kernel command line parameters and also added to init's arg list (if no '=' sign) or environment list (if of the form 'a=b').
Unknown kernel command line parameters "erst_disable
bert_disable hest_disable BOOT_IMAGE=/boot/bzImage-517rc6", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
erst_disable
bert_disable
hest_disable
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc6--- drivers/acpi/apei/bert.c | 2 +- drivers/acpi/apei/erst.c | 2 +- drivers/acpi/apei/hest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/apei/bert.c +1 -1
@@ -77,7 +77,7 @@ static int __init setup_bert_disable(char *str) { bert_disable =1 ; -return 0 ; +return 1 ; }__setup ("bert_disable" , setup_bert_disable);
drivers/acpi/apei/erst.c +1 -1
@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(erst_clear);static int __init setup_erst_disable (char *str) { erst_disable =1 ; -return 0 ; +return 1 ; }__setup ("erst_disable" , setup_erst_disable);
drivers/acpi/apei/hest.c +1 -1
@@ -219,7 +219,7 @@ static int __init hest_ghes_dev_register(unsigned int ghes_count)static int __init setup_hest_disable (char *str) { hest_disable =HEST_DISABLED ; -return 0 ; +return 1 ; }__setup ("hest_disable" , setup_hest_disable);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 162/599 crypto: ccp - ccp_dmaengine_unregister release dma channels
In reply to Greg Kroah-HartmanFrom: Dāvis Mosāns <[email protected]>
[ Upstream commit 54cce8ecb9254f971b40a72911c6da403720a2d2 ]
ccp_dmaengine_register adds dma_chan->device_node to dma_dev->channels list but ccp_dmaengine_unregister didn't remove them.
That can cause crashes in various dmaengine methods that tries to use dma_dev->channels
--- drivers/crypto/ccp/ccp-dmaengine.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/crypto/ccp/ccp-dmaengine.c +16 -0
@@ -633,6 +633,20 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)return 0 ; } +static void ccp_dma_release (struct ccp_device *ccp) +{ +struct ccp_dma_chan *chan; +struct dma_chan *dma_chan; +unsigned int i; + +for (i =0 ; i < ccp->cmd_q_count; i++) { + chan = ccp->ccp_dma_chan + i; + dma_chan = &chan->dma_chan; +tasklet_kill (&chan->cleanup_tasklet); +list_del_rcu (&dma_chan->device_node); + } +} +int ccp_dmaengine_register (struct ccp_device *ccp) {struct ccp_dma_chan *chan;
@@ -737,6 +751,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)return 0 ; err_reg: +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache); err_cache:
@@ -753,6 +768,7 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)return ;dma_async_device_unregister (dma_dev); +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache);kmem_cache_destroy (ccp->dma_cmd_cache);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 163/599 crypto: ccree - Fix use after free in cc_cipher_exit()
In reply to Greg Kroah-HartmanFrom: Jianglei Nie <[email protected]>
[ Upstream commit 3d950c34074ed74d2713c3856ba01264523289e6 ]
kfree_sensitive(ctx_p->user.key) will free the ctx_p->user.key. But ctx_p->user.key is still used in the next line, which will lead to a use after free.
We can call kfree_sensitive() after dev_dbg() to avoid the uaf.
--- drivers/crypto/ccree/cc_cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/ccree/cc_cipher.c +1 -1
@@ -254,8 +254,8 @@ static void cc_cipher_exit(struct crypto_tfm *tfm) &ctx_p->user.key_dma_addr);/* Free key buffer in context */ -kfree_sensitive (ctx_p->user.key);dev_dbg (dev,"Free key buffer in context. key=@%p\n" , ctx_p->user.key); +kfree_sensitive (ctx_p->user.key); }struct tdes_keys {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 164/599 vfio: platform: simplify device removal
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 5b495ac8fe03b9e0d2e775f9064c3e2a340ff440 ]
vfio_platform_remove_common() cannot return non-NULL in vfio_amba_remove() as the latter is only called if vfio_amba_probe() returned success.
--- drivers/vfio/platform/vfio_amba.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/vfio/platform/vfio_amba.c +5 -9
@@ -73,16 +73,12 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id)static int vfio_amba_remove (struct amba_device *adev) { -struct vfio_platform_device *vdev; - - vdev =vfio_platform_remove_common (&adev->dev); -if (vdev) { -kfree (vdev->name); -kfree (vdev); -return 0 ; - } +struct vfio_platform_device *vdev = +vfio_platform_remove_common (&adev->dev); -return -EINVAL ; +kfree (vdev->name); +kfree (vdev); +return 0 ; }static const struct amba_id pl330_ids[] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 165/599 amba: Make the remove callback return void
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 3fd269e74f2feec973f45ee11d822faeda4fe284 ]
All amba drivers return 0 in their remove callback. Together with the driver core ignoring the return value anyhow, it doesn't make sense to return a value here.
Change the remove prototype to return void, which makes it explicit that returning an error value doesn't work as expected. This simplifies changing the core remove callback to return void, too.
--- drivers/amba/bus.c | 5 ++--- drivers/char/hw_random/nomadik-rng.c | 3 +-- drivers/dma/pl330.c | 3 +-- drivers/gpu/drm/pl111/pl111_drv.c | 4 +--- drivers/hwtracing/coresight/coresight-catu.c | 3 +-- drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +--- drivers/hwtracing/coresight/coresight-cti-core.c | 4 +--- drivers/hwtracing/coresight/coresight-etb10.c | 4 +--- drivers/hwtracing/coresight/coresight-etm3x-core.c | 4 +--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 4 +--- drivers/hwtracing/coresight/coresight-funnel.c | 4 ++-- drivers/hwtracing/coresight/coresight-replicator.c | 4 ++-- drivers/hwtracing/coresight/coresight-stm.c | 4 +--- drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +--- drivers/hwtracing/coresight/coresight-tpiu.c | 4 +--- drivers/i2c/busses/i2c-nomadik.c | 4 +--- drivers/input/serio/ambakmi.c | 3 +-- drivers/memory/pl172.c | 4 +--- drivers/memory/pl353-smc.c | 4 +--- drivers/mmc/host/mmci.c | 4 +--- drivers/rtc/rtc-pl030.c | 4 +--- drivers/rtc/rtc-pl031.c | 4 +--- drivers/spi/spi-pl022.c | 5 ++--- drivers/tty/serial/amba-pl010.c | 4 +--- drivers/tty/serial/amba-pl011.c | 3 +-- drivers/vfio/platform/vfio_amba.c | 3 +-- drivers/video/fbdev/amba-clcd.c | 4 +--- drivers/watchdog/sp805_wdt.c | 4 +--- include/linux/amba/bus.h | 2 +- sound/arm/aaci.c | 4 +--- 30 files changed, 34 insertions(+), 80 deletions(-)
drivers/amba/bus.c +2 -3
@@ -299,11 +299,10 @@ static int amba_remove(struct device *dev) {struct amba_device *pcdev =to_amba_device (dev);struct amba_driver *drv =to_amba_driver (dev->driver); -int ret =0 ;pm_runtime_get_sync (dev);if (drv->remove) - ret = drv->remove (pcdev); + drv->remove (pcdev);pm_runtime_put_noidle (dev);/* Undo the runtime PM settings in amba_probe() */
@@ -314,7 +313,7 @@ static int amba_remove(struct device *dev)amba_put_disable_pclk (pcdev);dev_pm_domain_detach (dev, true); -return ret; +return 0 ; }static void amba_shutdown (struct device *dev)
drivers/char/hw_random/nomadik-rng.c +1 -2
@@ -69,11 +69,10 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)return ret; } -static int nmk_rng_remove (struct amba_device *dev) +static void nmk_rng_remove (struct amba_device *dev) {amba_release_regions (dev);clk_disable (rng_clk); -return 0 ; }static const struct amba_id nmk_rng_ids[] = {
drivers/dma/pl330.c +1 -2
@@ -3199,7 +3199,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int pl330_remove (struct amba_device *adev) +static void pl330_remove (struct amba_device *adev) {struct pl330_dmac *pl330 =amba_get_drvdata (adev);struct dma_pl330_chan *pch, *_p;
@@ -3239,7 +3239,6 @@ static int pl330_remove(struct amba_device *adev)if (pl330->rstc)reset_control_assert (pl330->rstc); -return 0 ; }static const struct amba_id pl330_ids[] = {
drivers/gpu/drm/pl111/pl111_drv.c +1 -3
@@ -324,7 +324,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,return ret; } -static int pl111_amba_remove (struct amba_device *amba_dev) +static void pl111_amba_remove (struct amba_device *amba_dev) {struct device *dev = &amba_dev->dev;struct drm_device *drm =amba_get_drvdata (amba_dev);
@@ -335,8 +335,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev)drm_panel_bridge_remove (priv->bridge);drm_dev_put (drm);of_reserved_mem_device_release (dev); - -return 0 ; }/*
drivers/hwtracing/coresight/coresight-catu.c +1 -2
@@ -567,12 +567,11 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int catu_remove (struct amba_device *adev) +static void catu_remove (struct amba_device *adev) {struct catu_drvdata *drvdata =dev_get_drvdata (&adev->dev);coresight_unregister (drvdata->csdev); -return 0 ; }static struct amba_id catu_ids[] = {
drivers/hwtracing/coresight/coresight-cpu-debug.c +1 -3
@@ -627,7 +627,7 @@ static int debug_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int debug_remove (struct amba_device *adev) +static void debug_remove (struct amba_device *adev) {struct device *dev = &adev->dev;struct debug_drvdata *drvdata =amba_get_drvdata (adev);
@@ -642,8 +642,6 @@ static int debug_remove(struct amba_device *adev)if (!--debug_count)debug_func_exit (); - -return 0 ; }static const struct amba_cs_uci_id uci_id_debug[] = {
drivers/hwtracing/coresight/coresight-cti-core.c +1 -3
@@ -836,7 +836,7 @@ static void cti_device_release(struct device *dev)if (drvdata->csdev_release) drvdata->csdev_release (dev); } -static int cti_remove (struct amba_device *adev) +static void cti_remove (struct amba_device *adev) {struct cti_drvdata *drvdata =dev_get_drvdata (&adev->dev);
@@ -845,8 +845,6 @@ static int cti_remove(struct amba_device *adev)mutex_unlock (&ect_mutex);coresight_unregister (drvdata->csdev); - -return 0 ; }static int cti_probe (struct amba_device *adev,const struct amba_id *id)
drivers/hwtracing/coresight/coresight-etb10.c +1 -3
@@ -803,7 +803,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int etb_remove (struct amba_device *adev) +static void etb_remove (struct amba_device *adev) {struct etb_drvdata *drvdata =dev_get_drvdata (&adev->dev);
@@ -814,8 +814,6 @@ static int etb_remove(struct amba_device *adev)*/ misc_deregister (&drvdata->miscdev);coresight_unregister (drvdata->csdev); - -return 0 ; }#ifdef CONFIG_PM
drivers/hwtracing/coresight/coresight-etm3x-core.c +1 -3
@@ -909,7 +909,7 @@ static void clear_etmdrvdata(void *info) etmdrvdata[cpu] =NULL ; } -static int etm_remove (struct amba_device *adev) +static void etm_remove (struct amba_device *adev) {struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev);
@@ -932,8 +932,6 @@ static int etm_remove(struct amba_device *adev)cpus_read_unlock ();coresight_unregister (drvdata->csdev); - -return 0 ; }#ifdef CONFIG_PM
drivers/hwtracing/coresight/coresight-etm4x-core.c +1 -3
@@ -1582,7 +1582,7 @@ static void clear_etmdrvdata(void *info) etmdrvdata[cpu] =NULL ; } -static int etm4_remove (struct amba_device *adev) +static void etm4_remove (struct amba_device *adev) {struct etmv4_drvdata *drvdata =dev_get_drvdata (&adev->dev);
@@ -1605,8 +1605,6 @@ static int etm4_remove(struct amba_device *adev)cpus_read_unlock ();coresight_unregister (drvdata->csdev); - -return 0 ; }static const struct amba_id etm4_ids[] = {
drivers/hwtracing/coresight/coresight-funnel.c +2 -2
@@ -370,9 +370,9 @@ static int dynamic_funnel_probe(struct amba_device *adev,return funnel_probe (&adev->dev, &adev->res); } -static int dynamic_funnel_remove (struct amba_device *adev) +static void dynamic_funnel_remove (struct amba_device *adev) { -return funnel_remove (&adev->dev); +funnel_remove (&adev->dev); }static const struct amba_id dynamic_funnel_ids[] = {
drivers/hwtracing/coresight/coresight-replicator.c +2 -2
@@ -388,9 +388,9 @@ static int dynamic_replicator_probe(struct amba_device *adev,return replicator_probe (&adev->dev, &adev->res); } -static int dynamic_replicator_remove (struct amba_device *adev) +static void dynamic_replicator_remove (struct amba_device *adev) { -return replicator_remove (&adev->dev); +replicator_remove (&adev->dev); }static const struct amba_id dynamic_replicator_ids[] = {
drivers/hwtracing/coresight/coresight-stm.c +1 -3
@@ -951,15 +951,13 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int stm_remove (struct amba_device *adev) +static void stm_remove (struct amba_device *adev) {struct stm_drvdata *drvdata =dev_get_drvdata (&adev->dev);coresight_unregister (drvdata->csdev);stm_unregister_device (&drvdata->stm); - -return 0 ; }#ifdef CONFIG_PM
drivers/hwtracing/coresight/coresight-tmc-core.c +1 -3
@@ -559,7 +559,7 @@ static void tmc_shutdown(struct amba_device *adev)spin_unlock_irqrestore (&drvdata->spinlock, flags); } -static int tmc_remove (struct amba_device *adev) +static void tmc_remove (struct amba_device *adev) {struct tmc_drvdata *drvdata =dev_get_drvdata (&adev->dev);
@@ -570,8 +570,6 @@ static int tmc_remove(struct amba_device *adev)*/ misc_deregister (&drvdata->miscdev);coresight_unregister (drvdata->csdev); - -return 0 ; }static const struct amba_id tmc_ids[] = {
drivers/hwtracing/coresight/coresight-tpiu.c +1 -3
@@ -173,13 +173,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)return PTR_ERR (drvdata->csdev); } -static int tpiu_remove (struct amba_device *adev) +static void tpiu_remove (struct amba_device *adev) {struct tpiu_drvdata *drvdata =dev_get_drvdata (&adev->dev);coresight_unregister (drvdata->csdev); - -return 0 ; }#ifdef CONFIG_PM
drivers/i2c/busses/i2c-nomadik.c +1 -3
@@ -1055,7 +1055,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int nmk_i2c_remove (struct amba_device *adev) +static void nmk_i2c_remove (struct amba_device *adev) {struct resource *res = &adev->res;struct nmk_i2c_dev *dev =amba_get_drvdata (adev);
@@ -1068,8 +1068,6 @@ static int nmk_i2c_remove(struct amba_device *adev)i2c_clr_bit (dev->virtbase +I2C_CR ,I2C_CR_PE );clk_disable_unprepare (dev->clk);release_mem_region (res->start,resource_size (res)); - -return 0 ; }static struct i2c_vendor_data vendor_stn8815 = {
drivers/input/serio/ambakmi.c +1 -2
@@ -159,7 +159,7 @@ static int amba_kmi_probe(struct amba_device *dev,return ret; } -static int amba_kmi_remove (struct amba_device *dev) +static void amba_kmi_remove (struct amba_device *dev) {struct amba_kmi_port *kmi =amba_get_drvdata (dev);
@@ -168,7 +168,6 @@ static int amba_kmi_remove(struct amba_device *dev)iounmap (kmi->base);kfree (kmi);amba_release_regions (dev); -return 0 ; }static int __maybe_unused amba_kmi_resume (struct device *dev)
drivers/memory/pl172.c +1 -3
@@ -273,14 +273,12 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int pl172_remove (struct amba_device *adev) +static void pl172_remove (struct amba_device *adev) {struct pl172_data *pl172 =amba_get_drvdata (adev);clk_disable_unprepare (pl172->clk);amba_release_regions (adev); - -return 0 ; }static const struct amba_id pl172_ids[] = {
drivers/memory/pl353-smc.c +1 -3
@@ -427,14 +427,12 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)return err; } -static int pl353_smc_remove (struct amba_device *adev) +static void pl353_smc_remove (struct amba_device *adev) {struct pl353_smc_data *pl353_smc =amba_get_drvdata (adev);clk_disable_unprepare (pl353_smc->memclk);clk_disable_unprepare (pl353_smc->aclk); - -return 0 ; }static const struct amba_id pl353_ids[] = {
drivers/mmc/host/mmci.c +1 -3
@@ -2203,7 +2203,7 @@ static int mmci_probe(struct amba_device *dev,return ret; } -static int mmci_remove (struct amba_device *dev) +static void mmci_remove (struct amba_device *dev) {struct mmc_host *mmc =amba_get_drvdata (dev);
@@ -2231,8 +2231,6 @@ static int mmci_remove(struct amba_device *dev)clk_disable_unprepare (host->clk);mmc_free_host (mmc); } - -return 0 ; }#ifdef CONFIG_PM
drivers/rtc/rtc-pl030.c +1 -3
@@ -137,7 +137,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)return ret; } -static int pl030_remove (struct amba_device *dev) +static void pl030_remove (struct amba_device *dev) {struct pl030_rtc *rtc =amba_get_drvdata (dev);
@@ -146,8 +146,6 @@ static int pl030_remove(struct amba_device *dev)free_irq (dev->irq[0 ], rtc);iounmap (rtc->base);amba_release_regions (dev); - -return 0 ; }static struct amba_id pl030_ids[] = {
drivers/rtc/rtc-pl031.c +1 -3
@@ -280,7 +280,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)return 0 ; } -static int pl031_remove (struct amba_device *adev) +static void pl031_remove (struct amba_device *adev) {struct pl031_local *ldata =dev_get_drvdata (&adev->dev);
@@ -289,8 +289,6 @@ static int pl031_remove(struct amba_device *adev)if (adev->irq[0 ])free_irq (adev->irq[0 ], ldata);amba_release_regions (adev); - -return 0 ; }static int pl031_probe (struct amba_device *adev,const struct amba_id *id)
drivers/spi/spi-pl022.c +2 -3
@@ -2315,13 +2315,13 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)return status; } -static int +static void pl022_remove (struct amba_device *adev) {struct pl022 *pl022 =amba_get_drvdata (adev);if (!pl022) -return 0 ; +return ;/* * undo pm_runtime_put() in probe. I assume that we're not
@@ -2336,7 +2336,6 @@ pl022_remove(struct amba_device *adev)clk_disable_unprepare (pl022->clk);amba_release_regions (adev);tasklet_disable (&pl022->pump_transfers); -return 0 ; }#ifdef CONFIG_PM_SLEEP
drivers/tty/serial/amba-pl010.c +1 -3
@@ -751,7 +751,7 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id)return ret; } -static int pl010_remove (struct amba_device *dev) +static void pl010_remove (struct amba_device *dev) {struct uart_amba_port *uap =amba_get_drvdata (dev);int i;
@@ -767,8 +767,6 @@ static int pl010_remove(struct amba_device *dev)if (!busy)uart_unregister_driver (&amba_reg); - -return 0 ; }#ifdef CONFIG_PM_SLEEP
drivers/tty/serial/amba-pl011.c +1 -2
@@ -2658,13 +2658,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return pl011_register_port (uap); } -static int pl011_remove (struct amba_device *dev) +static void pl011_remove (struct amba_device *dev) {struct uart_amba_port *uap =amba_get_drvdata (dev);uart_remove_one_port (&amba_reg, &uap->port);pl011_unregister_port (uap); -return 0 ; }#ifdef CONFIG_PM_SLEEP
drivers/vfio/platform/vfio_amba.c +1 -2
@@ -71,14 +71,13 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int vfio_amba_remove (struct amba_device *adev) +static void vfio_amba_remove (struct amba_device *adev) {struct vfio_platform_device *vdev =vfio_platform_remove_common (&adev->dev);kfree (vdev->name);kfree (vdev); -return 0 ; }static const struct amba_id pl330_ids[] = {
drivers/video/fbdev/amba-clcd.c +1 -3
@@ -925,7 +925,7 @@ static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)return ret; } -static int clcdfb_remove (struct amba_device *dev) +static void clcdfb_remove (struct amba_device *dev) {struct clcd_fb *fb =amba_get_drvdata (dev);
@@ -942,8 +942,6 @@ static int clcdfb_remove(struct amba_device *dev)kfree (fb);amba_release_regions (dev); - -return 0 ; }static const struct amba_id clcdfb_id_table[] = {
drivers/watchdog/sp805_wdt.c +1 -3
@@ -304,14 +304,12 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)return ret; } -static int sp805_wdt_remove (struct amba_device *adev) +static void sp805_wdt_remove (struct amba_device *adev) {struct sp805_wdt *wdt =amba_get_drvdata (adev);watchdog_unregister_device (&wdt->wdd);watchdog_set_drvdata (&wdt->wdd,NULL ); - -return 0 ; }static int __maybe_unused sp805_wdt_suspend (struct device *dev)
include/linux/amba/bus.h +1 -1
@@ -76,7 +76,7 @@ struct amba_device {struct amba_driver {struct device_driver drv;int (*probe)(struct amba_device *,const struct amba_id *); -int (*remove)(struct amba_device *); +void (*remove)(struct amba_device *);void (*shutdown)(struct amba_device *);const struct amba_id *id_table; };
sound/arm/aaci.c +1 -3
@@ -1055,7 +1055,7 @@ static int aaci_probe(struct amba_device *dev,return ret; } -static int aaci_remove (struct amba_device *dev) +static void aaci_remove (struct amba_device *dev) {struct snd_card *card =amba_get_drvdata (dev);
@@ -1066,8 +1066,6 @@ static int aaci_remove(struct amba_device *dev)snd_card_free (card);amba_release_regions (dev); } - -return 0 ; }static struct amba_id aaci_ids[] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 166/599 hwrng: nomadik - Change clk_disable to clk_disable_unprepare
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7f0f1f3ef62ed7a40e30aff28115bd94c4211d1d ]
The corresponding API for clk_prepare_enable is clk_disable_unprepare, other than clk_disable_unprepare.
Fix this by changing clk_disable to clk_disable_unprepare.
--- drivers/char/hw_random/nomadik-rng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/hw_random/nomadik-rng.c +2 -2
@@ -65,14 +65,14 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id) out_release:amba_release_regions (dev); out_clk: -clk_disable (rng_clk); +clk_disable_unprepare (rng_clk);return ret; }static void nmk_rng_remove (struct amba_device *dev) {amba_release_regions (dev); -clk_disable (rng_clk); +clk_disable_unprepare (rng_clk); }static const struct amba_id nmk_rng_ids[] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 167/599 hwmon: (pmbus) Add Vin unit off handling
In reply to Greg Kroah-HartmanFrom: Brandon Wyman <[email protected]>
[ Upstream commit a5436af598779219b375c1977555c82def1c35d0 ]
If there is an input undervoltage fault, reported in STATUS_INPUT command response, there is quite likely a "Unit Off For Insufficient Input Voltage" condition as well.
Add a constant for bit 3 of STATUS_INPUT. Update the Vin limit attributes to include both bits in the mask for clearing faults.
If an input undervoltage fault occurs, causing a unit off for insufficient input voltage, but the unit is off bit is not cleared, the STATUS_WORD will not be updated to clear the input fault condition. Including the unit is off bit (bit 3) allows for the input fault condition to completely clear.
--- drivers/hwmon/pmbus/pmbus.h | 1 + drivers/hwmon/pmbus/pmbus_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +1 -0
@@ -319,6 +319,7 @@ enum pmbus_fan_mode { percent = 0, rpm };/* * STATUS_VOUT, STATUS_INPUT */ +#define PB_VOLTAGE_VIN_OFF BIT(3)#define PB_VOLTAGE_UV_FAULT BIT(4)#define PB_VOLTAGE_UV_WARNING BIT(5)#define PB_VOLTAGE_OV_WARNING BIT(6)
drivers/hwmon/pmbus/pmbus_core.c +1 -1
@@ -1360,7 +1360,7 @@ static const struct pmbus_limit_attr vin_limit_attrs[] = { .reg = PMBUS_VIN_UV_FAULT_LIMIT, .attr = "lcrit", .alarm = "lcrit_alarm", - .sbit = PB_VOLTAGE_UV_FAULT, + .sbit = PB_VOLTAGE_UV_FAULT | PB_VOLTAGE_VIN_OFF, }, { .reg = PMBUS_VIN_OV_WARN_LIMIT, .attr = "max",
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 168/599 clocksource: acpi_pm: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 6a861abceecb68497dd82a324fee45a5332dcece ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings.
The __setup() handler interface isn't meant to handle negative return values -- they are non-zero, so they mean "handled" (like a return value of 1 does), but that's just a quirk. So return 1 from parse_pmtmr(). Also print a warning message if kstrtouint() returns an error.
--- drivers/clocksource/acpi_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/acpi_pm.c +4 -2
@@ -229,8 +229,10 @@ static int __init parse_pmtmr(char *arg)int ret; ret =kstrtouint (arg,16 , &base); -if (ret) -return ret; +if (ret) { +pr_warn ("PMTMR: invalid 'pmtmr=' value: '%s'\n" , arg); +return 1 ; + }pr_info ("PMTMR IOPort override: 0x%04x -> 0x%04x\n" , pmtmr_ioport, base);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 169/599 io_uring: terminate manual loop iterator loop correctly for non-vecs
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 5e929367468c8f97cd1ffb0417316cecfebef94b ]
The fix for not advancing the iterator if we're using fixed buffers is broken in that it can hit a condition where we don't terminate the loop. This results in io-wq looping forever, asking to read (or write) 0 bytes for every subsequent loop.
--- fs/io_uring.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/io_uring.c +4 -2
@@ -3220,13 +3220,15 @@ static ssize_t loop_rw_iter(int rw, struct io_kiocb *req, struct iov_iter *iter) ret = nr;break ; } + ret += nr;if (!iov_iter_is_bvec (iter)) {iov_iter_advance (iter, nr); }else { - req->rw.len -= nr; req->rw.addr += nr; + req->rw.len -= nr; +if (!req->rw.len) +break ; } - ret += nr;if (nr != iovec.iov_len)break ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 170/599 watch_queue: Fix NULL dereference in error cleanup
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit a635415a064e77bcfbf43da413fd9dfe0bbed9cb ]
In watch_queue_set_size(), the error cleanup code doesn't take account of the fact that __free_page() can't handle a NULL pointer when trying to free up buffer pages that did get allocated.
Fix this by only calling __free_page() on the pages actually allocated.
Without the fix, this can lead to something like the following:
BUG: KASAN: null-ptr-deref in __free_pages+0x1f/0x1b0 mm/page_alloc.c:5473 Read of size 4 at addr 0000000000000034 by task syz-executor168/3599 ... Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 __kasan_report mm/kasan/report.c:446 [inline] kasan_report.cold+0x66/0xdf mm/kasan/report.c:459 check_region_inline mm/kasan/generic.c:183 [inline] kasan_check_range+0x13d/0x180 mm/kasan/generic.c:189 instrument_atomic_read include/linux/instrumented.h:71 [inline] atomic_read include/linux/atomic/atomic-instrumented.h:27 [inline] page_ref_count include/linux/page_ref.h:67 [inline] put_page_testzero include/linux/mm.h:717 [inline] __free_pages+0x1f/0x1b0 mm/page_alloc.c:5473 watch_queue_set_size+0x499/0x630 kernel/watch_queue.c:275 pipe_ioctl+0xac/0x2b0 fs/pipe.c:632 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- kernel/watch_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/watch_queue.c +1 -1
@@ -274,7 +274,7 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)return 0 ; error_p: -for (i =0 ; i < nr_pages; i++) +while (--i >=0 )__free_page (pages[i]);kfree (pages); error:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 171/599 watch_queue: Actually free the watch
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 3d8dcf278b1ee1eff1e90be848fa2237db4c07a7 ]
free_watch() does everything barring actually freeing the watch object. Fix this by adding the missing kfree.
kmemleak produces a report something like the following. Note that as an address can be seen in the first word, the watch would appear to have gone through call_rcu().
BUG: memory leak
unreferenced object 0xffff88810ce4a200 (size 96):
comm "syz-executor352", pid 3605, jiffies 4294947473 (age 13.720s)
hex dump (first 32 bytes):
e0 82 48 0d 81 88 ff ff 00 00 00 00 00 00 00 00 ..H.............
80 a2 e4 0c 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8214e6cc>] kmalloc include/linux/slab.h:581 [inline]
[<ffffffff8214e6cc>] kzalloc include/linux/slab.h:714 [inline]
[<ffffffff8214e6cc>] keyctl_watch_key+0xec/0x2e0 security/keys/keyctl.c:1800
[<ffffffff8214ec84>] __do_sys_keyctl+0x3c4/0x490 security/keys/keyctl.c:2016
[<ffffffff84493a25>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<ffffffff84493a25>] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
[<ffffffff84600068>] entry_SYSCALL_64_after_hwframe+0x44/0xae--- kernel/watch_queue.c | 1 + 1 file changed, 1 insertion(+)
kernel/watch_queue.c +1 -0
@@ -398,6 +398,7 @@ static void free_watch(struct rcu_head *rcu)put_watch_queue (rcu_access_pointer (watch->queue));atomic_dec (&watch->cred->user->nr_watches);put_cred (watch->cred); +kfree (watch); }static void __put_watch (struct kref *kref)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 172/599 f2fs: fix to enable ATGC correctly via gc_idle sysfs interface
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 7d19e3dab0002e527052b0aaf986e8c32e5537bf ]
It needs to assign sbi->gc_mode with GC_IDLE_AT rather than GC_AT when user tries to enable ATGC via gc_idle sysfs interface, fix it.
--- fs/f2fs/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/sysfs.c +1 -1
@@ -386,7 +386,7 @@ static ssize_t __sbi_store(struct f2fs_attr *a, }else if (t ==GC_IDLE_AT ) {if (!sbi->am.atgc_enabled)return -EINVAL ; - sbi->gc_mode =GC_AT ; + sbi->gc_mode =GC_IDLE_AT ; }else { sbi->gc_mode =GC_NORMAL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 173/599 sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
In reply to Greg Kroah-HartmanFrom: Bharata B Rao <[email protected]>
[ Upstream commit 28c988c3ec29db74a1dda631b18785958d57df4f ]
The older format of /proc/pid/sched printed home node info which required the mempolicy and task lock around mpol_get(). However the format has changed since then and there is no need for sched_show_numa() any more to have mempolicy argument, asssociated mpol_get/put and task_lock/unlock. Remove them.
--- kernel/sched/debug.c | 10 ---------- 1 file changed, 10 deletions(-)
kernel/sched/debug.c +0 -10
@@ -908,25 +908,15 @@ void print_numa_stats(struct seq_file *m, int node, unsigned long tsf,static void sched_show_numa (struct task_struct *p,struct seq_file *m) {#ifdef CONFIG_NUMA_BALANCING -struct mempolicy *pol; -if (p->mm)P (mm->numa_scan_seq); -task_lock (p); - pol = p->mempolicy; -if (pol && !(pol->flags &MPOL_F_MORON )) - pol =NULL ; -mpol_get (pol); -task_unlock (p); -P (numa_pages_migrated);P (numa_preferred_nid);P (total_numa_faults);SEQ_printf (m,"current_node=%d, numa_group_id=%d\n" ,task_node (p),task_numa_group_id (p));show_numa_stats (p, m); -mpol_put (pol);#endif }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 174/599 sched/core: Export pelt_thermal_tp
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 77cf151b7bbdfa3577b3c3f3a5e267a6c60a263b ]
We can't use this tracepoint in modules without having the symbol exported first, fix that.
--- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/core.c +1 -0
@@ -36,6 +36,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_rt_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (pelt_dl_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (pelt_irq_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (pelt_se_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL (pelt_thermal_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (sched_cpu_capacity_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (sched_overutilized_tp);EXPORT_TRACEPOINT_SYMBOL_GPL (sched_util_est_cfs_tp);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 175/599 rseq: Optimise rseq_get_rseq_cs() and clear_rseq_cs()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 5e0ccd4a3b01c5a71732a13186ca110a138516ea ]
Commit ec9c82e03a74 ("rseq: uapi: Declare rseq_cs field as union, update includes") added regressions for our servers.
Using copy_from_user() and clear_user() for 64bit values is suboptimal.
We can use faster put_user() and get_user() on 64bit arches.
--- kernel/rseq.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/rseq.c +9 -0
@@ -120,8 +120,13 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)u32 sig;int ret; +#ifdef CONFIG_64BIT +if (get_user (ptr, &t->rseq->rseq_cs.ptr64)) +return -EFAULT ; +#else if (copy_from_user (&ptr, &t->rseq->rseq_cs.ptr64,sizeof (ptr)))return -EFAULT ; +#endif if (!ptr) {memset (rseq_cs,0 ,sizeof (*rseq_cs));return 0 ;
@@ -204,9 +209,13 @@ static int clear_rseq_cs(struct task_struct *t)* * Set rseq_cs to NULL. */ +#ifdef CONFIG_64BIT +return put_user (0UL , &t->rseq->rseq_cs.ptr64); +#else if (clear_user (&t->rseq->rseq_cs.ptr64,sizeof (t->rseq->rseq_cs.ptr64)))return -EFAULT ;return 0 ; +#endif }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 176/599 rseq: Remove broken uapi field layout on 32-bit little endian
In reply to Greg Kroah-HartmanFrom: Mathieu Desnoyers <[email protected]>
[ Upstream commit bfdf4e6208051ed7165b2e92035b4bf11f43eb63 ]
The rseq rseq_cs.ptr.{ptr32,padding} uapi endianness handling is entirely wrong on 32-bit little endian: a preprocessor logic mistake wrongly uses the big endian field layout on 32-bit little endian architectures.
Fortunately, those ptr32 accessors were never used within the kernel, and only meant as a convenience for user-space.
Remove those and replace the whole rseq_cs union by a __u64 type, as this is the only thing really needed to express the ABI. Document how 32-bit architectures are meant to interact with this field.
--- include/uapi/linux/rseq.h | 20 ++++---------------- kernel/rseq.c | 8 ++++---- 2 files changed, 8 insertions(+), 20 deletions(-)
include/uapi/linux/rseq.h +4 -16
@@ -105,23 +105,11 @@ struct rseq {* Read and set by the kernel. Set by user-space with single-copy * atomicity semantics. This field should only be updated by the * thread which registered this data structure. Aligned on 64-bit. +* +* 32-bit architectures should update the low order bits of the +* rseq_cs field, leaving the high order bits initialized to 0. */ -union { -__u64 ptr64; -#ifdef __LP64__ -__u64 ptr; -#else -struct { -#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN) -__u32 padding;/* Initialized to zero. */ -__u32 ptr32; -#else /* LITTLE */ -__u32 ptr32; -__u32 padding;/* Initialized to zero. */ -#endif /* ENDIAN */ - } ptr; -#endif - } rseq_cs; +__u64 rseq_cs;/* * Restartable sequences flags field.
kernel/rseq.c +4 -4
@@ -121,10 +121,10 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)int ret;#ifdef CONFIG_64BIT -if (get_user (ptr, &t->rseq->rseq_cs.ptr64)) +if (get_user (ptr, &t->rseq->rseq_cs))return -EFAULT ;#else -if (copy_from_user (&ptr, &t->rseq->rseq_cs.ptr64,sizeof (ptr))) +if (copy_from_user (&ptr, &t->rseq->rseq_cs,sizeof (ptr)))return -EFAULT ;#endif if (!ptr) {
@@ -210,9 +210,9 @@ static int clear_rseq_cs(struct task_struct *t)* Set rseq_cs to NULL. */ #ifdef CONFIG_64BIT -return put_user (0UL , &t->rseq->rseq_cs.ptr64); +return put_user (0UL , &t->rseq->rseq_cs);#else -if (clear_user (&t->rseq->rseq_cs.ptr64,sizeof (t->rseq->rseq_cs.ptr64))) +if (clear_user (&t->rseq->rseq_cs,sizeof (t->rseq->rseq_cs)))return -EFAULT ;return 0 ;#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 177/599 perf/core: Fix address filter parser for multiple filters
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit d680ff24e9e14444c63945b43a37ede7cd6958f9 ]
Reset appropriate variables in the parser loop between parsing separate filters, so that they do not interfere with parsing the next filter.
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -10265,8 +10265,11 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, }/* ready to consume more filters */ +kfree (filename); + filename =NULL ; state =IF_STATE_ACTION ; filter =NULL ; + kernel =0 ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 178/599 perf/x86/intel/pt: Fix address filter config for 32-bit kernel
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit e5524bf1047eb3b3f3f33b5f59897ba67b3ade87 ]
Change from shifting 'unsigned long' to 'u64' to prevent the config bits being lost on a 32-bit kernel.
--- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/pt.c +1 -1
@@ -472,7 +472,7 @@ static u64 pt_config_filters(struct perf_event *event) pt->filters.filter[range].msr_b = filter->msr_b; } - rtit_ctl |= filter->config << pt_address_ranges[range].reg_off; + rtit_ctl |= (u64 )filter->config << pt_address_ranges[range].reg_off; }return rtit_ctl;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 179/599 f2fs: fix missing free nid in f2fs_handle_failed_inode
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 2fef99b8372c1ae3d8445ab570e888b5a358dbe9 ]
This patch fixes xfstests/generic/475 failure.
[ 293.680694] F2FS-fs (dm-1): May loss orphan inode, run fsck to fix. [ 293.685358] Buffer I/O error on dev dm-1, logical block 8388592, async page read [ 293.691527] Buffer I/O error on dev dm-1, logical block 8388592, async page read [ 293.691764] sh (7615): drop_caches: 3 [ 293.691819] sh (7616): drop_caches: 3 [ 293.694017] Buffer I/O error on dev dm-1, logical block 1, async page read [ 293.695659] sh (7618): drop_caches: 3 [ 293.696979] sh (7617): drop_caches: 3 [ 293.700290] sh (7623): drop_caches: 3 [ 293.708621] sh (7626): drop_caches: 3 [ 293.711386] sh (7628): drop_caches: 3 [ 293.711825] sh (7627): drop_caches: 3 [ 293.716738] sh (7630): drop_caches: 3 [ 293.719613] sh (7632): drop_caches: 3 [ 293.720971] sh (7633): drop_caches: 3 [ 293.727741] sh (7634): drop_caches: 3 [ 293.730783] sh (7636): drop_caches: 3 [ 293.732681] sh (7635): drop_caches: 3 [ 293.732988] sh (7637): drop_caches: 3 [ 293.738836] sh (7639): drop_caches: 3 [ 293.740568] sh (7641): drop_caches: 3 [ 293.743053] sh (7640): drop_caches: 3 [ 293.821889] ------------[ cut here ]------------ [ 293.824654] kernel BUG at fs/f2fs/node.c:3334! [ 293.826226] invalid opcode: 0000 [#1] PREEMPT SMP PTI [ 293.828713] CPU: 0 PID: 7653 Comm: umount Tainted: G OE 5.17.0-rc1-custom #1 [ 293.830946] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 [ 293.832526] RIP: 0010:f2fs_destroy_node_manager+0x33f/0x350 [f2fs] [ 293.833905] Code: e8 d6 3d f9 f9 48 8b 45 d0 65 48 2b 04 25 28 00 00 00 75 1a 48 81 c4 28 03 00 00 5b 41 5c 41 5d 41 5e 41 5f 5d c3 0f 0b [ 293.837783] RSP: 0018:ffffb04ec31e7a20 EFLAGS: 00010202 [ 293.839062] RAX: 0000000000000001 RBX: ffff9df947db2eb8 RCX: 0000000080aa0072 [ 293.840666] RDX: 0000000000000000 RSI: ffffe86c0432a140 RDI: ffffffffc0b72a21 [ 293.842261] RBP: ffffb04ec31e7d70 R08: ffff9df94ca85780 R09: 0000000080aa0072 [ 293.843909] R10: ffff9df94ca85700 R11: ffff9df94e1ccf58 R12: ffff9df947db2e00 [ 293.845594] R13: ffff9df947db2ed0 R14: ffff9df947db2eb8 R15: ffff9df947db2eb8 [ 293.847855] FS: 00007f5a97379800(0000) GS:ffff9dfa77c00000(0000) knlGS:0000000000000000 [ 293.850647] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 293.852940] CR2: 00007f5a97528730 CR3: 000000010bc76005 CR4: 0000000000370ef0 [ 293.854680] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 293.856423] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 293.858380] Call Trace: [ 293.859302] <TASK> [ 293.860311] ? ttwu_do_wakeup+0x1c/0x170 [ 293.861800] ? ttwu_do_activate+0x6d/0xb0 [ 293.863057] ? _raw_spin_unlock_irqrestore+0x29/0x40 [ 293.864411] ? try_to_wake_up+0x9d/0x5e0 [ 293.865618] ? debug_smp_processor_id+0x17/0x20 [ 293.866934] ? debug_smp_processor_id+0x17/0x20 [ 293.868223] ? free_unref_page+0xbf/0x120 [ 293.869470] ? __free_slab+0xcb/0x1c0 [ 293.870614] ? preempt_count_add+0x7a/0xc0 [ 293.871811] ? __slab_free+0xa0/0x2d0 [ 293.872918] ? __wake_up_common_lock+0x8a/0xc0 [ 293.874186] ? __slab_free+0xa0/0x2d0 [ 293.875305] ? free_inode_nonrcu+0x20/0x20 [ 293.876466] ? free_inode_nonrcu+0x20/0x20 [ 293.877650] ? debug_smp_processor_id+0x17/0x20 [ 293.878949] ? call_rcu+0x11a/0x240 [ 293.880060] ? f2fs_destroy_stats+0x59/0x60 [f2fs] [ 293.881437] ? kfree+0x1fe/0x230 [ 293.882674] f2fs_put_super+0x160/0x390 [f2fs] [ 293.883978] generic_shutdown_super+0x7a/0x120 [ 293.885274] kill_block_super+0x27/0x50 [ 293.886496] kill_f2fs_super+0x7f/0x100 [f2fs] [ 293.887806] deactivate_locked_super+0x35/0xa0 [ 293.889271] deactivate_super+0x40/0x50 [ 293.890513] cleanup_mnt+0x139/0x190 [ 293.891689] __cleanup_mnt+0x12/0x20 [ 293.892850] task_work_run+0x64/0xa0 [ 293.894035] exit_to_user_mode_prepare+0x1b7/0x1c0 [ 293.895409] syscall_exit_to_user_mode+0x27/0x50 [ 293.896872] do_syscall_64+0x48/0xc0 [ 293.898090] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 293.899517] RIP: 0033:0x7f5a975cd25b
--- fs/f2fs/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/inode.c +1 -0
@@ -848,6 +848,7 @@ void f2fs_handle_failed_inode(struct inode *inode) err =f2fs_get_node_info (sbi, inode->i_ino, &ni);if (err) {set_sbi_flag (sbi,SBI_NEED_FSCK ); +set_inode_flag (inode,FI_FREE_NID );f2fs_warn (sbi,"May loss orphan inode, run fsck to fix." ); goto out; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 180/599 nfsd: more robust allocation failure handling in nfsd_file_cache_init
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
[ Upstream commit 4d2eeafecd6c83b4444db3dc0ada201c89b1aa44 ]
The nfsd file cache table can be pretty large and its allocation may require as many as 80 contigious pages.
Employ the same fix that was employed for similar issue that was reported for the reply cache hash table allocation several years ago by commit 8f97514b423a ("nfsd: more robust allocation failure handling in nfsd_reply_cache_init").
--- fs/nfsd/filecache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/filecache.c +3 -3
@@ -641,7 +641,7 @@ nfsd_file_cache_init(void)if (!nfsd_filecache_wq) goto out; - nfsd_file_hashtbl =kcalloc (NFSD_FILE_HASH_SIZE , + nfsd_file_hashtbl =kvcalloc (NFSD_FILE_HASH_SIZE ,sizeof (*nfsd_file_hashtbl),GFP_KERNEL );if (!nfsd_file_hashtbl) {pr_err ("nfsd: unable to allocate nfsd_file_hashtbl\n" );
@@ -708,7 +708,7 @@ nfsd_file_cache_init(void) nfsd_file_slab =NULL ;kmem_cache_destroy (nfsd_file_mark_slab); nfsd_file_mark_slab =NULL ; -kfree (nfsd_file_hashtbl); +kvfree (nfsd_file_hashtbl); nfsd_file_hashtbl =NULL ;destroy_workqueue (nfsd_filecache_wq); nfsd_filecache_wq =NULL ;
@@ -854,7 +854,7 @@ nfsd_file_cache_shutdown(void)fsnotify_wait_marks_destroyed ();kmem_cache_destroy (nfsd_file_mark_slab); nfsd_file_mark_slab =NULL ; -kfree (nfsd_file_hashtbl); +kvfree (nfsd_file_hashtbl); nfsd_file_hashtbl =NULL ;destroy_workqueue (nfsd_filecache_wq); nfsd_filecache_wq =NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 181/599 f2fs: fix to avoid potential deadlock
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 344150999b7fc88502a65bbb147a47503eca2033 ]
Quoted from Jing Xia's report, there is a potential deadlock may happen between kworker and checkpoint as below:
[T:writeback] [T:checkpoint]
- wb_writeback
- blk_start_plug
bio contains NodeA was plugged in writeback threads
- do_writepages -- sync write inodeB, inc wb_sync_req[DATA]
- f2fs_write_data_pages
- f2fs_write_single_data_page -- write last dirty page
- f2fs_do_write_data_page
- set_page_writeback -- clear page dirty flag and PAGECACHE_TAG_DIRTY tag in radix tree
- f2fs_outplace_write_data
- f2fs_update_data_blkaddr
- f2fs_wait_on_page_writeback -- wait NodeA to writeback here
- inode_dec_dirty_pages
- writeback_sb_inodes
- writeback_single_inode
- do_writepages
- f2fs_write_data_pages -- skip writepages due to wb_sync_req[DATA]
- wbc->pages_skipped += get_dirty_pages() -- PAGECACHE_TAG_DIRTY is not set but get_dirty_pages() returns one
- requeue_inode -- requeue inode to wb->b_dirty queue due to non-zero.pages_skipped
- blk_finish_plug
Let's try to avoid deadlock condition by forcing unplugging previous bio via blk_finish_plug(current->plug) once we'v skipped writeback in writepages() due to valid sbi->wb_sync_req[DATA/NODE].
--- fs/f2fs/data.c | 6 +++++- fs/f2fs/node.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +5 -1
@@ -3264,8 +3264,12 @@ static int __f2fs_write_data_pages(struct address_space *mapping,/* to avoid spliting IOs due to mixed WB_SYNC_ALL and WB_SYNC_NONE */ if (wbc->sync_mode ==WB_SYNC_ALL )atomic_inc (&sbi->wb_sync_req[DATA ]); -else if (atomic_read (&sbi->wb_sync_req[DATA ])) +else if (atomic_read (&sbi->wb_sync_req[DATA ])) { +/* to avoid potential deadlock */ +if (current->plug) +blk_finish_plug (current->plug); goto skip_write; + }if (__should_serialize_io (inode, wbc)) {mutex_lock (&sbi->writepages);
fs/f2fs/node.c +5 -1
@@ -2055,8 +2055,12 @@ static int f2fs_write_node_pages(struct address_space *mapping,if (wbc->sync_mode ==WB_SYNC_ALL )atomic_inc (&sbi->wb_sync_req[NODE ]); -else if (atomic_read (&sbi->wb_sync_req[NODE ])) +else if (atomic_read (&sbi->wb_sync_req[NODE ])) { +/* to avoid potential deadlock */ +if (current->plug) +blk_finish_plug (current->plug); goto skip_write; + }trace_f2fs_writepages (mapping->host, wbc,NODE );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 182/599 btrfs: fix unexpected error path when reflinking an inline extent
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 1f4613cdbe7739ce291554b316bff8e551383389 ]
When reflinking an inline extent, we assert that its file offset is 0 and that its uncompressed length is not greater than the sector size. We then return an error if one of those conditions is not satisfied. However we use a return statement, which results in returning from btrfs_clone() without freeing the path and buffer that were allocated before, as well as not clearing the flag BTRFS_INODE_NO_DELALLOC_FLUSH for the destination inode.
Fix that by jumping to the 'out' label instead, and also add a WARN_ON() for each condition so that in case assertions are disabled, we get to known which of the unexpected conditions triggered the error.
--- fs/btrfs/reflink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/reflink.c +5 -2
@@ -503,8 +503,11 @@ static int btrfs_clone(struct inode *src, struct inode *inode,*/ ASSERT (key.offset ==0 );ASSERT (datal <= fs_info->sectorsize); -if (key.offset !=0 || datal > fs_info->sectorsize) -return -EUCLEAN ; +if (WARN_ON (key.offset !=0 ) || +WARN_ON (datal > fs_info->sectorsize)) { + ret = -EUCLEAN ; + goto out; + } ret = clone_copy_inline_extent(inode, path, &new_key, drop_start, datal, size,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 183/599 f2fs: compress: remove unneeded read when rewrite whole cluster
In reply to Greg Kroah-HartmanFrom: Fengnan Chang <[email protected]>
[ Upstream commit 7eab7a6968278c735b1ca6387056a408f7960265 ]
when we overwrite the whole page in cluster, we don't need read original data before write, because after write_end(), writepages() can help to load left data in that cluster.
--- fs/f2fs/data.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/data.c +3 -0
@@ -3461,6 +3461,9 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, *fsdata =NULL ; +if (len ==PAGE_SIZE ) + goto repeat; + ret =f2fs_prepare_compress_overwrite (inode, pagep, index, fsdata);if (ret <0 ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 184/599 f2fs: fix compressed file start atomic write may cause data corruption
In reply to Greg Kroah-HartmanFrom: Fengnan Chang <[email protected]>
[ Upstream commit 9b56adcf525522e9ffa52471260298d91fc1d395 ]
When compressed file has blocks, f2fs_ioc_start_atomic_write will succeed, but compressed flag will be remained in inode. If write partial compreseed cluster and commit atomic write will cause data corruption.
This is the reproduction process:
Step 1:
create a compressed file ,write 64K data , call fsync(), then the blocks are write as compressed cluster.
Step2:iotcl(F2FS_IOC_START_ATOMIC_WRITE) --- this should be fail, but not. write page 0 and page 3.iotcl(F2FS_IOC_COMMIT_ATOMIC_WRITE) -- page 0 and 3 write as normal file, Step3:
drop cache.
read page 0-4 -- Since page 0 has a valid block address, read as
non-compressed cluster, page 1 and 2 will be filled with compressed data or zero.
The root cause is, after commit 7eab7a696827 ("f2fs: compress: remove unneeded read when rewrite whole cluster"), in step 2, f2fs_write_begin() only set target page dirty, and in f2fs_commit_inmem_pages(), we will write partial raw pages into compressed cluster, result in corrupting compressed cluster layout.
--- fs/f2fs/data.c | 2 +- fs/f2fs/file.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +1 -1
@@ -3461,7 +3461,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, *fsdata =NULL ; -if (len ==PAGE_SIZE ) +if (len ==PAGE_SIZE && !(f2fs_is_atomic_file (inode))) goto repeat; ret = f2fs_prepare_compress_overwrite(inode, pagep,
fs/f2fs/file.c +4 -1
@@ -2035,7 +2035,10 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)inode_lock (inode); -f2fs_disable_compressed_file (inode); +if (!f2fs_disable_compressed_file (inode)) { + ret = -EINVAL ; + goto out; + }if (f2fs_is_atomic_file (inode)) {if (is_inode_flag_set (inode,FI_ATOMIC_REVOKE_REQUEST ))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 185/599 selftests, x86: fix how check_cc.sh is being invoked
In reply to Greg Kroah-HartmanFrom: Guillaume Tucker <[email protected]>
[ Upstream commit ef696f93ed9778d570bd5ac58414421cdd4f1aab ]
The $(CC) variable used in Makefiles could contain several arguments such as "ccache gcc". These need to be passed as a single string to check_cc.sh, otherwise only the first argument will be used as the compiler command. Without quotes, the $(CC) variable is passed as distinct arguments which causes the script to fail to build trivial programs.
Fix this by adding quotes around $(CC) when calling check_cc.sh to pass the whole string as a single argument to the script even if it has several words such as "ccache gcc".
--- tools/testing/selftests/vm/Makefile | 6 +++--- tools/testing/selftests/x86/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/vm/Makefile +3 -3
@@ -40,9 +40,9 @@ TEST_GEN_FILES += userfaultfd TEST_GEN_FILES += khugepaged ifeq ($(MACHINE),x86_64) -CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bit_program.c -m32) -CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_64bit_program.c) -CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_program.c -no-pie) +CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_32bit_program.c -m32) +CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_64bit_program.c) +CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_program.c -no-pie) TARGETS := protection_keys BINARIES_32 := $(TARGETS:%=%_32)
tools/testing/selftests/x86/Makefile +3 -3
@@ -6,9 +6,9 @@ include ../lib.mk .PHONY: all all_32 all_64 warn_32bit_failure clean UNAME_M := $(shell uname -m) -CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32) -CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c) -CAN_BUILD_WITH_NOPIE := $(shell ./check_cc.sh $(CC) trivial_program.c -no-pie) +CAN_BUILD_I386 := $(shell ./check_cc.sh "$(CC)" trivial_32bit_program.c -m32) +CAN_BUILD_X86_64 := $(shell ./check_cc.sh "$(CC)" trivial_64bit_program.c) +CAN_BUILD_WITH_NOPIE := $(shell ./check_cc.sh "$(CC)" trivial_program.c -no-pie) TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \ check_initial_reg_state sigreturn iopl ioperm \
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 186/599 kunit: make kunit_test_timeout compatible with comment
In reply to Greg Kroah-HartmanFrom: Peng Liu <[email protected]>
[ Upstream commit bdd015f7b71b92c2e4ecabac689642cc72553e04 ]
In function kunit_test_timeout, it is declared "300 * MSEC_PER_SEC" represent 5min. However, it is wrong when dealing with arm64 whose default HZ = 250, or some other situations. Use msecs_to_jiffies to fix this, and kunit_test_timeout will work as desired.
--- lib/kunit/try-catch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kunit/try-catch.c +1 -1
@@ -52,7 +52,7 @@ static unsigned long kunit_test_timeout(void)* If tests timeout due to exceeding sysctl_hung_task_timeout_secs, * the task will be killed and an oops generated. */ -return 300 *MSEC_PER_SEC ;/* 5 min */ +return 300 *msecs_to_jiffies (MSEC_PER_SEC );/* 5 min */ }void kunit_try_catch_run (struct kunit_try_catch *try_catch,void *context)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 187/599 media: staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 241f5b67fb48def58643f279dfb8468bdd54b443 ]
vb2_dma_contig_set_max_seg_size need to have a size in parameter and not a DMA_BIT_MASK().
While fixing this issue, also fix error handling of all DMA size setting.
--- drivers/staging/media/zoran/zoran_card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/zoran/zoran_card.c +4 -2
@@ -1068,8 +1068,10 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 ));if (err) -return -ENODEV ; -vb2_dma_contig_set_max_seg_size (&pdev->dev,DMA_BIT_MASK (32 )); +return err; + err =vb2_dma_contig_set_max_seg_size (&pdev->dev,U32_MAX ); +if (err) +return err; nr = zoran_num++;if (nr >=BUZ_MAX ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 188/599 media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 8310ca94075e784bbb06593cd6c068ee6b6e4ca6 ]
DST_QUEUE_OFF_BASE is applied to offset/mem_offset on MMAP capture buffers only for the VIDIOC_QUERYBUF ioctl, while the userspace fields (including offset/mem_offset) are filled in for VIDIOC_{QUERY,PREPARE,Q,DQ}BUF ioctls. This leads to differences in the values presented to userspace. If userspace attempts to mmap the capture buffer directly using values from DQBUF, it will fail.
Move the code that applies the magic offset into a helper, and call that helper from all four ioctl entry points.
[hverkuil: drop unnecessary '= 0' in v4l2_m2m_querybuf() for ret]
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 53 ++++++++++++++++++++------ 1 file changed, 41 insertions(+), 12 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +41 -12
@@ -585,19 +585,14 @@ int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, }EXPORT_SYMBOL_GPL (v4l2_m2m_reqbufs); -int v4l2_m2m_querybuf (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, -struct v4l2_buffer *buf) +static void v4l2_m2m_adjust_mem_offset (struct vb2_queue *vq, +struct v4l2_buffer *buf) { -struct vb2_queue *vq; -int ret =0 ; -unsigned int i; - - vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); - ret =vb2_querybuf (vq, buf); -/* Adjust MMAP memory offsets for the CAPTURE queue */ if (buf->memory ==V4L2_MEMORY_MMAP &&V4L2_TYPE_IS_CAPTURE (vq->type)) {if (V4L2_TYPE_IS_MULTIPLANAR (vq->type)) { +unsigned int i; +for (i =0 ; i < buf->length; ++i) buf->m.planes[i].m.mem_offset +=DST_QUEUE_OFF_BASE ;
@@ -605,8 +600,23 @@ int v4l2_m2m_querybuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, buf->m.offset +=DST_QUEUE_OFF_BASE ; } } +} -return ret; +int v4l2_m2m_querybuf (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, +struct v4l2_buffer *buf) +{ +struct vb2_queue *vq; +int ret; + + vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); + ret =vb2_querybuf (vq, buf); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_querybuf);
@@ -763,6 +773,9 @@ int v4l2_m2m_qbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,if (ret)return ret; +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); +/* * If the capture queue is streaming, but streaming hasn't started * on the device, but was asked to stop, mark the previously queued
@@ -784,9 +797,17 @@ int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_buffer *buf) {struct vb2_queue *vq; +int ret; vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); -return vb2_dqbuf (vq, buf, file->f_flags &O_NONBLOCK ); + ret =vb2_dqbuf (vq, buf, file->f_flags &O_NONBLOCK ); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_dqbuf);
@@ -795,9 +816,17 @@ int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, {struct video_device *vdev =video_devdata (file);struct vb2_queue *vq; +int ret; vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); -return vb2_prepare_buf (vq, vdev->v4l2_dev->mdev, buf); + ret =vb2_prepare_buf (vq, vdev->v4l2_dev->mdev, buf); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_prepare_buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 189/599 media: mtk-vcodec: potential dereference of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e25a89f743b18c029bfbe5e1663ae0c7190912b0 ]
The return value of devm_kzalloc() needs to be checked. To avoid use of null pointer in case of thefailure of alloc.
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +2 -0
@@ -102,6 +102,8 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_vpu_init(struct mtk_vcodec_dev *dev,vpu_wdt_reg_handler (fw_pdev, mtk_vcodec_vpu_reset_handler, dev, rst_id); fw =devm_kzalloc (&dev->plat_dev->dev,sizeof (*fw),GFP_KERNEL ); +if (!fw) +return ERR_PTR (-ENOMEM ); fw->type =VPU ; fw->ops = &mtk_vcodec_vpu_msg; fw->pdev = fw_pdev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 190/599 media: bttv: fix WARNING regression on tunerless devices
In reply to Greg Kroah-HartmanFrom: Ondrej Zary <[email protected]>
[ Upstream commit ef058cc8b7193d15a771272359c7454839ae74ee ]
Commit 2161536516ed ("media: media/pci: set device_caps in struct video_device") introduced a regression: V4L2_CAP_TUNER is always present in device_caps, even when the device has no tuner.
This causes a warning:
WARNING: CPU: 0 PID: 249 at drivers/media/v4l2-core/v4l2-ioctl.c:1102 v4l_querycap+0xa0/0xb0 [videodev]
--- drivers/media/pci/bt8xx/bttv-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/bt8xx/bttv-driver.c +2 -2
@@ -3898,7 +3898,7 @@ static int bttv_register_video(struct bttv *btv)/* video */ vdev_init (btv, &btv->video_dev, &bttv_video_template,"video" ); - btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_TUNER | + btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_READWRITE |V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->video_dev.device_caps |=V4L2_CAP_TUNER ;
@@ -3919,7 +3919,7 @@ static int bttv_register_video(struct bttv *btv)/* vbi */ vdev_init (btv, &btv->vbi_dev, &bttv_video_template,"vbi" ); btv->vbi_dev.device_caps =V4L2_CAP_VBI_CAPTURE |V4L2_CAP_READWRITE | -V4L2_CAP_STREAMING |V4L2_CAP_TUNER ; +V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->vbi_dev.device_caps |=V4L2_CAP_TUNER ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 191/599 ASoC: xilinx: xlnx_formatter_pcm: Handle sysclk setting
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 1c5091fbe7e0d0804158200b7feac5123f7b4fbd ]
This driver did not set the MM2S Fs Multiplier Register to the proper value for playback streams. This needs to be set to the sample rate to MCLK multiplier, or random stream underflows can occur on the downstream I2S transmitter.
Store the sysclk value provided via the set_sysclk callback and use that in conjunction with the sample rate in the hw_params callback to calculate the proper value to set for this register.
--- sound/soc/xilinx/xlnx_formatter_pcm.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
sound/soc/xilinx/xlnx_formatter_pcm.c +25 -0
@@ -84,6 +84,7 @@ struct xlnx_pcm_drv_data {struct snd_pcm_substream *play_stream;struct snd_pcm_substream *capture_stream;struct clk *axi_clk; +unsigned int sysclk; };/*
@@ -314,6 +315,15 @@ static irqreturn_t xlnx_s2mm_irq_handler(int irq, void *arg)return IRQ_NONE ; } +static int xlnx_formatter_set_sysclk (struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir) +{ +struct xlnx_pcm_drv_data *adata =dev_get_drvdata (component->dev); + + adata->sysclk = freq; +return 0 ; +} +static int xlnx_formatter_pcm_open (struct snd_soc_component *component,struct snd_pcm_substream *substream) {
@@ -450,11 +460,25 @@ static int xlnx_formatter_pcm_hw_params(struct snd_soc_component *component,u64 size;struct snd_pcm_runtime *runtime = substream->runtime;struct xlnx_pcm_stream_param *stream_data = runtime->private_data; +struct xlnx_pcm_drv_data *adata =dev_get_drvdata (component->dev); active_ch =params_channels (params);if (active_ch > stream_data->ch_limit)return -EINVAL ; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK && + adata->sysclk) { +unsigned int mclk_fs = adata->sysclk /params_rate (params); + +if (adata->sysclk %params_rate (params) !=0 ) { +dev_warn (component->dev,"sysclk %u not divisible by rate %u\n" , + adata->sysclk,params_rate (params)); +return -EINVAL ; + } + +writel (mclk_fs, stream_data->mmio +XLNX_AUD_FS_MULTIPLIER ); + } +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE && stream_data->xfer_mode ==AES_TO_PCM ) { val =readl (stream_data->mmio +XLNX_AUD_STS );
@@ -552,6 +576,7 @@ static int xlnx_formatter_pcm_new(struct snd_soc_component *component,static const struct snd_soc_component_driver xlnx_asoc_component = { .name =DRV_NAME , + .set_sysclk = xlnx_formatter_set_sysclk, .open = xlnx_formatter_pcm_open, .close = xlnx_formatter_pcm_close, .hw_params = xlnx_formatter_pcm_hw_params,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 192/599 ASoC: generic: simple-card-utils: remove useless assignment
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit bd029fc86834760276171bd2301d6c43e45a65b0 ]
cppcheck warning:
sound/soc/generic/simple-card-utils.c:258:10: style: Variable 'ret' is assigned a value that is never used. [unreadVariable]
int ret = 0;
^--- sound/soc/generic/simple-card-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/generic/simple-card-utils.c +1 -1
@@ -255,7 +255,7 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream,struct simple_dai_props *dai_props =simple_priv_to_props (priv, rtd->num);unsigned int mclk, mclk_fs =0 ; -int ret =0 ; +int ret;if (dai_props->mclk_fs) mclk_fs = dai_props->mclk_fs;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 193/599 media: coda: Fix missing put_device() call in coda_get_vdoa_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ca85d271531a1e1c86f24b892f57b7d0a3ddb5a6 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/media/platform/coda/coda-common.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/coda/coda-common.c +1 -0
@@ -408,6 +408,7 @@ static struct vdoa_data *coda_get_vdoa_data(void)if (!vdoa_data) vdoa_data =ERR_PTR (-EPROBE_DEFER ); +put_device (&vdoa_pdev->dev); out:of_node_put (vdoa_node);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 194/599 media: meson: vdec: potential dereference of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit c8c80c996182239ff9b05eda4db50184cf3b2e99 ]
As the possible failure of the kzalloc(), the 'new_ts' could be NULL pointer.
Therefore, it should be better to check it in order to avoid the dereference of the NULL pointer.
Also, the caller esparser_queue() needs to deal with the return value of the amvdec_add_ts().
--- drivers/staging/media/meson/vdec/esparser.c | 7 ++++++- drivers/staging/media/meson/vdec/vdec_helpers.c | 8 ++++++-- drivers/staging/media/meson/vdec/vdec_helpers.h | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-)
drivers/staging/media/meson/vdec/esparser.c +6 -1
@@ -328,7 +328,12 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) offset =esparser_get_offset (sess); -amvdec_add_ts (sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags); + ret =amvdec_add_ts (sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags); +if (ret) { +v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_ERROR ); +return ret; + } +dev_dbg (core->dev,"esparser: ts = %llu pld_size = %u offset = %08X flags = %08X\n" , vb->timestamp, payload_size, offset, vbuf->flags);
drivers/staging/media/meson/vdec/vdec_helpers.c +6 -2
@@ -227,13 +227,16 @@ int amvdec_set_canvases(struct amvdec_session *sess, }EXPORT_SYMBOL_GPL (amvdec_set_canvases); -void amvdec_add_ts (struct amvdec_session *sess,u64 ts, -struct v4l2_timecode tc,u32 offset,u32 vbuf_flags) +int amvdec_add_ts (struct amvdec_session *sess,u64 ts, +struct v4l2_timecode tc,u32 offset,u32 vbuf_flags) {struct amvdec_timestamp *new_ts;unsigned long flags; new_ts =kzalloc (sizeof (*new_ts),GFP_KERNEL ); +if (!new_ts) +return -ENOMEM ; + new_ts->ts = ts; new_ts->tc = tc; new_ts->offset = offset;
@@ -242,6 +245,7 @@ void amvdec_add_ts(struct amvdec_session *sess, u64 ts,spin_lock_irqsave (&sess->ts_spinlock, flags);list_add_tail (&new_ts->list, &sess->timestamps);spin_unlock_irqrestore (&sess->ts_spinlock, flags); +return 0 ; }EXPORT_SYMBOL_GPL (amvdec_add_ts);
drivers/staging/media/meson/vdec/vdec_helpers.h +2 -2
@@ -55,8 +55,8 @@ void amvdec_dst_buf_done_offset(struct amvdec_session *sess,* @offset: offset in the VIFIFO where the associated packet was written * @flags the vb2_v4l2_buffer flags */ -void amvdec_add_ts (struct amvdec_session *sess,u64 ts, -struct v4l2_timecode tc,u32 offset,u32 flags); +int amvdec_add_ts (struct amvdec_session *sess,u64 ts, +struct v4l2_timecode tc,u32 offset,u32 flags);void amvdec_remove_ts (struct amvdec_session *sess,u64 ts);/**
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 195/599 media: hantro: Fix overfill bottom register field name
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 89d78e0133e71ba324fb67ca776223fba4353418 ]
The Hantro H1 hardware can crop off pixels from the right and bottom of the source frame. These are controlled with the H1_REG_IN_IMG_CTRL_OVRFLB and H1_REG_IN_IMG_CTRL_OVRFLR in the H1_REG_IN_IMG_CTRL register.
The ChromeOS kernel driver that this was based on incorrectly added the _D4 suffix H1_REG_IN_IMG_CTRL_OVRFLB. This field crops the bottom of the input frame, and the number is _not_ divided by 4. [1]
Correct the name to avoid confusion when crop support with the selection API is added.
[1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/ \ heads/chromeos-4.19/drivers/staging/media/hantro/hantro_h1_vp8_enc.c#377
--- drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +- drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +1 -1
@@ -23,7 +23,7 @@ static void hantro_h1_set_src_img_ctrl(struct hantro_dev *vpu, reg =H1_REG_IN_IMG_CTRL_ROW_LEN (pix_fmt->width) |H1_REG_IN_IMG_CTRL_OVRFLR_D4 (0 ) - |H1_REG_IN_IMG_CTRL_OVRFLB_D4 (0 ) + |H1_REG_IN_IMG_CTRL_OVRFLB (0 ) |H1_REG_IN_IMG_CTRL_FMT (ctx->vpu_src_fmt->enc_fmt);vepu_write_relaxed (vpu, reg,H1_REG_IN_IMG_CTRL ); }
drivers/staging/media/hantro/hantro_h1_regs.h +1 -1
@@ -47,7 +47,7 @@#define H1_REG_IN_IMG_CTRL 0x03c#define H1_REG_IN_IMG_CTRL_ROW_LEN (x) ((x) << 12)#define H1_REG_IN_IMG_CTRL_OVRFLR_D4 (x) ((x) << 10) -#define H1_REG_IN_IMG_CTRL_OVRFLB_D4 (x) ((x) << 6) +#define H1_REG_IN_IMG_CTRL_OVRFLB (x) ((x) << 6)#define H1_REG_IN_IMG_CTRL_FMT (x) ((x) << 2)#define H1_REG_ENC_CTRL0 0x040#define H1_REG_ENC_CTRL0_INIT_QP (x) ((x) << 26)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 196/599 media: aspeed: Correct value for h-total-pixels
In reply to Greg Kroah-HartmanFrom: Jammy Huang <[email protected]>
[ Upstream commit 4b732a0016853eaff35944f900b0db66f3914374 ]
Previous reg-field, 0x98[11:0], stands for the period of the detected hsync signal.
Use the correct reg, 0xa0, to get h-total in pixels.
--- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/aspeed-video.c +6 -3
@@ -151,7 +151,7 @@#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)#define VE_MODE_DETECT_STATUS 0x098 -#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) +#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)#define VE_MODE_DETECT_V_LINES_SHF 16#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)#define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
@@ -162,6 +162,8 @@#define VE_SYNC_STATUS_VSYNC_SHF 16#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) +#define VE_H_TOTAL_PIXELS 0x0A0 +#define VE_INTERRUPT_CTRL 0x304#define VE_INTERRUPT_STATUS 0x308#define VE_INTERRUPT_MODE_DETECT_WD BIT(0)
@@ -765,6 +767,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)u32 src_lr_edge;u32 src_tb_edge;u32 sync; +u32 htotal;struct v4l2_bt_timings *det = &video->detected_timings; det->width =MIN_WIDTH ;
@@ -809,6 +812,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge =aspeed_video_read (video,VE_SRC_TB_EDGE_DET ); mds =aspeed_video_read (video,VE_MODE_DETECT_STATUS ); sync =aspeed_video_read (video,VE_SYNC_STATUS ); + htotal =aspeed_video_read (video,VE_H_TOTAL_PIXELS ); video->frame_bottom = (src_tb_edge &VE_SRC_TB_EDGE_DET_BOT ) >>VE_SRC_TB_EDGE_DET_BOT_SHF ;
@@ -825,8 +829,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)VE_SRC_LR_EDGE_DET_RT_SHF ; video->frame_left = src_lr_edge &VE_SRC_LR_EDGE_DET_LEFT ; det->hfrontporch = video->frame_left; - det->hbackporch = (mds &VE_MODE_DETECT_H_PIXELS ) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync &VE_SYNC_STATUS_HSYNC ;if (video->frame_left > video->frame_right)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 197/599 video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen
In reply to Greg Kroah-HartmanFrom: Z. Liu <[email protected]>
[ Upstream commit 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4 ]
Start from commit 11be60bd66d54 "matroxfb: add Matrox MGA-G200eW board support", when maxvram is 0x800000, monitor become black w/ error message
said: "The current input timing is not supported by the monitor display. Please change your input timing to 1920x1080@60Hz ...".
--- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/matrox/matroxfb_base.c +1 -1
@@ -1377,7 +1377,7 @@ static struct video_board vbG200 = { .lowlevel = &matrox_G100 };static struct video_board vbG200eW = { - .maxvram =0x800000 , + .maxvram =0x100000 , .maxdisplayable =0x800000 , .accelID =FB_ACCEL_MATROX_MGAG200 , .lowlevel = &matrox_G100
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 198/599 video: fbdev: controlfb: Fix set but not used warnings
In reply to Greg Kroah-HartmanFrom: Sam Ravnborg <[email protected]>
[ Upstream commit 4aca4dbcac9d8eed8a8dc15b6883270a20a84218 ]
The controlfb driver has a number of dummy defines for IO operations. They were introduced in commit a07a63b0e24d
("video: fbdev: controlfb: add COMPILE_TEST support").
The write variants did not use their value parameter in the dummy versions, resulting in set but not used warnings. Fix this by adding "(void)val" to silence the compiler.
--- drivers/video/fbdev/controlfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/controlfb.c +2 -2
@@ -64,9 +64,9 @@#undef in_le32#undef out_le32#define in_8 (addr) 0 -#define out_8 (addr, val) +#define out_8 (addr, val) (void)(val)#define in_le32 (addr) 0 -#define out_le32 (addr, val) +#define out_le32 (addr, val) (void)(val)#define pgprot_cached_wthru (prot) (prot)#else static void invalid_vram_cache (void __force *addr)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 199/599 video: fbdev: controlfb: Fix COMPILE_TEST build
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 567e44fb51b4f909ae58038a7301352eecea8426 ]
If PPC_BOOK3S, PPC_PMAC and PPC32 is n, COMPILE_TEST build fails:
drivers/video/fbdev/controlfb.c:70:0: error: "pgprot_cached_wthru" redefined [-Werror]
#define pgprot_cached_wthru(prot) (prot)
In file included from ./arch/powerpc/include/asm/pgtable.h:20:0,
from ./include/linux/pgtable.h:6,
from ./include/linux/mm.h:33,
from drivers/video/fbdev/controlfb.c:37:./arch/powerpc/include/asm/nohash/pgtable.h:243:0: note: this is the location of the previous definition
#define pgprot_cached_wthru(prot) (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \
--- drivers/video/fbdev/controlfb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/controlfb.c +2 -0
@@ -67,7 +67,9 @@#define out_8 (addr, val) (void)(val)#define in_le32 (addr) 0#define out_le32 (addr, val) (void)(val) +#ifndef pgprot_cached_wthru#define pgprot_cached_wthru (prot) (prot) +#endif #else static void invalid_vram_cache (void __force *addr) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 200/599 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 1791f487f877a9e83d81c8677bd3e7b259e7cb27 ]
I got a null-ptr-deref report:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:fb_destroy_modelist+0x38/0x100 ... Call Trace: ufx_usb_probe.cold+0x2b5/0xac1 [smscufx] usb_probe_interface+0x1aa/0x3c0 [usbcore] really_probe+0x167/0x460
...
ret_from_fork+0x1f/0x30
If fb_alloc_cmap() fails in ufx_usb_probe(), fb_destroy_modelist() will be called to destroy modelist in the error handling path. But modelist has not been initialized yet, so it will result in null-ptr-deref.
Initialize modelist before calling fb_alloc_cmap() to fix this bug.
--- drivers/video/fbdev/smscufx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/smscufx.c +1 -2
@@ -1656,6 +1656,7 @@ static int ufx_usb_probe(struct usb_interface *interface, info->par = dev; info->pseudo_palette = dev->pseudo_palette; info->fbops = &ufx_ops; +INIT_LIST_HEAD (&info->modelist); retval =fb_alloc_cmap (&info->cmap,256 ,0 );if (retval <0 ) {
@@ -1666,8 +1667,6 @@ static int ufx_usb_probe(struct usb_interface *interface,INIT_DELAYED_WORK (&dev->free_framebuffer_work, ufx_free_framebuffer_work); -INIT_LIST_HEAD (&info->modelist); - retval =ufx_reg_read (dev,0x3000 , &id_rev);check_warn_goto_error (retval,"error %d reading 0x3000 register from device" , retval);dev_dbg (dev->gdev,"ID_REV register value 0x%08x" , id_rev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 201/599 video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit fee5c1e4b789e41719af9fee0e2dd397cd31988f ]
If "sinfo->config" is not found, then return -ENODEV. Don't return success.
--- drivers/video/fbdev/atmel_lcdfb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/video/fbdev/atmel_lcdfb.c +6 -5
@@ -1062,15 +1062,16 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)INIT_LIST_HEAD (&info->modelist); -if (pdev->dev.of_node) { - ret =atmel_lcdfb_of_init (sinfo); -if (ret) - goto free_info; - }else { +if (!pdev->dev.of_node) {dev_err (dev,"cannot get default configuration\n" ); goto free_info; } + ret =atmel_lcdfb_of_init (sinfo); +if (ret) + goto free_info; + + ret = -ENODEV ;if (!sinfo->config) goto free_info;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 202/599 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 78482af095abd9f4f29f1aa3fe575d25c6ae3028 ]
This code has two bugs:
1) "cnt" is 255 but the size of the buffer is 256 so the last byte is not used.
2) If we try to print more than 255 characters then "cnt" will be negative and that will trigger a WARN() in snprintf(). The fix for this is to use scnprintf() instead of snprintf().
We can re-write this code to be cleaner:
1) Rename "offset" to "off" because that's shorter.
2) Get rid of the "cnt" variable and just use "size - off" directly.
3) Get rid of the "read" variable and just increment "off" directly.
--- drivers/video/fbdev/core/fbcvt.c | 53 +++++++++++++------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/video/fbdev/core/fbcvt.c +21 -32
@@ -214,9 +214,11 @@ static u32 fb_cvt_aspect_ratio(struct fb_cvt_data *cvt)static void fb_cvt_print_name (struct fb_cvt_data *cvt) {u32 pixcount, pixcount_mod; -int cnt =255 , offset =0 , read =0 ; -u8 *buf =kzalloc (256 ,GFP_KERNEL ); +int size =256 ; +int off =0 ; +u8 *buf; + buf =kzalloc (size,GFP_KERNEL );if (!buf)return ;
@@ -224,43 +226,30 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt) pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) %1000000 ; pixcount_mod /=1000 ; - read =snprintf (buf+offset, cnt,"fbcvt: %dx%d@%d: CVT Name - " , - cvt->xres, cvt->yres, cvt->refresh); - offset += read; - cnt -= read; + off +=scnprintf (buf + off, size - off,"fbcvt: %dx%d@%d: CVT Name - " , + cvt->xres, cvt->yres, cvt->refresh); -if (cvt->status) -snprintf (buf+offset, cnt,"Not a CVT standard - %d.%03d Mega " -"Pixel Image\n" , pixcount, pixcount_mod); -else { -if (pixcount) { - read =snprintf (buf+offset, cnt,"%d" , pixcount); - cnt -= read; - offset += read; - } +if (cvt->status) { + off +=scnprintf (buf + off, size - off, +"Not a CVT standard - %d.%03d Mega Pixel Image\n" , + pixcount, pixcount_mod); + }else { +if (pixcount) + off +=scnprintf (buf + off, size - off,"%d" , pixcount); - read =snprintf (buf+offset, cnt,".%03dM" , pixcount_mod); - cnt -= read; - offset += read; + off +=scnprintf (buf + off, size - off,".%03dM" , pixcount_mod);if (cvt->aspect_ratio ==0 ) - read =snprintf (buf+offset, cnt,"3" ); + off +=scnprintf (buf + off, size - off,"3" );else if (cvt->aspect_ratio ==3 ) - read =snprintf (buf+offset, cnt,"4" ); + off +=scnprintf (buf + off, size - off,"4" );else if (cvt->aspect_ratio ==1 || cvt->aspect_ratio ==4 ) - read =snprintf (buf+offset, cnt,"9" ); + off +=scnprintf (buf + off, size - off,"9" );else if (cvt->aspect_ratio ==2 ) - read =snprintf (buf+offset, cnt,"A" ); -else - read =0 ; - cnt -= read; - offset += read; - -if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) { - read =snprintf (buf+offset, cnt,"-R" ); - cnt -= read; - offset += read; - } + off +=scnprintf (buf + off, size - off,"A" ); + +if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) + off +=scnprintf (buf + off, size - off,"-R" ); }printk (KERN_INFO "%s\n" , buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 203/599 firmware: qcom: scm: Remove reassignment to desc following initializer
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 7823e5aa5d1dd9ed5849923c165eb8f29ad23c54 ]
Member assignments to qcom_scm_desc were moved into struct initializers in 57d3b816718c ("firmware: qcom_scm: Remove thin wrappers") including the case in qcom_scm_iommu_secure_ptbl_init, except that the - now duplicate - assignment to desc was left in place. While not harmful, remove this unnecessary extra reassignment.
--- drivers/firmware/qcom_scm.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/firmware/qcom_scm.c +0 -6
@@ -749,12 +749,6 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) };int ret; - desc.args[0 ] = addr; - desc.args[1 ] = size; - desc.args[2 ] = spare; - desc.arginfo =QCOM_SCM_ARGS (3 ,QCOM_SCM_RW ,QCOM_SCM_VAL , -QCOM_SCM_VAL ); - ret =qcom_scm_call (__scm->dev, &desc,NULL );/* the pg table has been initialized already, ignore the error */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 204/599 ARM: dts: qcom: ipq4019: fix sleep clock
In reply to Greg Kroah-HartmanFrom: Pavel Kubelun <[email protected]>
[ Upstream commit 3d7e7980993d2c1ae42d3d314040fc2de6a9c45f ]
It seems like sleep_clk was copied from ipq806x.
Fix ipq40xx sleep_clk to the value QSDK defines.
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -1
@@ -142,7 +142,8 @@ clocks { sleep_clk: sleep_clk { compatible = "fixed-clock"; - clock-frequency = <32768>; + clock-frequency = <32000>; + clock-output-names = "gcc_sleep_clk_src"; #clock-cells = <0>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 205/599 soc: qcom: rpmpd: Check for null return of devm_kcalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 5a811126d38f9767a20cc271b34db7c8efc5a46c ]
Because of the possible failure of the allocation, data->domains might be NULL pointer and will cause the dereference of the NULL pointer later.
Therefore, it might be better to check it and directly return -ENOMEM without releasing data manually if fails, because the comment of the devm_kmalloc() says "Memory allocated with this function is automatically freed on driver detach.".
--- drivers/soc/qcom/rpmpd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/qcom/rpmpd.c +3 -0
@@ -387,6 +387,9 @@ static int rpmpd_probe(struct platform_device *pdev) data->domains =devm_kcalloc (&pdev->dev, num,sizeof (*data->domains),GFP_KERNEL ); +if (!data->domains) +return -ENOMEM ; + data->num_domains = num;for (i =0 ; i < num; i++) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 206/599 soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 0ff027027e05a866491bbb53494f0e2a61354c85 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/soc/qcom/ocmem.c | 1 + 1 file changed, 1 insertion(+)
drivers/soc/qcom/ocmem.c +1 -0
@@ -206,6 +206,7 @@ struct ocmem *of_get_ocmem(struct device *dev) ocmem =platform_get_drvdata (pdev);if (!ocmem) {dev_err (dev,"Cannot get ocmem\n" ); +put_device (&pdev->dev);return ERR_PTR (-ENODEV ); }return ocmem;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 207/599 soc: qcom: aoss: remove spurious IRQF_ONESHOT flags
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
[ Upstream commit 8030cb9a55688c1339edd284d9d6ce5f9fc75160 ]
Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts which need to keep the irq line disabled until the threaded handler has been run.". When applied to an interrupt that doesn't request a threaded irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, which it to disable the forced threading of the irq. For "normal" kernels (without forced threading) then, if there is no thread_fn, then IRQF_ONESHOT is a nop.
In this case disabling forced threading is not appropriate for this driver because it calls wake_up_all() and this API cannot be called from no-thread interrupt handlers on PREEMPT_RT systems (deadlock risk, triggers sleeping-while-atomic warnings).
Fix this by removing IRQF_ONESHOT.
--- drivers/soc/qcom/qcom_aoss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/qcom_aoss.c +1 -1
@@ -548,7 +548,7 @@ static int qmp_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (&pdev->dev, irq, qmp_intr,IRQF_ONESHOT , + ret =devm_request_irq (&pdev->dev, irq, qmp_intr,0 ,"aoss-qmp" , qmp);if (ret <0 ) {dev_err (&pdev->dev,"failed to request interrupt\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 208/599 arm64: dts: qcom: sdm845: fix microphone bias properties and values
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
[ Upstream commit 625c24460dbbc3b6c9a148c0a30f0830893fc909 ]
replace millivolt with correct microvolt and adjust value to the minimal value allowed by documentation.
Found with make qcom/sdm845-oneplus-fajita.dtb.
Fixes:arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias1-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias2-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias3-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias4-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias1-millivolt', 'qcom,micbias2-millivolt', 'qcom,micbias3-millivolt', 'qcom,micbias4-millivolt' do not match any of the regexes: '^.*@[0-9a-f]+$', 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +4 -4
@@ -3406,10 +3406,10 @@ #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; - qcom,micbias1-millivolt = <1800>; - qcom,micbias2-millivolt = <1800>; - qcom,micbias3-millivolt = <1800>; - qcom,micbias4-millivolt = <1800>; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 209/599 arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc
In reply to Greg Kroah-HartmanFrom: Maulik Shah <[email protected]>
[ Upstream commit 17ac8af678b6da6a8f1df7da8ebf2c5198741827 ]
Correct the TCS config by updating the number of TCSes for each type.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +3 -3
@@ -1114,9 +1114,9 @@ qcom,tcs-offset = <0xd00>; qcom,drv-id = <2>; qcom,tcs-config = <ACTIVE_TCS 2>, - <SLEEP_TCS 1>, - <WAKE_TCS 1>, - <CONTROL_TCS 0>; + <SLEEP_TCS 3>, + <WAKE_TCS 3>, + <CONTROL_TCS 1>; rpmhcc: clock-controller { compatible = "qcom,sm8150-rpmh-clk";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 210/599 firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 043cfff99a18933fda2fb2e163daee73cc07910b ]
Remove an extra ";" which breaks compilation.
--- include/linux/soc/ti/ti_sci_protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/soc/ti/ti_sci_protocol.h +1 -1
@@ -618,7 +618,7 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,static inline struct ti_sci_resource *devm_ti_sci_get_resource (const struct ti_sci_handle *handle,struct device *dev, -u32 dev_id,u32 sub_type); +u32 dev_id,u32 sub_type) {return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 211/599 soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c3d66a164c726cc3b072232d3b6d87575d194084 ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/ti/wkup_m3_ipc.c +2 -2
@@ -447,9 +447,9 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (!irq) { +if (irq <0 ) {dev_err (&pdev->dev,"no irq resource\n" ); -return -ENXIO ; +return irq; } ret = devm_request_irq(dev, irq, wkup_m3_txev_handler,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 212/599 ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit c4af51698c4fb4fc683f2ac67f482cdf9ba2cd13 ]
The csi1 block node was mistakenly added before the gic node, although its address comes after the gic's. Move the node to its correct position.
--- arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/boot/dts/sun8i-v3s.dtsi +11 -11
@@ -524,6 +524,17 @@ #size-cells = <0>; }; + gic: interrupt-controller@1c81000 { + compatible = "arm,gic-400"; + reg = <0x01c81000 0x1000>, + <0x01c82000 0x2000>, + <0x01c84000 0x2000>, + <0x01c86000 0x2000>; + interrupt-controller; + #interrupt-cells = <3>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + csi1: camera@1cb4000 { compatible = "allwinner,sun8i-v3s-csi"; reg = <0x01cb4000 0x3000>;
@@ -535,16 +546,5 @@ resets = <&ccu RST_BUS_CSI>; status = "disabled"; }; - - gic: interrupt-controller@1c81000 { - compatible = "arm,gic-400"; - reg = <0x01c81000 0x1000>, - <0x01c82000 0x2000>, - <0x01c84000 0x2000>, - <0x01c86000 0x2000>; - interrupt-controller; - #interrupt-cells = <3>; - interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; - }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 213/599 ARM: ftrace: ensure that ADR takes the Thumb bit into account
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ]
Using ADR to take the address of 'ftrace_stub' via a local label produces an address that has the Thumb bit cleared, which means the subsequent comparison is guaranteed to fail. Instead, use the badr macro, which forces the Thumb bit to be set.
--- arch/arm/kernel/entry-ftrace.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/entry-ftrace.S +1 -1
@@ -40,7 +40,7 @@ mcount_enter ldr r0, =ftrace_trace_function ldr r2, [r0] - adr r0, .Lftrace_stub + badr r0, .Lftrace_stub cmp r0, r2 bne 1f
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 214/599 ARM: dts: imx: Add missing LVDS decoder on M53Menlo
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0c6f71176ea43d6f4003a4d57f7bb518c5ad6145 ]
The M53Menlo display unit uses an LVDS-to-DPI bridge, TI DS90CF364A. Describe this bridge in DT, otherwise the DT incorrectly describes DPI panel attached directly to LVDS source.
--- arch/arm/boot/dts/imx53-m53menlo.dts | 29 ++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx53-m53menlo.dts +27 -2
@@ -53,6 +53,31 @@ }; }; + lvds-decoder { + compatible = "ti,ds90cf364a", "lvds-decoder"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + lvds_decoder_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + + port@1 { + reg = <1>; + + lvds_decoder_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + }; + panel { compatible = "edt,etm0700g0dh6"; pinctrl-0 = <&pinctrl_display_gpio>;
@@ -61,7 +86,7 @@ port { panel_in: endpoint { - remote-endpoint = <&lvds0_out>; + remote-endpoint = <&lvds_decoder_out>; }; }; };
@@ -450,7 +475,7 @@ reg = <2>; lvds0_out: endpoint { - remote-endpoint = <&panel_in>; + remote-endpoint = <&lvds_decoder_in>; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 215/599 media: video/hdmi: handle short reads of hdmi info frame.
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 4a92fc6e55da5b87cecb572275deaff6ac9dd27e ]
Calling hdmi_infoframe_unpack() with static sizeof(buffer) skips all the size checking done later in hdmi_infoframe_unpack(). A better value is the amount of data read into buffer.
--- drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/i2c/adv7511-v4l2.c +1 -1
@@ -555,7 +555,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_ buffer[3 ] =0 ; buffer[3 ] =hdmi_infoframe_checksum (buffer, len +4 ); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +4 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
drivers/media/i2c/adv7604.c +1 -1
@@ -2454,7 +2454,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index, buffer[i +3 ] =infoframe_read (sd, adv76xx_cri[index].payload_addr + i); -if (hdmi_infoframe_unpack (frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, adv76xx_cri[index].desc);return -ENOENT ;
drivers/media/i2c/adv7842.c +1 -1
@@ -2574,7 +2574,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7842_cfg_read_for (i =0 ; i < len; i++) buffer[i +3 ] =infoframe_read (sd, cri->payload_addr + i); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 216/599 media: em28xx: initialize refcount before kref_get
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit c08eadca1bdfa099e20a32f8fa4b52b2f672236d ]
The commit 47677e51e2a4("[media] em28xx: Only deallocate struct em28xx after finishing all extensions") adds kref_get to many init functions (e.g., em28xx_audio_init). However, kref_init is called too late in em28xx_usb_probe, since em28xx_init_dev before will invoke those init functions and call kref_get function. Then refcount bug occurs in my local syzkaller instance.
Fix it by moving kref_init before em28xx_init_dev. This issue occurs not only in dev but also dev->dev_next.
--- drivers/media/usb/em28xx/em28xx-cards.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +4 -4
@@ -3881,6 +3881,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, goto err_free; } +kref_init (&dev->ref); + dev->devno = nr; dev->model = id->driver_info; dev->alt =-1 ;
@@ -3981,6 +3983,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, }if (dev->board.has_dual_ts &&em28xx_duplicate_dev (dev) ==0 ) { +kref_init (&dev->dev_next->ref); + dev->dev_next->ts =SECONDARY_TS ; dev->dev_next->alt =-1 ; dev->dev_next->is_audio_only = has_vendor_audio &&
@@ -4035,12 +4039,8 @@ static int em28xx_usb_probe(struct usb_interface *intf,em28xx_write_reg (dev,0x0b ,0x82 );mdelay (100 ); } - -kref_init (&dev->dev_next->ref); } -kref_init (&dev->ref); -request_modules (dev);/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 217/599 media: usb: go7007: s2250-board: fix leak in probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]
Call i2c_unregister_device(audio) on this error path.
--- drivers/media/usb/go7007/s2250-board.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/media/usb/go7007/s2250-board.c +4 -6
@@ -504,6 +504,7 @@ static int s2250_probe(struct i2c_client *client,u8 *data;struct go7007 *go =i2c_get_adapdata (adapter);struct go7007_usb *usb = go->hpi_context; +int err = -EIO ; audio =i2c_new_dummy_device (adapter,TLV320_ADDRESS >>1 );if (IS_ERR (audio))
@@ -532,11 +533,8 @@ static int s2250_probe(struct i2c_client *client, V4L2_CID_HUE, -512, 511, 1, 0); sd->ctrl_handler = &state->hdl;if (state->hdl.error) { -int err = state->hdl.error; - -v4l2_ctrl_handler_free (&state->hdl); -kfree (state); -return err; + err = state->hdl.error; + goto fail; } state->std =V4L2_STD_NTSC ;
@@ -600,7 +598,7 @@ static int s2250_probe(struct i2c_client *client,i2c_unregister_device (audio);v4l2_ctrl_handler_free (&state->hdl);kfree (state); -return -EIO ; +return err; }static int s2250_remove (struct i2c_client *client)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 218/599 media: cedrus: H265: Fix neighbour info buffer size
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit ee8b887329c78971967506f3ac79b9302c9f83c1 ]
Neighbour info buffer size needs to be 794 kiB in H6. This is actually already indirectly mentioned in the comment, but smaller size is used nevertheless.
Increase buffer size to cover H6 needs. Since increase is not that big in absolute numbers, it doesn't make sense to complicate logic for older generations.
Bug was discovered using iommu, which reported access error when trying to play H265 video.
--- drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/sunxi/cedrus/cedrus_h265.c +1 -1
@@ -23,7 +23,7 @@* Subsequent BSP implementations seem to double the neighbor info buffer size * for the H6 SoC, which may be related to 10 bit H265 support. */ -#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (397 * SZ_1K) +#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (794 * SZ_1K)#define CEDRUS_H265_ENTRY_POINTS_BUF_SIZE (4 * SZ_1K)#define CEDRUS_H265_MV_COL_BUF_UNIT_CTB_SIZE 160
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 219/599 media: cedrus: h264: Fix neighbour info buffer size
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit fecd363ae2d5042553370b0adf60c47e35c34a83 ]
According to BSP library source, H264 neighbour info buffer size needs to be 32 kiB for H6. This is similar to H265 decoding, which also needs double buffer size in comparison to older Cedrus core generations.
Increase buffer size to cover H6 needs. Since increase is not that big in absolute numbers, it doesn't make sense to complicate logic for older generations.
Issue was discovered using iommu and cross checked with BSP library source.
--- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/sunxi/cedrus/cedrus_h264.c +1 -1
@@ -38,7 +38,7 @@ struct cedrus_h264_sram_ref_pic {#define CEDRUS_H264_FRAME_NUM 18 -#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (16 * SZ_1K) +#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (32 * SZ_1K)#define CEDRUS_MIN_PIC_INFO_BUF_SIZE (130 * SZ_1K) static void cedrus_h264_write_sram(struct cedrus_dev *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 220/599 ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 4b0bec6088588a120d33db85b1f0d9f096d1df71 ]
wcd934x_rx_hph_mode_put currently returns zero eventhough it changes the value. Fix this, so that change notifications are sent correctly.
--- sound/soc/codecs/wcd934x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/wcd934x.c +4 -1
@@ -2522,13 +2522,16 @@ static int wcd934x_rx_hph_mode_put(struct snd_kcontrol *kc, mode_val = ucontrol->value.enumerated.item[0 ]; +if (mode_val == wcd->hph_mode) +return 0 ; +if (mode_val ==0 ) {dev_err (wcd->dev,"Invalid HPH Mode, default to ClSH HiFi\n" ); mode_val =CLS_H_LOHIFI ; } wcd->hph_mode = mode_val; -return 0 ; +return 1 ; } static int slim_rx_mux_get(struct snd_kcontrol *kc,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 221/599 uaccess: fix nios2 and microblaze get_user_8()
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a97b693c3712f040c5802f32b2d685352e08cefa ]
These two architectures implement 8-byte get_user() through a memcpy() into a four-byte variable, which won't fit.
Use a temporary 64-bit variable instead here, and use a double cast the way that risc-v and openrisc do to avoid compile-time warnings.
--- arch/microblaze/include/asm/uaccess.h | 18 +++++++++--------- arch/nios2/include/asm/uaccess.h | 26 ++++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-)
arch/microblaze/include/asm/uaccess.h +9 -9
@@ -167,27 +167,27 @@ extern long __user_bad(void);#define __get_user (x, ptr) \ ({ \ - unsigned long __gu_val = 0; \ long __gu_err; \ switch (sizeof(*(ptr))) { \ case 1: \ - __get_user_asm("lbu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lbu", (ptr), x, __gu_err); \ break; \ case 2: \ - __get_user_asm("lhu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lhu", (ptr), x, __gu_err); \ break; \ case 4: \ - __get_user_asm("lw", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lw", (ptr), x, __gu_err); \ break; \ - case 8: \ - __gu_err = __copy_from_user(&__gu_val, ptr, 8); \ - if (__gu_err) \ - __gu_err = -EFAULT; \ + case 8: { \ + __u64 __x = 0; \ + __gu_err = raw_copy_from_user(&__x, ptr, 8) ? \ + -EFAULT : 0; \ + (x) = (typeof(x))(typeof((x) - (x)))__x; \ break; \ + } \ default: \/* __gu_val = 0; __gu_err = -EINVAL;*/ __gu_err =__user_bad ();\ } \ - x = (__force __typeof__(*(ptr))) __gu_val; \ __gu_err; \ })
arch/nios2/include/asm/uaccess.h +16 -10
@@ -89,6 +89,7 @@ extern __must_check long strnlen_user(const char __user *s, long n);/* Optimized macros */ #define __get_user_asm (val, insn, addr, err) \ { \ + unsigned long __gu_val; \ __asm__ __volatile__( \ " movi %0, %3\n" \ "1: " insn " %1, 0(%2)\n" \
@@ -97,14 +98,20 @@ extern __must_check long strnlen_user(const char __user *s, long n);" .section __ex_table,\"a\"\n" \" .word 1b, 2b\n" \" .previous" \ - : "=&r" (err), "=r" (val) \ + : "=&r" (err), "=r" (__gu_val) \: " r" (addr), " i" (-EFAULT)); \ +val = (__force __typeof__(*(addr)))__gu_val; \ } -#define __get_user_unknown (val, size, ptr, err) do { \ +extern void __get_user_unknown(void); + +#define __get_user_8 (val, ptr, err) do { \ + u64 __val = 0; \ err = 0; \ - if (__copy_from_user(&(val), ptr, size)) { \ + if (raw_copy_from_user(&(__val), ptr, sizeof(val))) { \ err = -EFAULT; \ + } else { \ + val = (typeof(val))(typeof((val) - (val)))__val; \ } \ } while (0)
@@ -120,8 +127,11 @@ do { \case 4 : \__get_user_asm (val,"ldw" , ptr, err); \break ; \ +case 8 : \ +__get_user_8 (val, ptr, err); \ +break ; \default : \ -__get_user_unknown (val, size, ptr, err); \ +__get_user_unknown (); \break ; \ } \ }while (0 )
@@ -130,9 +140,7 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \ -__get_user_common (__gu_val,sizeof (*(ptr)), __gu_ptr, __gu_err);\ - (x) = (__force __typeof__(x))__gu_val; \ +__get_user_common (x,sizeof (*(ptr)), __gu_ptr, __gu_err); \ __gu_err; \ })
@@ -140,11 +148,9 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \if (access_ok ( __gu_ptr,sizeof (*__gu_ptr))) \ -__get_user_common (__gu_val,sizeof (*__gu_ptr), \ +__get_user_common (x,sizeof (*__gu_ptr), \ __gu_ptr, __gu_err); \ - (x) = (__force __typeof__(x))__gu_val; \ __gu_err; \ })
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 222/599 ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 4d06f92f38b799295ae22c98be7a20cac3e2a1a7 ]
The function devm_kzalloc() in rt5663_parse_dp() can fail, so its return value should be checked.
--- sound/soc/codecs/rt5663.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5663.c +2 -0
@@ -3478,6 +3478,8 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev) table_size =sizeof (struct impedance_mapping_table ) * rt5663->pdata.impedance_sensing_num; rt5663->imp_table =devm_kzalloc (dev, table_size,GFP_KERNEL ); +if (!rt5663->imp_table) +return -ENOMEM ; ret =device_property_read_u32_array (dev,"realtek,impedance_sensing_table" , (u32 *)rt5663->imp_table, table_size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 223/599 ASoC: ti: davinci-i2s: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/ti/davinci-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-i2s.c +4 -1
@@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (dev->clk))return -ENODEV ; -clk_enable (dev->clk); + ret =clk_enable (dev->clk); +if (ret) + goto err_put_clk; dev->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, dev);
@@ -730,6 +732,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)snd_soc_unregister_component (&pdev->dev); err_release_clk:clk_disable (dev->clk); +err_put_clk:clk_put (dev->clk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 224/599 ALSA: spi: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ca1697eb09208f0168d94b88b72f57505339cbe5 ]
As the potential failure of the clk_enable(), it should be better to check it and return error if fails.
--- sound/spi/at73c213.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
sound/spi/at73c213.c +21 -6
@@ -218,7 +218,9 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; -clk_enable (chip->ssc->clk); + err =clk_enable (chip->ssc->clk); +if (err) +return err;return 0 ; }
@@ -776,7 +778,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out;/* Enable DAC master clock. */ -clk_enable (chip->board->dac_clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) + goto out;/* Initialize at73c213 on SPI bus. */ retval =snd_at73c213_write_reg (chip,DAC_RST ,0x04 );
@@ -889,7 +893,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq =-1 ; -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) +return retval; retval =request_irq (irq, snd_at73c213_interrupt,0 ,"at73c213" , chip);if (retval) {
@@ -1008,7 +1014,9 @@ static int snd_at73c213_remove(struct spi_device *spi)int retval;/* Stop playback. */ -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) + goto out;ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXDIS ));clk_disable (chip->ssc->clk);
@@ -1088,9 +1096,16 @@ static int snd_at73c213_resume(struct device *dev) {struct snd_card *card =dev_get_drvdata (dev);struct snd_at73c213 *chip = card->private_data; +int retval; -clk_enable (chip->board->dac_clk); -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) +return retval; + retval =clk_enable (chip->ssc->clk); +if (retval) { +clk_disable (chip->board->dac_clk); +return retval; + }ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXEN ));return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 225/599 arm64: dts: ns2: Fix spi-cpol and spi-cpha property
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
[ Upstream commit c953c764e505428f59ffe6afb1c73b89b5b1ac35 ]
Broadcom ns2 platform has spi-cpol and spi-cpho properties set incorrectly. As per spi-slave-peripheral-prop.yaml, these properties are of flag or boolean type and not integer type. Fix the values.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts +4 -4
@@ -111,8 +111,8 @@ compatible = "silabs,si3226x"; reg = <0>; spi-max-frequency = <5000000>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
@@ -135,8 +135,8 @@ at25,byte-len = <0x8000>; at25,addr-mode = <2>; at25,page-size = <64>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 226/599 arm64: dts: broadcom: Fix sata nodename
In reply to Greg Kroah-HartmanFrom: Frank Wunderlich <[email protected]>
[ Upstream commit 55927cb44db43a57699fa652e2437a91620385dc ]
After converting ahci-platform txt binding to yaml nodename is reported as not matching the standard:
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dt.yaml:
ahci@663f2000: $nodename:0: 'ahci@663f2000' does not match '^sata(@.*)?$'
Fix it to match binding.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +1 -1
@@ -687,7 +687,7 @@ }; }; - sata: ahci@663f2000 { + sata: sata@663f2000 { compatible = "brcm,iproc-ahci", "generic-ahci"; reg = <0x663f2000 0x1000>; dma-coherent;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 227/599 printk: fix return value of printk.devkmsg __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b665eae7a788c5e2bc10f9ac3c0137aa0ad1fc97 ]
If an invalid option value is used with "printk.devkmsg=<value>", it is silently ignored.
If a valid option value is used, it is honored but the wrong return value (0) is used, indicating that the command line option had an error and was not handled. This string is not added to init's environment strings due to init/main.c::unknown_bootoption() checking for a '.' in the boot option string and then considering that string to be an "Unused module parameter".
Print a warning message if a bad option string is used. Always return 1 from the __setup handler to indicate that the command line option has been handled.
--- kernel/printk/printk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/printk/printk.c +4 -2
@@ -146,8 +146,10 @@ static int __control_devkmsg(char *str)static int __init control_devkmsg (char *str) { -if (__control_devkmsg (str) <0 ) +if (__control_devkmsg (str) <0 ) { +pr_warn ("printk.devkmsg: bad option string '%s'\n" , str);return 1 ; + }/* * Set sysctl string accordingly:
@@ -166,7 +168,7 @@ static int __init control_devkmsg(char *str)*/ devkmsg_log |=DEVKMSG_LOG_MASK_LOCK ; -return 0 ; +return 1 ; }__setup ("printk.devkmsg=" , control_devkmsg);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 228/599 ASoC: mxs-saif: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 2ecf362d220317debf5da376e0390e9f7a3f7b29 ]
As the potential failure of the clk_enable(),
it should be better to check it, like mxs_saif_trigger().
--- sound/soc/mxs/mxs-saif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/mxs/mxs-saif.c +4 -1
@@ -455,7 +455,10 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,* basic clock which should be fast enough for the internal * logic. */ -clk_enable (saif->clk); + ret =clk_enable (saif->clk); +if (ret) +return ret; + ret =clk_set_rate (saif->clk,24000000 );clk_disable (saif->clk);if (ret)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 229/599 ASoC: atmel_ssc_dai: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit f9e2ca0640e59d19af0ff285ee5591ed39069b09 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error if fals.
--- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel_ssc_dai.c +4 -1
@@ -280,7 +280,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,/* Enable PMC peripheral clock for this SSC */ pr_debug ("atmel_ssc_dai: Starting clock\n" ); -clk_enable (ssc_p->ssc->clk); + ret =clk_enable (ssc_p->ssc->clk); +if (ret) +return ret; + ssc_p->mck_rate =clk_get_rate (ssc_p->ssc->clk);/* Reset the SSC unless initialized to keep it in a clean state */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 230/599 ASoC: dwc-i2s: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 45ea97d74313bae681328b0c36fa348036777644 ]
As the potential failure of the clk_enable(),
it should be better to check it, as same as clk_prepare_enable().
--- sound/soc/dwc/dwc-i2s.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
sound/soc/dwc/dwc-i2s.c +12 -5
@@ -403,9 +403,13 @@ static int dw_i2s_runtime_suspend(struct device *dev)static int dw_i2s_runtime_resume (struct device *dev) {struct dw_i2s_dev *dw_dev =dev_get_drvdata (dev); +int ret; -if (dw_dev->capability &DW_I2S_MASTER ) -clk_enable (dw_dev->clk); +if (dw_dev->capability &DW_I2S_MASTER ) { + ret =clk_enable (dw_dev->clk); +if (ret) +return ret; + }return 0 ; }
@@ -422,10 +426,13 @@ static int dw_i2s_resume(struct snd_soc_component *component) {struct dw_i2s_dev *dev =snd_soc_component_get_drvdata (component);struct snd_soc_dai *dai; -int stream; +int stream, ret; -if (dev->capability &DW_I2S_MASTER ) -clk_enable (dev->clk); +if (dev->capability &DW_I2S_MASTER ) { + ret =clk_enable (dev->clk); +if (ret) +return ret; + }for_each_component_dais (component, dai) {for_each_pcm_streams (stream)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 231/599 ASoC: soc-compress: prevent the potentially use of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit de2c6f98817fa5decb9b7d3b3a8a3ab864c10588 ]
There is one call trace that snd_soc_register_card() ->snd_soc_bind_card()->soc_init_pcm_runtime() ->snd_soc_dai_compress_new()->snd_soc_new_compress().
In the trace the 'codec_dai' transfers from card->dai_link, and we can see from the snd_soc_add_pcm_runtime() in snd_soc_bind_card() that, if value of card->dai_link->num_codecs is 0, then 'codec_dai' could be null pointer caused
by index out of bound in 'asoc_rtd_to_codec(rtd, 0)'.
And snd_soc_register_card() is called by various platforms. Therefore, it is better to add the check in the case of misusing. And because 'cpu_dai' has already checked in soc_init_pcm_runtime(), there is no need to check again.
Adding the check as follow, then if 'codec_dai' is null, snd_soc_new_compress() will not pass through the check 'if (playback + capture != 1)', avoiding the leftover use of 'codec_dai'.
--- sound/soc/soc-compress.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/soc-compress.c +8 -6
@@ -767,12 +767,14 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) }/* check client and interface hw capabilities */ -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) - playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) - capture =1 ; +if (codec_dai) { +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) + playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) + capture =1 ; + }/* * Compress devices are unidirectional so only one of the directions
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 232/599 memory: emif: Add check for setup_interrupts
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the setup_interrupts() and return error if fails.
--- drivers/memory/emif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/memory/emif.c +4 -2
@@ -1495,7 +1495,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) {struct emif_data *emif;struct resource *res; -int irq; +int irq, ret;if (pdev->dev.of_node) emif =of_get_memory_device_details (pdev->dev.of_node, &pdev->dev);
@@ -1526,7 +1526,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)emif_onetime_settings (emif);emif_debugfs_init (emif);disable_and_clear_all_interrupts (emif); -setup_interrupts (emif, irq); + ret =setup_interrupts (emif, irq); +if (ret) + goto error;/* One-time actions taken on probing the first device */ if (!emif1) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 233/599 memory: emif: check the pointer temp in get_device_details()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 5b5ab1bfa1898c6d52936a57c25c5ceba2cb2f87 ]
The pointer temp is allocated by devm_kzalloc(), so it should be checked for error handling.
--- drivers/memory/emif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/emif.c +1 -1
@@ -1403,7 +1403,7 @@ static struct emif_data *__init_or_module get_device_details( temp =devm_kzalloc (dev,sizeof (*pd),GFP_KERNEL ); dev_info =devm_kzalloc (dev,sizeof (*dev_info),GFP_KERNEL ); -if (!emif || !pd || !dev_info) { +if (!emif || !temp || !dev_info) {dev_err (dev,"%s:%d: allocation error\n" , __func__, __LINE__); goto error; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 234/599 ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit bf0cd60b7e33cf221fbe1114e4acb2c828b0af0d ]
AV/C deferred transaction was supported at a commit 00a7bb81c20f ("ALSA:
firewire-lib: Add support for deferred transaction") while 'deferrable' flag can be uninitialized for non-control/notify AV/C transactions. UBSAN reports it:
kernel: ================================================================================ kernel: UBSAN: invalid-load in /build/linux-aa0B4d/linux-5.15.0/sound/firewire/fcp.c:363:9 kernel: load of value 158 is not a valid value for type '_Bool' kernel: CPU: 3 PID: 182227 Comm: irq/35-firewire Tainted: P OE 5.15.0-18-generic #18-Ubuntu kernel: Hardware name: Gigabyte Technology Co., Ltd. AX370-Gaming 5/AX370-Gaming 5, BIOS F42b 08/01/2019 kernel: Call Trace: kernel: <IRQ> kernel: show_stack+0x52/0x58 kernel: dump_stack_lvl+0x4a/0x5f kernel: dump_stack+0x10/0x12 kernel: ubsan_epilogue+0x9/0x45 kernel: __ubsan_handle_load_invalid_value.cold+0x44/0x49 kernel: fcp_response.part.0.cold+0x1a/0x2b [snd_firewire_lib] kernel: fcp_response+0x28/0x30 [snd_firewire_lib] kernel: fw_core_handle_request+0x230/0x3d0 [firewire_core] kernel: handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? transmit_complete_callback+0x9f/0x120 [firewire_core] kernel: ar_context_tasklet+0xa8/0x2e0 [firewire_ohci] kernel: tasklet_action_common.constprop.0+0xea/0xf0 kernel: tasklet_action+0x22/0x30 kernel: __do_softirq+0xd9/0x2e3 kernel: ? irq_finalize_oneshot.part.0+0xf0/0xf0 kernel: do_softirq+0x75/0xa0 kernel: </IRQ> kernel: <TASK> kernel: __local_bh_enable_ip+0x50/0x60 kernel: irq_forced_thread_fn+0x7e/0x90 kernel: irq_thread+0xba/0x190 kernel: ? irq_thread_fn+0x60/0x60 kernel: kthread+0x11e/0x140 kernel: ? irq_thread_check_affinity+0xf0/0xf0 kernel: ? set_kthread_struct+0x50/0x50 kernel: ret_from_fork+0x22/0x30 kernel: </TASK> kernel: ================================================================================
This commit fixes the bug. The bug has no disadvantage for the non- control/notify AV/C transactions since the flag has an effect for AV/C response with INTERIM (0x0f) status which is not used for the transactions in AV/C general specification.
--- sound/firewire/fcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/firewire/fcp.c +1 -3
@@ -240,9 +240,7 @@ int fcp_avc_transaction(struct fw_unit *unit, t.response_match_bytes = response_match_bytes; t.state =STATE_PENDING ;init_waitqueue_head (&t.wait); - -if (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 ) - t.deferrable = true; + t.deferrable = (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 );spin_lock_irq (&transactions_lock);list_add_tail (&t.list, &transactions);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 235/599 arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 37cbd3c522869247ed4525b5042ff4c6a276c813 ]
A label reference without brackets is a path string, not a phandle as intended. Add the missing brackets.
--- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -2
@@ -665,8 +665,8 @@ sd-uhs-sdr104; /* Power supply */ - vqmmc-supply = &vcc1v8_s3; /* IO line */ - vmmc-supply = &vcc_sdio; /* card's power */ + vqmmc-supply = <&vcc1v8_s3>; /* IO line */ + vmmc-supply = <&vcc_sdio>; /* card's power */ #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 236/599 m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit e6e1e7b19fa132d23d09c465942aab4c110d3da9 ]
When CONFIG_MCF_EDMA is set (due to COMPILE_TEST, not due to CONFIG_M5441x), coldfire/device.c has compile errors due to missing MCFEDMA_* symbols. In the .config file that was provided, CONFIG_M5206=y, not CONFIG_M5441x, so <asm/m5441xsim.h> is not included in coldfire/device.c.
Only build the MCF_EDMA code in coldfire/device.c if the MCFEDMA_* hardware macros are defined.
Fixes these build errors:
../arch/m68k/coldfire/device.c:512:35: error: 'MCFEDMA_BASE' undeclared here (not in a function); did you mean 'MCFDMA_BASE1'?
512 | .start = MCFEDMA_BASE,../arch/m68k/coldfire/device.c:513:50: error: 'MCFEDMA_SIZE' undeclared here (not in a function)
513 | .end = MCFEDMA_BASE + MCFEDMA_SIZE - 1,../arch/m68k/coldfire/device.c:517:35: error: 'MCFEDMA_IRQ_INTR0' undeclared here (not in a function)
517 | .start = MCFEDMA_IRQ_INTR0,../arch/m68k/coldfire/device.c:523:35: error: 'MCFEDMA_IRQ_INTR16' undeclared here (not in a function)
523 | .start = MCFEDMA_IRQ_INTR16,../arch/m68k/coldfire/device.c:529:35: error: 'MCFEDMA_IRQ_INTR56' undeclared here (not in a function)
529 | .start = MCFEDMA_IRQ_INTR56,../arch/m68k/coldfire/device.c:535:35: error: 'MCFEDMA_IRQ_ERR' undeclared here (not in a function)
535 | .start = MCFEDMA_IRQ_ERR,
--- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/coldfire/device.c +3 -3
@@ -480,7 +480,7 @@ static struct platform_device mcf_i2c5 = {#endif /* MCFI2C_BASE5 */ #endif /* IS_ENABLED(CONFIG_I2C_IMX) */ -#if IS_ENABLED (CONFIG_MCF_EDMA ) +#ifdef MCFEDMA_BASE static const struct dma_slave_map mcf_edma_map[] = { { "dreq0", "rx-tx", MCF_EDMA_FILTER_PARAM(0) },
@@ -552,7 +552,7 @@ static struct platform_device mcf_edma = { .platform_data = &mcf_edma_data, } }; -#endif /* IS_ENABLED(CONFIG_MCF_EDMA) */ +#endif /* MCFEDMA_BASE */ #ifdef MCFSDHC_BASE static struct mcf_esdhc_platform_data mcf_esdhc_data = {
@@ -610,7 +610,7 @@ static struct platform_device *mcf_devices[] __initdata = { &mcf_i2c5,#endif #endif -#if IS_ENABLED (CONFIG_MCF_EDMA ) +#ifdef MCFEDMA_BASE &mcf_edma,#endif #ifdef MCFSDHC_BASE
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 237/599 media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit fbe04b49a54e31f4321d632270207f0e6304cd16 ]
If the callback 'start_streaming' fails, then all queued buffers in the driver should be returned with state 'VB2_BUF_STATE_QUEUED'. Currently, they are returned with 'VB2_BUF_STATE_ERROR' which is wrong. Fix this. This also fixes the warning:
[ 65.583633] WARNING: CPU: 5 PID: 593 at drivers/media/common/videobuf2/videobuf2-core.c:1612 vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.585027] Modules linked in: snd_usb_audio snd_hwdep snd_usbmidi_lib snd_rawmidi snd_soc_hdmi_codec dw_hdmi_i2s_audio saa7115 stk1160 videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc crct10dif_ce panfrost snd_soc_simple_card snd_soc_audio_graph_card snd_soc_spdif_tx snd_soc_simple_card_utils gpu_sched phy_rockchip_pcie snd_soc_rockchip_i2s rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi cec drm_kms_helper drm rtc_rk808 rockchip_saradc industrialio_triggered_buffer kfifo_buf rockchip_thermal pcie_rockchip_host ip_tables x_tables ipv6 [ 65.589383] CPU: 5 PID: 593 Comm: v4l2src0:src Tainted: G W 5.16.0-rc4-62408-g32447129cb30-dirty #14 [ 65.590293] Hardware name: Radxa ROCK Pi 4B (DT) [ 65.590696] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 65.591304] pc : vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.591850] lr : vb2_start_streaming+0x6c/0x160 [videobuf2_common] [ 65.592395] sp : ffff800012bc3ad0 [ 65.592685] x29: ffff800012bc3ad0 x28: 0000000000000000 x27: ffff800012bc3cd8 [ 65.593312] x26: 0000000000000000 x25: ffff00000d8a7800 x24: 0000000040045612 [ 65.593938] x23: ffff800011323000 x22: ffff800012bc3cd8 x21: ffff00000908a8b0 [ 65.594562] x20: ffff00000908a8c8 x19: 00000000fffffff4 x18: ffffffffffffffff [ 65.595188] x17: 000000040044ffff x16: 00400034b5503510 x15: ffff800011323f78 [ 65.595813] x14: ffff000013163886 x13: ffff000013163885 x12: 00000000000002ce [ 65.596439] x11: 0000000000000028 x10: 0000000000000001 x9 : 0000000000000228 [ 65.597064] x8 : 0101010101010101 x7 : 7f7f7f7f7f7f7f7f x6 : fefefeff726c5e78 [ 65.597690] x5 : ffff800012bc3990 x4 : 0000000000000000 x3 : ffff000009a34880 [ 65.598315] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff000007cd99f0 [ 65.598940] Call trace: [ 65.599155] vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.599672] vb2_core_streamon+0x17c/0x1a8 [videobuf2_common] [ 65.600179] vb2_streamon+0x54/0x88 [videobuf2_v4l2] [ 65.600619] vb2_ioctl_streamon+0x54/0x60 [videobuf2_v4l2] [ 65.601103] v4l_streamon+0x3c/0x50 [videodev] [ 65.601521] __video_do_ioctl+0x1a4/0x428 [videodev] [ 65.601977] video_usercopy+0x320/0x828 [videodev] [ 65.602419] video_ioctl2+0x3c/0x58 [videodev] [ 65.602830] v4l2_ioctl+0x60/0x90 [videodev] [ 65.603227] __arm64_sys_ioctl+0xa8/0xe0 [ 65.603576] invoke_syscall+0x54/0x118 [ 65.603911] el0_svc_common.constprop.3+0x84/0x100 [ 65.604332] do_el0_svc+0x34/0xa0 [ 65.604625] el0_svc+0x1c/0x50 [ 65.604897] el0t_64_sync_handler+0x88/0xb0 [ 65.605264] el0t_64_sync+0x16c/0x170 [ 65.605587] ---[ end trace 578e0ba07742170d ]---
--- drivers/media/usb/stk1160/stk1160-core.c | 2 +- drivers/media/usb/stk1160/stk1160-v4l.c | 10 +++++----- drivers/media/usb/stk1160/stk1160.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/usb/stk1160/stk1160-core.c +1 -1
@@ -403,7 +403,7 @@ static void stk1160_disconnect(struct usb_interface *interface)/* Here is the only place where isoc get released */ stk1160_uninit_isoc (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );video_unregister_device (&dev->vdev);v4l2_device_disconnect (&dev->v4l2_dev);
drivers/media/usb/stk1160/stk1160-v4l.c +5 -5
@@ -258,7 +258,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)stk1160_uninit_isoc (dev); out_stop_hw:usb_set_interface (dev->udev,0 ,0 ); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_QUEUED );mutex_unlock (&dev->v4l_lock);
@@ -306,7 +306,7 @@ static int stk1160_stop_streaming(struct stk1160 *dev)stk1160_stop_hw (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );stk1160_dbg ("streaming stopped\n" );
@@ -745,7 +745,7 @@ static const struct video_device v4l_template = {/********************************************************************/ /* Must be called with both v4l_lock and vb_queue_lock hold */ -void stk1160_clear_queue (struct stk1160 *dev) +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state) {struct stk1160_buffer *buf;unsigned long flags;
@@ -756,7 +756,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf =list_first_entry (&dev->avail_bufs, struct stk1160_buffer, list);list_del (&buf->list); -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
@@ -766,7 +766,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf = dev->isoc_ctl.buf; dev->isoc_ctl.buf =NULL ; -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
drivers/media/usb/stk1160/stk1160.h +1 -1
@@ -166,7 +166,7 @@ struct regval {int stk1160_vb2_setup (struct stk1160 *dev);int stk1160_video_register (struct stk1160 *dev);void stk1160_video_unregister (struct stk1160 *dev); -void stk1160_clear_queue (struct stk1160 *dev); +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state);/* Provided by stk1160-video.c */ int stk1160_alloc_isoc (struct stk1160 *dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 238/599 media: vidtv: Check for null return of vzalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e6a21a14106d9718aa4f8e115b1e474888eeba44 ]
As the possible failure of the vzalloc(), e->encoder_buf might be NULL. Therefore, it should be better to check it in order
to guarantee the success of the initialization.
If fails, we need to free not only 'e' but also 'e->name'. Also, if the allocation for ctx fails, we need to free 'e->encoder_buf' else.
--- drivers/media/test-drivers/vidtv/vidtv_s302m.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/media/test-drivers/vidtv/vidtv_s302m.c +13 -4
@@ -455,6 +455,9 @@ struct vidtv_encoder e->name =kstrdup (args.name,GFP_KERNEL ); e->encoder_buf =vzalloc (VIDTV_S302M_BUF_SZ ); +if (!e->encoder_buf) + goto out_kfree_e; + e->encoder_buf_sz =VIDTV_S302M_BUF_SZ ; e->encoder_buf_offset =0 ;
@@ -467,10 +470,8 @@ struct vidtv_encoder e->is_video_encoder = false; ctx =kzalloc (priv_sz,GFP_KERNEL ); -if (!ctx) { -kfree (e); -return NULL ; - } +if (!ctx) + goto out_kfree_buf; e->ctx = ctx; ctx->last_duration =0 ;
@@ -498,6 +499,14 @@ struct vidtv_encoder e->next =NULL ;return e; + +out_kfree_buf: +kfree (e->encoder_buf); + +out_kfree_e: +kfree (e->name); +kfree (e); +return NULL ; }void vidtv_s302m_encoder_destroy (struct vidtv_encoder *e)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 239/599 ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f590797fa3c1bccdd19e55441592a23b46aef449 ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function.
Calling of_node_put() to avoid the refcount leak.
--- sound/soc/atmel/sam9g20_wm8731.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/atmel/sam9g20_wm8731.c +1 -0
@@ -214,6 +214,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) cpu_np =of_parse_phandle (np,"atmel,ssc-controller" ,0 );if (!cpu_np) {dev_err (&pdev->dev,"dai and pcm info missing\n" ); +of_node_put (codec_np);return -EINVAL ; } at91sam9g20ek_dai.cpus->of_node = cpu_np;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 240/599 ASoC: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit db0350da8084ad549bca16cc0486c11cc70a1f9b ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, use 'free_' in order to avoid the same code.
--- sound/soc/codecs/wm8350.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8350.c +24 -4
@@ -1536,18 +1536,38 @@ static int wm8350_component_probe(struct snd_soc_component *component)wm8350_clear_bits (wm8350,WM8350_JACK_DETECT ,WM8350_JDL_ENA |WM8350_JDR_ENA ); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , wm8350_hpl_jack_handler,0 ,"Left jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , +if (ret !=0 ) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , wm8350_hpr_jack_handler,0 ,"Right jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , +if (ret !=0 ) + goto free_jck_det_l; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , wm8350_mic_handler,0 ,"Microphone short" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , +if (ret !=0 ) + goto free_jck_det_r; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , wm8350_mic_handler,0 ,"Microphone detect" , priv); +if (ret !=0 ) + goto free_micscd;return 0 ; + +free_micscd: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , priv); +free_jck_det_r: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , priv); +free_jck_det_l: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , priv); +err: +return ret; }static void wm8350_component_remove (struct snd_soc_component *component)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 241/599 ASoC: fsi: Add check for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 405afed8a728f23cfaa02f75bbc8bdd6b7322123 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/sh/fsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
sound/soc/sh/fsi.c +16 -3
@@ -816,14 +816,27 @@ static int fsi_clk_enable(struct device *dev,return ret; } -clk_enable (clock->xck); -clk_enable (clock->ick); -clk_enable (clock->div); + ret =clk_enable (clock->xck); +if (ret) + goto err; + ret =clk_enable (clock->ick); +if (ret) + goto disable_xck; + ret =clk_enable (clock->div); +if (ret) + goto disable_ick; clock->count++; }return ret; + +disable_ick: +clk_disable (clock->ick); +disable_xck: +clk_disable (clock->xck); +err: +return ret; } static int fsi_clk_disable(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 242/599 video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit a58c22cfbbf62fefca090334bbd35fd132e92a23 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c +1 -0
@@ -251,6 +251,7 @@ static int dvic_probe_of(struct platform_device *pdev) adapter_node =of_parse_phandle (node,"ddc-i2c-bus" ,0 );if (adapter_node) { adapter =of_get_i2c_adapter_by_node (adapter_node); +of_node_put (adapter_node);if (adapter ==NULL ) {dev_err (&pdev->dev,"failed to parse ddc-i2c-bus\n" );omap_dss_put_device (ddata->in);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 243/599 media: saa7134: convert list_for_each to entry variant
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 3f3475a5c77e9eabab43537f713b90f1d19258b7 ]
Convert list_for_each() to list_for_each_entry() where applicable.
--- drivers/media/pci/saa7134/saa7134-alsa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/pci/saa7134/saa7134-alsa.c +1 -3
@@ -1215,15 +1215,13 @@ static int alsa_device_exit(struct saa7134_dev *dev)static int saa7134_alsa_init (void ) {struct saa7134_dev *dev =NULL ; -struct list_head *list; saa7134_dmasound_init = alsa_device_init; saa7134_dmasound_exit = alsa_device_exit;pr_info ("saa7134 ALSA driver for DMA sound loaded\n" ); -list_for_each (list,&saa7134_devlist) { - dev = list_entry(list, struct saa7134_dev, devlist); +list_for_each_entry (dev, &saa7134_devlist, devlist) {if (dev->pci->device ==PCI_DEVICE_ID_PHILIPS_SAA7130 )pr_info ("%s/alsa: %s doesn't support digital audio\n" , dev->name, saa7134_boards[dev->board].name);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 244/599 media: saa7134: fix incorrect use to determine if list is empty
In reply to Greg Kroah-HartmanFrom: Jakob Koschel <[email protected]>
[ Upstream commit 9f1f4b642451d35667a4dc6a9c0a89d954b530a3 ]
'dev' will *always* be set by list_for_each_entry().
It is incorrect to assume that the iterator value will be NULL if the list is empty.
Instead of checking the pointer it should be checked if the list is empty.
--- drivers/media/pci/saa7134/saa7134-alsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/saa7134/saa7134-alsa.c +2 -2
@@ -1214,7 +1214,7 @@ static int alsa_device_exit(struct saa7134_dev *dev)static int saa7134_alsa_init (void ) { -struct saa7134_dev *dev =NULL ; +struct saa7134_dev *dev; saa7134_dmasound_init = alsa_device_init; saa7134_dmasound_exit = alsa_device_exit;
@@ -1229,7 +1229,7 @@ static int saa7134_alsa_init(void)alsa_device_init (dev); } -if (dev ==NULL ) +if (list_empty (&saa7134_devlist))pr_info ("saa7134 ALSA: no saa7134 cards found\n" );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 245/599 ivtv: fix incorrect device_caps for ivtvfb
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 25e94139218c0293b4375233c14f2256d7dcfaa8 ]
The VIDIOC_G_FBUF and related overlay ioctls no longer worked (-ENOTTY was returned).
The root cause was the introduction of the caps field in ivtv-driver.h. While loading the ivtvfb module would update the video_device device_caps field with V4L2_CAP_VIDEO_OUTPUT_OVERLAY it would not update that caps field, and that's what the overlay ioctls would look at.
It's a bad idea to keep information in two places, so drop the caps field and only use vdev.device_caps.
--- drivers/media/pci/ivtv/ivtv-driver.h | 1 - drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +++++----- drivers/media/pci/ivtv/ivtv-streams.c | 11 ++++------- 3 files changed, 9 insertions(+), 13 deletions(-)
drivers/media/pci/ivtv/ivtv-driver.h +0 -1
@@ -332,7 +332,6 @@ struct ivtv_stream {struct ivtv *itv;/* for ease of use */ const char *name;/* name of the stream */ int type;/* stream type */ -u32 caps;/* V4L2 capabilities */ struct v4l2_fh *fh;/* pointer to the streaming filehandle */ spinlock_t qlock;/* locks access to the queues */
drivers/media/pci/ivtv/ivtv-ioctl.c +5 -5
@@ -443,7 +443,7 @@ static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_fstruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct v4l2_window *winfmt = &fmt->fmt.win; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -554,7 +554,7 @@ static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2u32 chromakey = fmt->fmt.win.chromakey;u8 global_alpha = fmt->fmt.win.global_alpha; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -1388,7 +1388,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) 0, }; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1455,7 +1455,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffestruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct yuv_playback_info *yi = &itv->yuv_info; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1475,7 +1475,7 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)struct ivtv *itv = id->itv;struct ivtv_stream *s = &itv->streams[fh2id (fh)->type]; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
drivers/media/pci/ivtv/ivtv-streams.c +4 -7
@@ -176,7 +176,7 @@ static void ivtv_stream_init(struct ivtv *itv, int type) s->itv = itv; s->type = type; s->name = ivtv_stream_info[type].name; - s->caps = ivtv_stream_info[type].v4l2_caps; + s->vdev.device_caps = ivtv_stream_info[type].v4l2_caps;if (ivtv_stream_info[type].pio) s->dma =PCI_DMA_NONE ;
@@ -299,12 +299,9 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)if (s_mpg->vdev.v4l2_dev) num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset; } - s->vdev.device_caps = s->caps; -if (itv->osd_video_pbase) { - itv->streams[IVTV_DEC_STREAM_TYPE_YUV ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; - itv->streams[IVTV_DEC_STREAM_TYPE_MPG ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; +if (itv->osd_video_pbase && (type ==IVTV_DEC_STREAM_TYPE_YUV || + type ==IVTV_DEC_STREAM_TYPE_MPG )) { + s->vdev.device_caps |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; itv->v4l2_cap |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; }video_set_drvdata (&s->vdev, s);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 246/599 ASoC: rockchip: i2s: Use devm_platform_get_and_ioremap_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4ffbcd4ab0b6f77d29acde69dc25bd95318fae5e ]
Use devm_platform_get_and_ioremap_resource() to simplify code.
--- sound/soc/rockchip/rockchip_i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +1 -2
@@ -627,8 +627,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)return PTR_ERR (i2s->mclk); } - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - regs =devm_ioremap_resource (&pdev->dev, res); + regs =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (regs))return PTR_ERR (regs);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 247/599 ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f725d20579807a68afbe5dba69e78b8fa05f5ef0 ]
Fix the missing clk_disable_unprepare() before return from rockchip_i2s_probe() in the error handling case.
--- sound/soc/rockchip/rockchip_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +10 -5
@@ -624,19 +624,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->mclk =devm_clk_get (&pdev->dev,"i2s_clk" );if (IS_ERR (i2s->mclk)) {dev_err (&pdev->dev,"Can't retrieve i2s master clock\n" ); -return PTR_ERR (i2s->mclk); + ret =PTR_ERR (i2s->mclk); + goto err_clk; } regs =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (regs)) -return PTR_ERR (regs); +if (IS_ERR (regs)) { + ret =PTR_ERR (regs); + goto err_clk; + } i2s->regmap =devm_regmap_init_mmio (&pdev->dev, regs, &rockchip_i2s_regmap_config);if (IS_ERR (i2s->regmap)) {dev_err (&pdev->dev,"Failed to initialise managed register map\n" ); -return PTR_ERR (i2s->regmap); + ret =PTR_ERR (i2s->regmap); + goto err_clk; } i2s->playback_dma_data.addr = res->start +I2S_TXDR ;
@@ -695,7 +699,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)i2s_runtime_suspend (&pdev->dev); err_pm_disable:pm_runtime_disable (&pdev->dev); - +err_clk: +clk_disable_unprepare (i2s->hclk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 248/599 ASoC: SOF: Add missing of_node_put() in imx8m_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 5575f7f49134c7386a684335c9007737c606d3b5 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- sound/soc/sof/imx/imx8m.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/imx/imx8m.c +1 -0
@@ -191,6 +191,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) } ret =of_address_to_resource (res_node,0 , &res); +of_node_put (res_node);if (ret) {dev_err (&pdev->dev,"failed to get reserved region address\n" ); goto exit_pdev_unregister;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 249/599 ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 ]
Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +3 -3
@@ -83,10 +83,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config)); -if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) { ret =prepare_slave_config (substream, params, &slave_config);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 250/599 ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6ae0a4d8fec551ec581d620f0eb1fe31f755551c ]
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths.
For example, when codec_np is NULL, saif_np[0] and saif_np[1] are not NULL, it will cause leaks.
of_node_put() will check if the node pointer is NULL, so we can call it directly to release the refcount of regular pointers.
--- sound/soc/mxs/mxs-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/mxs/mxs-sgtl5000.c +3 -0
@@ -118,6 +118,9 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) codec_np =of_parse_phandle (np,"audio-codec" ,0 );if (!saif_np[0 ] || !saif_np[1 ] || !codec_np) {dev_err (&pdev->dev,"phandle missing or invalid\n" ); +of_node_put (codec_np); +of_node_put (saif_np[0 ]); +of_node_put (saif_np[1 ]);return -EINVAL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 251/599 ASoC: fsl_spdif: Disable TX clock when stop
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6ddf611219ba8f7c8fa0d26b39710a641e7d37a5 ]
The TX clock source may be changed in next case, need to disable it when stop, otherwise the TX may not work after changing the clock source, error log is:
aplay: pcm_write:2058: write error: Input/output error
--- sound/soc/fsl/fsl_spdif.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/fsl/fsl_spdif.c +2 -0
@@ -544,6 +544,8 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, mask =SCR_TXFIFO_AUTOSYNC_MASK |SCR_TXFIFO_CTRL_MASK |SCR_TXSEL_MASK |SCR_USRC_SEL_MASK |SCR_TXFIFO_FSEL_MASK ; +/* Disable TX clock */ +regmap_update_bits (regmap,REG_SPDIF_STC ,STC_TXCLK_ALL_EN_MASK ,0 ); }else { scr =SCR_RXFIFO_OFF |SCR_RXFIFO_CTL_ZERO ; mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK|
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 252/599 ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
[ Upstream commit 3b891513f95cba3944e72c1139ea706d04f3781b ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/imx-es8328.c +1 -0
@@ -87,6 +87,7 @@ static int imx_es8328_probe(struct platform_device *pdev)if (int_port >MUX_PORT_MAX || int_port ==0 ) {dev_err (dev,"mux-int-port: hardware only has %d mux ports\n" ,MUX_PORT_MAX ); + ret = -EINVAL ; goto fail; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 253/599 ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 375a347da4889f64d86e1ab7f4e6702b6e9bf299 ]
Fix the missing clk_disable_unprepare() before return from msm8916_wcd_digital_probe in the error handling case.
--- sound/soc/codecs/msm8916-wcd-digital.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/msm8916-wcd-digital.c +4 -1
@@ -1201,7 +1201,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) ret =clk_prepare_enable (priv->mclk);if (ret <0 ) {dev_err (dev,"failed to enable mclk %d\n" , ret); -return ret; + goto err_clk; }dev_set_drvdata (dev, priv);
@@ -1209,6 +1209,9 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &msm8916_wcd_digital, msm8916_wcd_digital_dai,ARRAY_SIZE (msm8916_wcd_digital_dai)); +err_clk: +clk_disable_unprepare (priv->ahbclk); +return ret; }static int msm8916_wcd_digital_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 254/599 mmc: davinci_mmc: Handle error for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 09e7af76db02c74f2a339b3cb2d95460fa2ddbe4 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- drivers/mmc/host/davinci_mmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/davinci_mmc.c +5 -1
@@ -1375,8 +1375,12 @@ static int davinci_mmcsd_suspend(struct device *dev)static int davinci_mmcsd_resume (struct device *dev) {struct mmc_davinci_host *host =dev_get_drvdata (dev); +int ret; + + ret =clk_enable (host->clk); +if (ret) +return ret; -clk_enable (host->clk);mmc_davinci_reset_ctrl (host,0 );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 255/599 ASoC: atmel: sam9x5_wm8731: use devm_snd_soc_register_card()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6522a8486c00d130a32a57c6c8a365572958b4df ]
Using devm_snd_soc_register_card() can make the code shorter and cleaner.
--- sound/soc/atmel/sam9x5_wm8731.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/atmel/sam9x5_wm8731.c +1 -2
@@ -159,7 +159,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)of_node_put (codec_np);of_node_put (cpu_np); - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"Platform device allocation failed\n" ); goto out_put_audio;
@@ -180,7 +180,6 @@ static int sam9x5_wm8731_driver_remove(struct platform_device *pdev)struct snd_soc_card *card =platform_get_drvdata (pdev);struct sam9x5_drvdata *priv = card->drvdata; -snd_soc_unregister_card (card);atmel_ssc_put_audio (priv->ssc_id);return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 256/599 ASoC: atmel: Fix error handling in sam9x5_wm8731_driver_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 740dc3e846537c3743da98bf106f376023fd085c ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error path.
--- sound/soc/atmel/sam9x5_wm8731.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
sound/soc/atmel/sam9x5_wm8731.c +7 -6
@@ -142,7 +142,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)if (!cpu_np) {dev_err (&pdev->dev,"atmel,ssc-controller node missing\n" ); ret = -EINVAL ; - goto out; + goto out_put_codec_np; } dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np;
@@ -153,12 +153,9 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)if (ret !=0 ) {dev_err (&pdev->dev,"Failed to set SSC %d for audio: %d\n" , ret, priv->ssc_id); - goto out; + goto out_put_cpu_np; } -of_node_put (codec_np); -of_node_put (cpu_np); - ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"Platform device allocation failed\n" );
@@ -167,10 +164,14 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"%s ok\n" , __func__); -return ret; + goto out_put_cpu_np; out_put_audio:atmel_ssc_put_audio (priv->ssc_id); +out_put_cpu_np: +of_node_put (cpu_np); +out_put_codec_np: +of_node_put (codec_np); out:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 257/599 ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9ebd62d60edcd4d9c75485e5ccd0b79581ad3c49 ]
In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function.
--- sound/soc/codecs/msm8916-wcd-analog.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +16 -6
@@ -1221,8 +1221,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } irq =platform_get_irq_byname (pdev,"mbhc_switch_int" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_mbhc_switch_irq_handler,
@@ -1234,8 +1236,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)if (priv->mbhc_btn_enabled) { irq =platform_get_irq_byname (pdev,"mbhc_but_press_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_press_irq_handler,
@@ -1246,8 +1250,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)dev_err (dev,"cannot request mbhc button press irq\n" ); irq =platform_get_irq_byname (pdev,"mbhc_but_rel_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_release_irq_handler,
@@ -1264,6 +1270,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &pm8916_wcd_analog, pm8916_wcd_analog_dai,ARRAY_SIZE (pm8916_wcd_analog_dai)); + +err_disable_clk: +clk_disable_unprepare (priv->mclk); +return ret; }static int pm8916_wcd_analog_spmi_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 258/599 ASoC: codecs: wcd934x: Add missing of_node_put() in wcd934x_codec_parse_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9531a631379169d57756b2411178c6238655df88 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This is similar to commit 64b92de9603f
("ASoC: wcd9335: fix a leaked reference by adding missing of_node_put")
--- sound/soc/codecs/wcd934x.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wcd934x.c +1 -0
@@ -5047,6 +5047,7 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) } wcd->sidev =of_slim_get_device (wcd->sdev->ctrl, ifc_dev_np); +of_node_put (ifc_dev_np);if (!wcd->sidev) {dev_err (dev,"Unable to get SLIM Interface device\n" );return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 259/599 ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit f5eb04d7a0e419d61f784de3ced708259ddb71d7 ]
Commit 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") introduced CONFIG_MEDIA_PLATFORM_SUPPORT, to allow more fine grained control over the inclusion of certain Kconfig files. multi_v5_defconfig was selecting some drivers described in drivers/media/platform/Kconfig, which now wasn't included anymore.
Explicitly set the new symbol in multi_v5_defconfig to bring those drivers back.
This enables some new V4L2 and VIDEOBUF2 features, but as modules only.
--- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
@@ -187,6 +187,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ASPEED=m CONFIG_VIDEO_ATMEL_ISI=m
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 260/599 drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 04b8a5d9cfd171f65df75f444b5617a372649edd ]
Use this to simplify the driver shutdown. It will also come handy when fixing the error handling in meson_drv_bind_master().
--- drivers/gpu/drm/meson/meson_drv.c | 6 ++-- drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 ++++++++++++++++--------- drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 + 3 files changed, 30 insertions(+), 18 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +2 -4
@@ -396,10 +396,8 @@ static void meson_drv_unbind(struct device *dev)drm_irq_uninstall (drm);drm_dev_put (drm); -if (priv->afbcd.ops) { - priv->afbcd.ops->reset (priv); -meson_rdma_free (priv); - } +if (priv->afbcd.ops) + priv->afbcd.ops->exit (priv); }static const struct component_master_ops meson_drv_master_ops = {
drivers/gpu/drm/meson/meson_osd_afbcd.c +27 -14
78 lines not on this page · raw message
drivers/gpu/drm/meson/meson_osd_afbcd.h +1 -0
@@ -14,6 +14,7 @@struct meson_afbcd_ops {int (*init)(struct meson_drm *priv); +void (*exit)(struct meson_drm *priv);int (*reset)(struct meson_drm *priv);int (*enable)(struct meson_drm *priv);int (*disable)(struct meson_drm *priv);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 261/599 drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7c442e76c06cb1bef16a6c523487438175584eea ]
rc_dev is allocated by rc_allocate_device(), and doesn't assigned to ctx->rc_dev before calling rc_free_device(ctx->rc_dev). So it should call rc_free_device(rc_dev);
--- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -1
@@ -2120,7 +2120,7 @@ static void sii8620_init_rcp_input_dev(struct sii8620 *ctx)if (ret) {dev_err (ctx->dev,"Failed to register RC device\n" ); ctx->error = ret; -rc_free_device (ctx->rc_dev); +rc_free_device (rc_dev);return ; } ctx->rc_dev = rc_dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 262/599 drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 96211b7c56b109a52768e6cc5e23a1f79316eca0 ]
If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable().
Add missing pm_runtime_disable() for __dw_mipi_dsi_probe.
--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
@@ -1172,6 +1172,7 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, ret =mipi_dsi_host_register (&dsi->dsi_host);if (ret) {dev_err (dev,"Failed to register MIPI host: %d\n" , ret); +pm_runtime_disable (dev);dw_mipi_dsi_debugfs_remove (dsi);return ERR_PTR (ret); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 263/599 drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit b146e343a9e05605b491b1bf4a2b62a39d5638d8 ]
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.
--- drivers/gpu/drm/bridge/nwl-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/nwl-dsi.c +1 -0
@@ -1188,6 +1188,7 @@ static int nwl_dsi_probe(struct platform_device *pdev) ret =nwl_dsi_select_input (dsi);if (ret <0 ) { +pm_runtime_disable (dev);mipi_dsi_host_unregister (&dsi->dsi_host);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 264/599 drm: bridge: adv7511: Fix ADV7535 HPD enablement
In reply to Greg Kroah-HartmanFrom: Jagan Teki <[email protected]>
[ Upstream commit 3dbc84a595d17f64f14fcea00120d31e33e98880 ]
Existing HPD enablement logic is not compatible with ADV7535 bridge, thus any runtime plug-in of HDMI cable is not working on these bridge designs.
Unlike other ADV7511 family of bridges, the ADV7535 require HPD_OVERRIDE bit to set and reset for proper handling of HPD functionality.
Fix it.
--- drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29 +++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511.h +1 -0
@@ -169,6 +169,7 @@#define ADV7511_PACKET_ENABLE_SPARE2 BIT(1)#define ADV7511_PACKET_ENABLE_SPARE1 BIT(0) +#define ADV7535_REG_POWER2_HPD_OVERRIDE BIT(6)#define ADV7511_REG_POWER2_HPD_SRC_MASK 0xc0#define ADV7511_REG_POWER2_HPD_SRC_BOTH 0x00#define ADV7511_REG_POWER2_HPD_SRC_HPD 0x40
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +22 -7
@@ -351,11 +351,17 @@ static void __adv7511_power_on(struct adv7511 *adv7511)* from standby or are enabled. When the HPD goes low the adv7511 is * reset and the outputs are disabled which might cause the monitor to * go to standby again. To avoid this we ignore the HPD pin for the -* first few seconds after enabling the output. +* first few seconds after enabling the output. On the other hand +* adv7535 require to enable HPD Override bit for proper HPD. */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HPD_SRC_MASK , -ADV7511_REG_POWER2_HPD_SRC_NONE ); +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE , +ADV7535_REG_POWER2_HPD_OVERRIDE ); +else +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7511_REG_POWER2_HPD_SRC_MASK , +ADV7511_REG_POWER2_HPD_SRC_NONE ); }static void adv7511_power_on (struct adv7511 *adv7511)
@@ -375,6 +381,10 @@ static void adv7511_power_on(struct adv7511 *adv7511)static void __adv7511_power_off (struct adv7511 *adv7511) {/* TODO: setup additional power down modes */ +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE ,0 ); +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER ,ADV7511_POWER_POWER_DOWN ,ADV7511_POWER_POWER_DOWN );
@@ -672,9 +682,14 @@ adv7511_detect(struct adv7511 *adv7511, struct drm_connector *connector) status = connector_status_disconnected; }else {/* Renable HPD sensing */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HPD_SRC_MASK , -ADV7511_REG_POWER2_HPD_SRC_BOTH ); +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE , +ADV7535_REG_POWER2_HPD_OVERRIDE ); +else +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7511_REG_POWER2_HPD_SRC_MASK , +ADV7511_REG_POWER2_HPD_SRC_BOTH ); } adv7511->status = status;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 265/599 ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
[ Upstream commit e3fb3d4418fce5484dfe7995fcd94c18b10a431a ]
In function ath10k_wow_convert_8023_to_80211(), it will do memcpy for the new->pattern, and currently the new->pattern and new->mask is same with the old, then the memcpy of new->pattern will also overwrite the old->pattern, because the header format of new->pattern is 802.11, its length is larger than the old->pattern which is 802.3. Then the operation of "Copy frame body" will copy a mistake value because the body memory has been overwrite when memcpy the new->pattern.
Assign another empty value to new_pattern to avoid the overwrite issue.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/wow.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/wow.c +4 -3
@@ -337,14 +337,15 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,if (patterns[i].mask[j /8 ] &BIT (j %8 )) bitmask[j] =0xff ; old_pattern.mask = bitmask; - new_pattern = old_pattern;if (ar->wmi.rx_decap_mode ==ATH10K_HW_TXRX_NATIVE_WIFI ) { -if (patterns[i].pkt_offset <ETH_HLEN ) +if (patterns[i].pkt_offset <ETH_HLEN ) {ath10k_wow_convert_8023_to_80211 (&new_pattern, &old_pattern); -else + }else { + new_pattern = old_pattern; new_pattern.pkt_offset +=WOW_HDR_LEN -ETH_HLEN ; + } }if (WARN_ON (new_pattern.pattern_len >WOW_MAX_PATTERN_SIZE ))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 266/599 drm/panfrost: Check for error num after setting mask
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 44ab30b056149bd59dd7989a593dd25ead6007fd ]
Because of the possible failure of the dma_supported(), the dma_set_mask_and_coherent() may return error num. Therefore, it should be better to check it and return the error if fails.
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +4 -1
@@ -359,8 +359,11 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)panfrost_gpu_init_features (pfdev); -dma_set_mask_and_coherent (pfdev->dev, + err =dma_set_mask_and_coherent (pfdev->dev,DMA_BIT_MASK (FIELD_GET (0xff00 , pfdev->features.mmu_features))); +if (err) +return err; +dma_set_max_seg_size (pfdev->dev,UINT_MAX ); irq =platform_get_irq_byname (to_platform_device (pfdev->dev),"gpu" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 267/599 libbpf: Fix possible NULL pointer dereference when destroying skeleton
In reply to Greg Kroah-HartmanFrom: Yafang Shao <[email protected]>
[ Upstream commit a32ea51a3f17ce6524c9fc19d311e708331c8b5f ]
When I checked the code in skeleton header file generated with my own bpf prog, I found there may be possible NULL pointer dereference when destroying skeleton. Then I checked the in-tree bpf progs, finding that is a common issue. Let's take the generated samples/bpf/xdp_redirect_cpu.skel.h for example. Below is the generated code in xdp_redirect_cpu__create_skeleton():
xdp_redirect_cpu__create_skeleton struct bpf_object_skeleton *s; s = (struct bpf_object_skeleton *)calloc(1, sizeof(*s)); if (!s) goto error; ... error: bpf_object__destroy_skeleton(s); return -ENOMEM;
After goto error, the NULL 's' will be deferenced in bpf_object__destroy_skeleton().
We can simply fix this issue by just adding a NULL check in bpf_object__destroy_skeleton().
--- tools/lib/bpf/libbpf.c | 3 +++ 1 file changed, 3 insertions(+)
tools/lib/bpf/libbpf.c +3 -0
@@ -10923,6 +10923,9 @@ void bpf_object__detach_skeleton(struct bpf_object_skeleton *s)void bpf_object__destroy_skeleton (struct bpf_object_skeleton *s) { +if (!s) +return ; +if (s->progs)bpf_object__detach_skeleton (s);if (s->obj)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 268/599 udmabuf: validate ubuf->pagecount
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 2b6dd600dd72573c23ea180b5b0b2f1813405882 ]
Syzbot has reported GPF in sg_alloc_append_table_from_pages(). The problem was in ubuf->pages == ZERO_PTR.
ubuf->pagecount is calculated from arguments passed from user-space. If user creates udmabuf with list.size == 0 then ubuf->pagecount will be also equal to zero; it causes kmalloc_array() to return ZERO_PTR.
Fix it by validating ubuf->pagecount before passing it to kmalloc_array().
--- drivers/dma-buf/udmabuf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma-buf/udmabuf.c +4 -0
@@ -181,6 +181,10 @@ static long udmabuf_create(struct miscdevice *device,if (ubuf->pagecount > pglimit) goto err; } + +if (!ubuf->pagecount) + goto err; + ubuf->pages =kmalloc_array (ubuf->pagecount,sizeof (*ubuf->pages),GFP_KERNEL );if (!ubuf->pages) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 269/599 Bluetooth: hci_serdev: call init_rwsem() before p->open()
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 9d7cbe2b9cf5f650067df4f402fdd799d4bbb4e1 ]
kvartet reported, that hci_uart_tx_wakeup() uses uninitialized rwsem. The problem was in wrong place for percpu_init_rwsem() call.
hci_uart_proto::open() may register a timer whose callback may call hci_uart_tx_wakeup(). There is a chance, that hci_uart_register_device() thread won't be fast enough to call percpu_init_rwsem().
Fix it my moving percpu_init_rwsem() call before p->open().
INFO: trying to register non-static key.
The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator.
CPU: 2 PID: 18524 Comm: syz-executor.5 Not tainted 5.16.0-rc6 #9 ... Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 assign_lock_key kernel/locking/lockdep.c:951 [inline] register_lock_class+0x148d/0x1950 kernel/locking/lockdep.c:1263 __lock_acquire+0x106/0x57e0 kernel/locking/lockdep.c:4906 lock_acquire kernel/locking/lockdep.c:5637 [inline] lock_acquire+0x1ab/0x520 kernel/locking/lockdep.c:5602 percpu_down_read_trylock include/linux/percpu-rwsem.h:92 [inline] hci_uart_tx_wakeup+0x12e/0x490 drivers/bluetooth/hci_ldisc.c:124 h5_timed_event+0x32f/0x6a0 drivers/bluetooth/hci_h5.c:188 call_timer_fn+0x1a5/0x6b0 kernel/time/timer.c:1421
--- drivers/bluetooth/hci_serdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_serdev.c +2 -1
@@ -305,6 +305,8 @@ int hci_uart_register_device(struct hci_uart *hu,if (err)return err; +percpu_init_rwsem (&hu->proto_lock); + err = p->open (hu);if (err) goto err_open;
@@ -327,7 +329,6 @@ int hci_uart_register_device(struct hci_uart *hu,INIT_WORK (&hu->init_ready, hci_uart_init_work);INIT_WORK (&hu->write_work, hci_uart_write_work); -percpu_init_rwsem (&hu->proto_lock);/* Only when vendor specific setup callback is provided, consider * the manufacturer information valid. This avoids filling in the
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 270/599 mtd: onenand: Check for error irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 3e68f331c8c759c0daa31cc92c3449b23119a215 ]
For the possible failure of the platform_get_irq(), the returned irq could be error number and will finally cause the failure of the request_irq().
Consider that platform_get_irq() can now in certain cases return -EPROBE_DEFER, and the consequences of letting request_irq() effectively convert that into -EINVAL, even at probe time rather than later on. So it might be better to check just now.
--- drivers/mtd/nand/onenand/generic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/generic.c +6 -1
@@ -53,7 +53,12 @@ static int generic_onenand_probe(struct platform_device *pdev) } info->onenand.mmcontrol = pdata ? pdata->mmcontrol :NULL ; - info->onenand.irq =platform_get_irq (pdev,0 ); + + err =platform_get_irq (pdev,0 ); +if (err <0 ) + goto out_iounmap; + + info->onenand.irq = err; info->mtd.dev.parent = &pdev->dev; info->mtd.priv = &info->onenand;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 271/599 mtd: rawnand: gpmi: fix controller timings setting
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 2970bf5a32f079e1e9197411db4fe9faccb1503a ]
Set the controller registers according to the real clock rate. The controller registers configuration (setup, hold, timeout, ... cycles) depends on the clock rate of the GPMI. Using the real rate instead of the ideal one, avoids that this inaccuracy (required_rate - real_rate) affects the registers setting.
This patch has been tested on two custom boards with i.MX28 and i.MX6 SOCs:
- i.MX28:
required rate 100MHz, real rate 99.3MHz
- i.MX6
required rate 100MHz, real rate 99MHz
--- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +3 -0
@@ -646,6 +646,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, const struct nand_sdr_timings *sdr) {struct gpmi_nfc_hardware_timing *hw = &this->hw; +struct resources *r = &this->resources;unsigned int dll_threshold_ps = this->devdata->max_chain_delay;unsigned int period_ps, reference_period_ps;unsigned int data_setup_cycles, data_hold_cycles, addr_setup_cycles;
@@ -669,6 +670,8 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, wrn_dly_sel =BV_GPMI_CTRL1_WRN_DLY_SEL_NO_DELAY ; } + hw->clk_rate =clk_round_rate (r->clock[0 ], hw->clk_rate); +/* SDR core timings are given in picoseconds */ period_ps =div_u64 ((u64 )NSEC_PER_SEC *1000 , hw->clk_rate);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 272/599 drm/edid: Dont clear formats if using deep color
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 75478b3b393bcbdca4e6da76fe3a9f1a4133ec5d ]
The current code, when parsing the EDID Deep Color depths, that the YUV422 cannot be used, referring to the HDMI 1.3 Specification.
This specification, in its section 6.2.4, indeed states:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is not permitted for any Deep Color mode.
This indeed can be interpreted like the code does, but the HDMI 1.4 specification further clarifies that statement in its section 6.2.4:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is also 36-bit mode but does not require the further use of the Deep Color modes described in section 6.5.2 and 6.5.3.
This means that, even though YUV422 can be used with 12 bit per color, it shouldn't be treated as a deep color mode.
This is also broken with YUV444 if it's supported by the display, but DRM_EDID_HDMI_DC_Y444 isn't set. In such a case, the code will clear color_formats of the YUV444 support set previously in drm_parse_cea_ext(), but will not set it back.
Since the formats supported are already setup properly in drm_parse_cea_ext(), let's just remove the code modifying the formats in drm_parse_hdmi_deep_color_info()
--- drivers/gpu/drm/drm_edid.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -8
@@ -4960,16 +4960,8 @@ static void drm_parse_hdmi_deep_color_in connector->name, dc_bpc); info->bpc = dc_bpc; -/* -* Deep color support mandates RGB444 support for all video -* modes and forbids YCRCB422 support for all video modes per -* HDMI 1.3 spec. -*/ - info->color_formats =DRM_COLOR_FORMAT_RGB444 ; -/* YCRCB444 is optional according to spec. */ if (hdmi[6 ] &DRM_EDID_HDMI_DC_Y444 ) { - info->color_formats |=DRM_COLOR_FORMAT_YCRCB444 ;DRM_DEBUG ("%s: HDMI sink does YCRCB444 in deep color.\n" , connector->name); }
Greg Kroah-Hartman
maintainerPATCH 273/599 ionic: fix type complaint in ionic_dev_cmd_clean()
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit bc0bf9de6f48268f4ee59e57fb42ac751be3ecda ]
Sparse seems to have gotten a little more picky lately and we need to revisit this bit of code to make sparse happy.
warning: incorrect type in initializer (different address spaces)
expected union ionic_dev_cmd_regs *regs
got union ionic_dev_cmd_regs [noderef] __iomem *dev_cmd_regs
warning: incorrect type in argument 2 (different address spaces)
expected void [noderef] __iomem *
got unsigned int *
warning: incorrect type in argument 1 (different address spaces)
expected void volatile [noderef] __iomem *
got union ionic_dev_cmd *
--- drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_main.c +3 -3
@@ -311,10 +311,10 @@ int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)static void ionic_dev_cmd_clean (struct ionic *ionic) { -union __iomem ionic_dev_cmd_regs *regs = ionic->idev.dev_cmd_regs; +struct ionic_dev *idev = &ionic->idev; -iowrite32 (0 , ®s->doorbell); -memset_io (®s->cmd,0 ,sizeof (regs->cmd)); +iowrite32 (0 , &idev->dev_cmd_regs->doorbell); +memset_io (&idev->dev_cmd_regs->cmd,0 ,sizeof (idev->dev_cmd_regs->cmd)); }int ionic_dev_cmd_wait (struct ionic *ionic,unsigned long max_seconds)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 274/599 drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 2343bcdb4747d4f418a4daf2e898b94f86c24a59 ]
In nvkm_acr_hsfw_load_bl(), the return value of kmalloc() is directly passed to memcpy(), which could lead to undefined behavior on failure of kmalloc().
Fix this bug by using kmemdup() instead of kmalloc()+memcpy().
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c +5 -4
@@ -142,11 +142,12 @@ nvkm_acr_hsfw_load_bl(struct nvkm_acr *acr, const char *name, int ver, hsfw->imem_size = desc->code_size; hsfw->imem_tag = desc->start_tag; - hsfw->imem =kmalloc (desc->code_size,GFP_KERNEL ); -memcpy (hsfw->imem, data + desc->code_off, desc->code_size); - + hsfw->imem =kmemdup (data + desc->code_off, desc->code_size,GFP_KERNEL );nvkm_firmware_put (fw); -return 0 ; +if (!hsfw->imem) +return -ENOMEM ; +else +return 0 ; }int
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 275/599 drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 588a70177df3b1777484267584ef38ab2ca899a2 ]
In amdgpu_dm_connector_add_common_modes(), amdgpu_dm_create_common_mode() is assigned to mode and is passed to drm_mode_probed_add() directly after that. drm_mode_probed_add() passes &mode->head to list_add_tail(), and there is a dereference of it in list_add_tail() without recoveries, which could lead to NULL pointer dereference on failure of amdgpu_dm_create_common_mode().
Fix this by adding a NULL check of mode.
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -6396,6 +6396,9 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder, mode =amdgpu_dm_create_common_mode (encoder, common_modes[i].name, common_modes[i].w, common_modes[i].h); +if (!mode) +continue ; +drm_mode_probed_add (connector, mode); amdgpu_dm_connector->num_modes++; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 276/599 drm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 430e6a0212b2a0eb1de5e9d47a016fa79edf3978 ]
clang static analysis reports this represenative problem amdgpu_smu.c:144:18: warning: The left operand of '*' is a garbage value
return clk_freq * 100;
~~~~~~~~ ^If there is no get_dpm_ultimate_freq function, smu_get_dpm_freq_range returns success without setting the output min,max parameters. So return an -ENOTSUPP error.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -115,7 +115,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu,uint32_t *min, uint32_t *max) { - int ret = 0; + int ret = -ENOTSUPP;if (!min && !max)return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 277/599 ath9k_htc: fix uninit value bugs
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit d1e0df1c57bd30871dd1c855742a7c346dbca853 ]
Syzbot reported 2 KMSAN bugs in ath9k. All of them are caused by missing field initialization.
In htc_connect_service() svc_meta_len and pad are not initialized. Based on code it looks like in current skb there is no service data, so simply initialize svc_meta_len to 0.
htc_issue_send() does not initialize htc_frame_hdr::control array. Based on firmware code, it will initialize it by itself, so simply zero whole array to make KMSAN happy
Fail logs:
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 4-7 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 16-17 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath9k/htc_hst.c +5 -0
@@ -30,6 +30,7 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, hdr->endpoint_id = epid; hdr->flags = flags; hdr->payload_len =cpu_to_be16 (len); +memset (hdr->control,0 ,sizeof (hdr->control)); status = target->hif->send (target->hif_dev, endpoint->ul_pipeid, skb);
@@ -272,6 +273,10 @@ int htc_connect_service(struct htc_target *target, conn_msg->dl_pipeid = endpoint->dl_pipeid; conn_msg->ul_pipeid = endpoint->ul_pipeid; +/* To prevent infoleak */ + conn_msg->svc_meta_len =0 ; + conn_msg->pad =0 ; + ret =htc_issue_send (target, skb, skb->len,0 ,ENDPOINT0 );if (ret) goto err;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 278/599 RDMA/core: Set MR type in ib_reg_user_mr
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
[ Upstream commit 32a88d16615c2be295571c29273c4ac94cb75309 ]
Add missing assignment of MR type to IB_MR_TYPE_USER.
--- drivers/infiniband/core/verbs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/verbs.c +1 -0
@@ -2078,6 +2078,7 @@ struct ib_mr *ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,return mr; mr->device = pd->device; + mr->type =IB_MR_TYPE_USER ; mr->pd = pd; mr->dm =NULL ;atomic_inc (&pd->usecnt);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 279/599 KVM: PPC: Fix vmx/vsx mixup in mmio emulation
In reply to Greg Kroah-HartmanFrom: Fabiano Rosas <[email protected]>
[ Upstream commit b99234b918c6e36b9aa0a5b2981e86b6bd11f8e2 ]
The MMIO emulation code for vector instructions is duplicated between VSX and VMX. When emulating VMX we should check the VMX copy size instead of the VSX one.
--- arch/powerpc/kvm/powerpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/powerpc.c +2 -2
@@ -1500,7 +1500,7 @@ int kvmppc_handle_vmx_load(struct kvm_vcpu *vcpu, {enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ;while (vcpu->arch.mmio_vmx_copy_nums) {
@@ -1597,7 +1597,7 @@ int kvmppc_handle_vmx_store(struct kvm_vcpu *vcpu,unsigned int index = rs &KVM_MMIO_REG_MASK ;enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ; vcpu->arch.io_gpr = rs;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 280/599 i40e: dont reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit bc97f9c6f988b31b728eb47a94ca825401dbeffe ]
{__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD
+ NET_IP_ALIGN for any skb.
OTOH, i40e_construct_skb_zc() currently allocates and reserves additional xdp->data - xdp->data_hard_start, which is XDP_PACKET_HEADROOM for XSK frames.
There's no need for that at all as the frame is post-XDP and will go only to the networking stack core.
Pass the size of the actual data only to __napi_alloc_skb() and don't reserve anything. This will give enough headroom for stack processing.
--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_xsk.c +1 -3
@@ -252,13 +252,11 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,struct sk_buff *skb;/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, - xdp->data_end - xdp->data_hard_start, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -skb_reserve (skb, xdp->data - xdp->data_hard_start);memcpy (__skb_put (skb, datasize), xdp->data, datasize);if (metasize)skb_metadata_set (skb, metasize);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 281/599 i40e: respect metadata on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 6dba29537c0f639b482bd8f8bbd50ab4ae74b48d ]
For now, if the XDP prog returns XDP_PASS on XSK, the metadata will be lost as it doesn't get copied to the skb.
Copy it along with the frame headers. Account its size on skb allocation, and when copying just treat it as a part of the frame and do a pull after to "move" it to the "reserved" zone.
net_prefetch() xdp->data_meta and align the copy size to speed-up memcpy() a little and better match i40e_construct_skb().
--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_xsk.c +10 -4
@@ -247,19 +247,25 @@ bool i40e_alloc_rx_buffers_zc(struct i40e_ring *rx_ring, u16 count)static struct sk_buff *i40e_construct_skb_zc (struct i40e_ring *rx_ring,struct xdp_buff *xdp) { +unsigned int totalsize = xdp->data_end - xdp->data_meta;unsigned int metasize = xdp->data - xdp->data_meta; -unsigned int datasize = xdp->data_end - xdp->data;struct sk_buff *skb; +net_prefetch (xdp->data_meta); +/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, totalsize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -memcpy (__skb_put (skb, datasize), xdp->data, datasize); -if (metasize) +memcpy (__skb_put (skb, totalsize), xdp->data_meta, +ALIGN (totalsize,sizeof (long ))); + +if (metasize) {skb_metadata_set (skb, metasize); +__skb_pull (skb, metasize); + }xsk_buff_free (xdp);return skb;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 282/599 power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ba18dad0fb880cd29aa97b6b75560ef14d1061ba ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/power/reset/gemini-poweroff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/reset/gemini-poweroff.c +2 -2
@@ -107,8 +107,8 @@ static int gemini_poweroff_probe(struct platform_device *pdev)return PTR_ERR (gpw->base); irq =platform_get_irq (pdev,0 ); -if (!irq) -return -EINVAL ; +if (irq <0 ) +return irq; gpw->dev = dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 283/599 ray_cs: Check ioremap return value
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 7e4760713391ee46dc913194b33ae234389a174e ]
As the possible failure of the ioremap(), the 'local->sram' and other two could be NULL.
Therefore it should be better to check it in order to avoid the later dev_dbg.
--- drivers/net/wireless/ray_cs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ray_cs.c +6 -0
@@ -382,6 +382,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->sram =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); +if (!local->sram) + goto failed;/*** Set up 16k window for shared memory (receive buffer) ***************/ link->resource[3]->flags |=
@@ -396,6 +398,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->rmem =ioremap (link->resource[3 ]->start,resource_size (link->resource[3 ])); +if (!local->rmem) + goto failed;/*** Set up window for attribute memory ***********************************/ link->resource[4]->flags |=
@@ -410,6 +414,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->amem =ioremap (link->resource[4 ]->start,resource_size (link->resource[4 ])); +if (!local->amem) + goto failed;dev_dbg (&link->dev,"ray_config sram=%p\n" , local->sram);dev_dbg (&link->dev,"ray_config rmem=%p\n" , local->rmem);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 284/599 powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch
In reply to Greg Kroah-HartmanFrom: Maxim Kiselev <[email protected]>
[ Upstream commit 5ebb74749202a25da4b3cc2eb15470225a05527c ]
On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.
This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.
This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.
--- arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++++++++++++++++++++ arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 +++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * T1040RDB-REV-A Device Tree Source + * + * Copyright 2014 - 2015 Freescale Semiconductor Inc. + * + */ + +#include "t1040rdb.dts" + +/ { + model = "fsl,T1040RDB-REV-A"; + compatible = "fsl,T1040RDB-REV-A"; +}; + +&seville_port0 { + label = "ETH5"; +}; + +&seville_port2 { + label = "ETH7"; +}; + +&seville_port4 { + label = "ETH9"; +}; + +&seville_port6 { + label = "ETH11"; +};
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
@@ -119,7 +119,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_0>; phy-mode = "qsgmii"; - label = "ETH5"; + label = "ETH3"; status = "okay"; };
@@ -135,7 +135,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_2>; phy-mode = "qsgmii"; - label = "ETH7"; + label = "ETH5"; status = "okay"; };
@@ -151,7 +151,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_4>; phy-mode = "qsgmii"; - label = "ETH9"; + label = "ETH7"; status = "okay"; };
@@ -167,7 +167,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_6>; phy-mode = "qsgmii"; - label = "ETH11"; + label = "ETH9"; status = "okay"; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 285/599 KVM: PPC: Book3S HV: Check return value of kvmppc_radix_init
In reply to Greg Kroah-HartmanFrom: Fabiano Rosas <[email protected]>
[ Upstream commit 69ab6ac380a00244575de02c406dcb9491bf3368 ]
The return of the function is being shadowed by the call to kvmppc_uvmem_init.
--- arch/powerpc/kvm/book3s_hv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +4 -1
@@ -5752,8 +5752,11 @@ static int kvmppc_book3s_init_hv(void)if (r)return r; -if (kvmppc_radix_possible ()) +if (kvmppc_radix_possible ()) { r =kvmppc_radix_init (); +if (r) +return r; + }/* * POWER9 chips before version 2.02 can't have some threads in
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 286/599 powerpc/perf: Dont use perf_hw_context for trace IMC PMU
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 0198322379c25215b2778482bf1221743a76e2b5 ]
Trace IMC (In-Memory collection counters) in powerpc is useful for application level profiling.
For trace_imc, presently task context (task_ctx_nr) is set to perf_hw_context. But perf_hw_context should only be used for CPU PMU. See commit 26657848502b ("perf/core: Verify we have a single perf_hw_context PMU").
So for trace_imc, even though it is per thread PMU, it is preferred to use sw_context in order to be able to do application level monitoring. Hence change the task_ctx_nr to use perf_sw_context.
--- arch/powerpc/perf/imc-pmu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/powerpc/perf/imc-pmu.c +5 -1
@@ -1457,7 +1457,11 @@ static int trace_imc_event_init(struct perf_event *event) event->hw.idx =-1 ; - event->pmu->task_ctx_nr = perf_hw_context; +/* +* There can only be a single PMU for perf_hw_context events which is assigned to +* core PMU. Hence use "perf_sw_context" for trace_imc. +*/ + event->pmu->task_ctx_nr = perf_sw_context; event->destroy = reset_global_refc;return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 287/599 mt76: mt7915: use proper aid value in mt7915_mcu_wtbl_generic_tlv in sta mode
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit a56b1b0f145ef2d6bb9312dedf3ab8558ef50a5b ]
mac80211 provides aid in vif->bss_conf.aid for sta mode and not in sta->aid. Fix mt7915_mcu_wtbl_generic_tlv routine using proper value for aid in sta mode.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +4 -1
@@ -1259,8 +1259,11 @@ mt7915_mcu_wtbl_generic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, generic = (struct wtbl_generic *)tlv;if (sta) { +if (vif->type ==NL80211_IFTYPE_STATION ) + generic->partial_aid =cpu_to_le16 (vif->bss_conf.aid); +else + generic->partial_aid =cpu_to_le16 (sta->aid);memcpy (generic->peer_addr, sta->addr,ETH_ALEN ); - generic->partial_aid =cpu_to_le16 (sta->aid); generic->muar_idx = mvif->omac_idx; generic->qos = sta->wme; }else {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 288/599 mt76: mt7915: use proper aid value in mt7915_mcu_sta_basic_tlv
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit abdb8bc94be4cf68aa71c9a8ee0bad9b3e6f52d3 ]
Similar to mt7915_mcu_wtbl_generic_tlv, rely on vif->bss_conf.aid for aid in sta mode and not on sta->aid.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +3 -1
@@ -1317,12 +1317,15 @@ mt7915_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,case NL80211_IFTYPE_MESH_POINT :case NL80211_IFTYPE_AP : basic->conn_type =cpu_to_le32 (CONNECTION_INFRA_STA ); + basic->aid =cpu_to_le16 (sta->aid);break ;case NL80211_IFTYPE_STATION : basic->conn_type =cpu_to_le32 (CONNECTION_INFRA_AP ); + basic->aid =cpu_to_le16 (vif->bss_conf.aid);break ;case NL80211_IFTYPE_ADHOC : basic->conn_type =cpu_to_le32 (CONNECTION_IBSS_ADHOC ); + basic->aid =cpu_to_le16 (sta->aid);break ;default :WARN_ON (1 );
@@ -1330,7 +1333,6 @@ mt7915_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, }memcpy (basic->peer_addr, sta->addr,ETH_ALEN ); - basic->aid =cpu_to_le16 (sta->aid); basic->qos = sta->wme; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 289/599 mt76: mt7603: check sta_rates pointer in mt7603_sta_rate_tbl_update
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit fc8e2c707ce11c8ec2e992885b0d53a5e04031ac ]
Check sta_rates pointer value in mt7603_sta_rate_tbl_update routine since minstrel_ht_update_rates can fail allocating rates array.
--- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/main.c +3 -0
@@ -618,6 +618,9 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct ieee80211_sta_rates *sta_rates =rcu_dereference (sta->rates);int i; +if (!sta_rates) +return ; +spin_lock_bh (&dev->mt76.lock);for (i =0 ; i <ARRAY_SIZE (msta->rates); i++) { msta->rates[i].idx = sta_rates->rate[i].idx;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 290/599 mt76: mt7615: check sta_rates pointer in mt7615_sta_rate_tbl_update
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 6a6f457ed5fdf6777536c20644a9e42128a50ec2 ]
Check sta_rates pointer value in mt7615_sta_rate_tbl_update routine since minstrel_ht_update_rates can fail allocating rates array.
--- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -0
@@ -673,6 +673,9 @@ static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,struct ieee80211_sta_rates *sta_rates =rcu_dereference (sta->rates);int i; +if (!sta_rates) +return ; +spin_lock_bh (&dev->mt76.lock);for (i =0 ; i <ARRAY_SIZE (msta->rates); i++) { msta->rates[i].idx = sta_rates->rate[i].idx;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 291/599 net: dsa: mv88e6xxx: Enable port policy support on 6097
In reply to Greg Kroah-HartmanFrom: Tobias Waldekranz <[email protected]>
[ Upstream commit 585d42bb57bb358d48906660a8de273b078810b1 ]
This chip has support for the same per-port policy actions found in later versions of LinkStreet devices.
--- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/mv88e6xxx/chip.c +1 -0
@@ -3297,6 +3297,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { .port_set_link = mv88e6xxx_port_set_link, .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods, .port_set_ether_type = mv88e6351_port_set_ether_type,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 292/599 scripts/dtc: Call pkg-config POSIXly correct
In reply to Greg Kroah-HartmanFrom: Thomas Bracht Laumann Jespersen <[email protected]>
[ Upstream commit a8b309ce9760943486e0585285e0125588a31650 ]
Running with POSIXLY_CORRECT=1 in the environment the scripts/dtc build fails, because pkg-config doesn't output anything when the flags come after the arguments.
--- scripts/dtc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/dtc/Makefile +1 -1
@@ -22,7 +22,7 @@ dtc-objs += yamltree.o # To include <yaml.h> installed in a non-default path HOSTCFLAGS_yamltree.o := $(shell pkg-config --cflags yaml-0.1) # To link libyaml installed in a non-default path -HOSTLDLIBS_dtc := $(shell pkg-config yaml-0.1 --libs) +HOSTLDLIBS_dtc := $(shell pkg-config --libs yaml-0.1) endif # Generated files need one more search path to include headers in source tree
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 293/599 livepatch: Fix build failure on 32 bits processors
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 2f293651eca3eacaeb56747dede31edace7329d2 ]
Trying to build livepatch on powerpc/32 results in:
kernel/livepatch/core.c: In function 'klp_resolve_symbols':
kernel/livepatch/core.c:221:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
221 | sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
| ^
kernel/livepatch/core.c:221:21: error: assignment to 'Elf32_Sym *' {aka 'struct elf32_sym *'} from incompatible pointer type 'Elf64_Sym *' {aka 'struct elf64_sym *'} [-Werror=incompatible-pointer-types]
221 | sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
| ^
kernel/livepatch/core.c: In function 'klp_apply_section_relocs':
kernel/livepatch/core.c:312:35: error: passing argument 1 of 'klp_resolve_symbols' from incompatible pointer type [-Werror=incompatible-pointer-types]
312 | ret = klp_resolve_symbols(sechdrs, strtab, symndx, sec, sec_objname);
| ^~~~~~~
| |
| Elf32_Shdr * {aka struct elf32_shdr *}
kernel/livepatch/core.c:193:44: note: expected 'Elf64_Shdr *' {aka 'struct elf64_shdr *'} but argument is of type 'Elf32_Shdr *' {aka 'struct elf32_shdr *'}
193 | static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab,
| ~~~~~~~~~~~~^~~~~~~Fix it by using the right types instead of forcing 64 bits types.
--- kernel/livepatch/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/livepatch/core.c +2 -2
@@ -191,7 +191,7 @@ static int klp_find_object_symbol(const char *objname, const char *name,return -EINVAL ; } -static int klp_resolve_symbols (Elf64_Shdr *sechdrs,const char *strtab, +static int klp_resolve_symbols (Elf_Shdr *sechdrs,const char *strtab,unsigned int symndx,Elf_Shdr *relasec,const char *sec_objname) {
@@ -219,7 +219,7 @@ static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab, relas = (Elf_Rela *) relasec->sh_addr;/* For each rela in this klp relocation section */ for (i =0 ; i < relasec->sh_size /sizeof (Elf_Rela); i++) { - sym = (Elf64_Sym *)sechdrs[symndx].sh_addr +ELF_R_SYM (relas[i].r_info); + sym = (Elf_Sym *)sechdrs[symndx].sh_addr +ELF_R_SYM (relas[i].r_info);if (sym->st_shndx !=SHN_LIVEPATCH ) {pr_err ("symbol %s is not marked as a livepatch symbol\n" , strtab + sym->st_name);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 294/599 PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 735f5ae49e1b44742cc63ca9b5c1ffde3e94ba91 ]
The emulated bridge returns incorrect value for PCI_EXP_RTSTA register during readout in advk_pci_bridge_emul_pcie_conf_read() function: the correct bit is BIT(16), but we are setting BIT(23), because the code does
*value = (isr0 & PCIE_MSG_PM_PME_MASK) << 16
where
PCIE_MSG_PM_PME_MASK
is
BIT(7).
The code should probably have been something like
*value = (!!(isr0 & PCIE_MSG_PM_PME_MASK)) << 16,
but we are better of using an if() and using the proper macro for this bit.
--- drivers/pci/controller/pci-aardvark.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-aardvark.c +3 -1
@@ -851,7 +851,9 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,case PCI_EXP_RTSTA : {u32 isr0 =advk_readl (pcie,PCIE_ISR0_REG );u32 msglog =advk_readl (pcie,PCIE_MSG_LOG_REG ); - *value = (isr0 &PCIE_MSG_PM_PME_MASK ) <<16 | (msglog >>16 ); + *value = msglog >>16 ; +if (isr0 &PCIE_MSG_PM_PME_MASK ) + *value |=PCI_EXP_RTSTA_PME ;return PCI_BRIDGE_EMUL_HANDLED ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 295/599 drm/bridge: dw-hdmi: use safe format when first in bridge chain
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit 1528038385c0a706aac9ac165eeb24044fef6825 ]
When the dw-hdmi bridge is in first place of the bridge chain, this means there is no way to select an input format of the dw-hdmi HW component.
Since introduction of display-connector, negotiation was broken since the dw-hdmi negotiation code only worked when the dw-hdmi bridge was in last position of the bridge chain or behind another bridge also supporting input & output format negotiation.
Commit 7cd70656d128 ("drm/bridge: display-connector: implement bus fmts callbacks") was introduced to make negotiation work again by making display-connector act as a pass-through concerning input & output format negotiation.
But in the case where the dw-hdmi is single in the bridge chain, for example on Renesas SoCs, with the display-connector bridge the dw-hdmi is no more single, breaking output format.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3 -2
@@ -2566,8 +2566,9 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,if (!output_fmts)return NULL ; -/* If dw-hdmi is the only bridge, avoid negociating with ourselves */ -if (list_is_singular (&bridge->encoder->bridge_chain)) { +/* If dw-hdmi is the first or only bridge, avoid negociating with ourselves */ +if (list_is_singular (&bridge->encoder->bridge_chain) || +list_is_first (&bridge->chain_node, &bridge->encoder->bridge_chain)) { *num_output_fmts =1 ; output_fmts[0 ] =MEDIA_BUS_FMT_FIXED ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 296/599 power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6a4760463dbc6b603690938c468839985189ce0a ]
kobject_init_and_add() takes reference even when it fails. According to the doc of kobject_init_and_add():
If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
Fix memory leak by calling kobject_put().
--- drivers/power/supply/ab8500_fg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/supply/ab8500_fg.c +3 -1
@@ -2541,8 +2541,10 @@ static int ab8500_fg_sysfs_init(struct ab8500_fg *di) ret =kobject_init_and_add (&di->fg_kobject, &ab8500_fg_ktype,NULL ,"battery" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (&di->fg_kobject);dev_err (di->dev,"failed to create sysfs entry\n" ); + }return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 297/599 HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit a5e5e03e94764148a01757b2fa4737d3445c13a6 ]
Internally kernel prepends all report buffers, for both numbered and unnumbered reports, with report ID, therefore to properly handle unnumbered reports we should prepend it ourselves.
For the same reason we should skip the first byte of the buffer when calling i2c_hid_set_or_send_report() which then will take care of properly formatting the transfer buffer based on its separate report ID argument along with report payload.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 32 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +24 -8
@@ -620,6 +620,17 @@ static int i2c_hid_get_raw_report(struct hid_device *hid,if (report_type ==HID_OUTPUT_REPORT )return -EINVAL ; +/* +* In case of unnumbered reports the response from the device will +* not have the report ID that the upper layers expect, so we need +* to stash it the buffer ourselves and adjust the data size. +*/ +if (!report_number) { + buf[0 ] =0 ; + buf++; + count--; + } +/* +2 bytes to include the size of the reply in the query buffer */ ask_count =min (count +2 , (size_t )ihid->bufsize);
@@ -641,6 +652,9 @@ static int i2c_hid_get_raw_report(struct hid_device *hid, count =min (count, ret_count -2 );memcpy (buf, ihid->rawbuf +2 , count); +if (!report_number) + count++; +return count; }
@@ -657,17 +671,19 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,mutex_lock (&ihid->reset_lock); -if (report_id) { - buf++; - count--; - } - +/* +* Note that both numbered and unnumbered reports passed here +* are supposed to have report ID stored in the 1st byte of the +* buffer, so we strip it off unconditionally before passing payload +* to i2c_hid_set_or_send_report which takes care of encoding +* everything properly. +*/ ret =i2c_hid_set_or_send_report (client, report_type ==HID_FEATURE_REPORT ?0x03 :0x02 , - report_id, buf, count, use_data); + report_id, buf +1 , count -1 , use_data); -if (report_id && ret >=0 ) - ret++;/* add report_id to the number of transfered bytes */ +if (ret >=0 ) + ret++;/* add report_id to the number of transferred bytes */ mutex_unlock (&ihid->reset_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 298/599 iommu/ipmmu-vmsa: Check for error num after setting mask
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 1fdbbfd5099f797a4dac05e7ef0192ba4a9c39b4 ]
Because of the possible failure of the dma_supported(), the dma_set_mask_and_coherent() may return error num. Therefore, it should be better to check it and return the error if fails.
--- drivers/iommu/ipmmu-vmsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/ipmmu-vmsa.c +3 -1
@@ -1013,7 +1013,9 @@ static int ipmmu_probe(struct platform_device *pdev)bitmap_zero (mmu->ctx,IPMMU_CTX_MAX ); mmu->features =of_device_get_match_data (&pdev->dev);memset (mmu->utlb_ctx,IPMMU_CTX_INVALID , mmu->features->num_utlbs); -dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (40 )); + ret =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (40 )); +if (ret) +return ret;/* Map I/O memory and request IRQ. */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 299/599 drm/amd/pm: enable pm sysfs write for one VF mode
In reply to Greg Kroah-HartmanFrom: Yiqing Yao <[email protected]>
[ Upstream commit e610941c45bad75aa839af015c27d236ab6749e5 ]
[why]
pm sysfs should be writable in one VF mode as is in passthrough
[how]
do not remove write access on pm sysfs if device is in one VF mode
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +2 -2
@@ -2098,8 +2098,8 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ } } -/* setting should not be allowed from VF */ -if (amdgpu_sriov_vf (adev)) { +/* setting should not be allowed from VF if not in one VF mode */ +if (amdgpu_sriov_vf (adev) && !amdgpu_sriov_is_pp_one_vf (adev)) { dev_attr->attr.mode &= ~S_IWUGO ; dev_attr->store =NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 300/599 drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug
In reply to Greg Kroah-HartmanFrom: Roman Li <[email protected]>
[ Upstream commit 128f8ed5902a287a6bb4afe0ffdae8a80b2a64ec ]
[Why]
When display topology changed on DSC hub we add all crtcs with dsc support to atomic state.
Refer to patch:"drm/amd/display: Trigger modesets on MST DSC connectors" However the original implementation may skip crtc if the topology change caused by unplug.
That potentially could lead to no-lightup or corruption on DSC hub after unplug event on one of the connectors.
[How]
Update add_affected_mst_dsc_crtcs() to use old connector state if new connector state has no crtc (undergoes modeset due to unplug)
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -2
@@ -8615,10 +8615,13 @@ static int dm_update_plane_state(struct dc *dc,static int add_affected_mst_dsc_crtcs (struct drm_atomic_state *state,struct drm_crtc *crtc) {struct drm_connector *connector; -struct drm_connector_state *conn_state; +struct drm_connector_state *conn_state, *old_conn_state;struct amdgpu_dm_connector *aconnector =NULL ;int i; -for_each_new_connector_in_state (state, connector, conn_state, i) { +for_each_oldnew_connector_in_state (state, connector, old_conn_state, conn_state, i) { +if (!conn_state->crtc) + conn_state = old_conn_state; +if (conn_state->crtc != crtc)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 301/599 IB/cma: Allow XRC INI QPs to set their local ACK timeout
In reply to Greg Kroah-HartmanFrom: Håkon Bugge <[email protected]>
[ Upstream commit 748663c8ccf6b2e5a800de19127c2cc1c4423fd2 ]
XRC INI QPs should be able to adjust their local ACK timeout.
--- drivers/infiniband/core/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cma.c +1 -1
@@ -2635,7 +2635,7 @@ int rdma_set_ack_timeout(struct rdma_cm_id *id, u8 timeout) {struct rdma_id_private *id_priv; -if (id->qp_type !=IB_QPT_RC ) +if (id->qp_type !=IB_QPT_RC && id->qp_type !=IB_QPT_XRC_INI )return -EINVAL ; id_priv = container_of(id, struct rdma_id_private, id);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 302/599 dax: make sure inodes are flushed before destroy cache
In reply to Greg Kroah-HartmanFrom: Tong Zhang <[email protected]>
[ Upstream commit a7e8de822e0b1979f08767c751f6c8a9c1d4ad86 ]
A bug can be triggered by following command
$ modprobe nd_pmem && modprobe -r nd_pmem
[ 10.060014] BUG dax_cache (Not tainted): Objects remaining in dax_cache on __kmem_cache_shutdown() [ 10.060938] Slab 0x0000000085b729ac objects=9 used=1 fp=0x000000004f5ae469 flags=0x200000000010200(slab|head|node) [ 10.062433] Call Trace: [ 10.062673] dump_stack_lvl+0x34/0x44 [ 10.062865] slab_err+0x90/0xd0 [ 10.063619] __kmem_cache_shutdown+0x13b/0x2f0 [ 10.063848] kmem_cache_destroy+0x4a/0x110 [ 10.064058] __x64_sys_delete_module+0x265/0x300
This is caused by dax_fs_exit() not flushing inodes before destroy cache. To fix this issue, call rcu_barrier() before destroy cache.
--- drivers/dax/super.c | 1 + 1 file changed, 1 insertion(+)
drivers/dax/super.c +1 -0
@@ -723,6 +723,7 @@ static int dax_fs_init(void)static void dax_fs_exit (void ) {kern_unmount (dax_mnt); +rcu_barrier ();kmem_cache_destroy (dax_cache); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 303/599 iwlwifi: Fix -EIO error code that is never returned
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c305c94bdc18e45b5ad1db54da4269f8cbfdff6b ]
Currently the error -EIO is being assinged to variable ret when the READY_BIT is not set but the function iwlagn_mac_start returns 0 rather than ret. Fix this by returning ret instead of 0.
Addresses-Coverity: ("Unused value")
--- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +1 -1
@@ -304,7 +304,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 304/599 iwlwifi: mvm: Fix an error code in iwl_mvm_up()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 583d18336abdfb1b355270289ff8f6a2608ba905 ]
Return -ENODEV instead of success on this error path.
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +3 -1
@@ -1495,8 +1495,10 @@ int iwl_mvm_up(struct iwl_mvm *mvm)while (!sband && i <NUM_NL80211_BANDS ) sband = mvm->hw->wiphy->bands[i++]; -if (WARN_ON_ONCE (!sband)) +if (WARN_ON_ONCE (!sband)) { + ret = -ENODEV ; goto error; + } chan = &sband->channels[0 ];
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 305/599 drm/msm/dp: populate connector of struct dp_panel
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 5e602f5156910c7b19661699896cb6e3fb94fab9 ]
DP CTS test case 4.2.2.6 has valid edid with bad checksum on purpose and expect DP source return correct checksum. During drm edid read, correct edid checksum is calculated and stored at connector::real_edid_checksum.
The problem is struct dp_panel::connector never be assigned, instead the connector is stored in struct msm_dp::connector. When we run compliance testing test case 4.2.2.6 dp_panel_handle_sink_request() won't have a valid edid set in struct dp_panel::edid so we'll try to use the connectors real_edid_checksum and hit a NULL pointer dereference error because the connector pointer is never assigned.
Changes in V2:
-- populate panel connector at msm_dp_modeset_init() instead of at dp_panel_read_sink_caps()
Changes in V3:
-- remove unhelpful kernel crash trace commit text -- remove renaming dp_display parameter to dp
Changes in V4:
-- add more details to commit text
Changes in v10:
-- group into one series
Changes in v11:
-- drop drm/msm/dp: dp_link_parse_sink_count() return immediately if aux read
--- drivers/gpu/drm/msm/dp/dp_display.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/msm/dp/dp_display.c +5 -0
@@ -1336,6 +1336,7 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, struct drm_encoder *encoder) {struct msm_drm_private *priv; +struct dp_display_private *dp_priv;int ret;if (WARN_ON (!encoder) ||WARN_ON (!dp_display) ||WARN_ON (!dev))
@@ -1344,6 +1345,8 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, priv = dev->dev_private; dp_display->drm_dev = dev; + dp_priv = container_of(dp_display, struct dp_display_private, dp_display); + ret =dp_display_request_irq (dp_display);if (ret) {DRM_ERROR ("request_irq failed, ret=%d\n" , ret);
@@ -1361,6 +1364,8 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,return ret; } + dp_priv->panel->connector = dp_display->connector; + priv->connectors[priv->num_connectors++] = dp_display->connector;return 0 ; }
Signature · 1 line
2.34.1