From: Sasha Levin Date: Sun, 11 Jul 2021 14:44:16 +0000 (-0400) Subject: Fixes for 4.9 X-Git-Tag: v5.4.132~30^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c698bf412890208570ce6d0b257e26aa135c67a;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/acpi-bus-call-kobject_put-in-acpi_init-error-path.patch b/queue-4.9/acpi-bus-call-kobject_put-in-acpi_init-error-path.patch new file mode 100644 index 00000000000..5978985288a --- /dev/null +++ b/queue-4.9/acpi-bus-call-kobject_put-in-acpi_init-error-path.patch @@ -0,0 +1,36 @@ +From b0421f8bec4fc6d8354c3d52d96b311b5a37b5f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 17:36:50 +0800 +Subject: ACPI: bus: Call kobject_put() in acpi_init() error path + +From: Hanjun Guo + +[ Upstream commit 4ac7a817f1992103d4e68e9837304f860b5e7300 ] + +Although the system will not be in a good condition or it will not +boot if acpi_bus_init() fails, it is still necessary to put the +kobject in the error path before returning to avoid leaking memory. + +Signed-off-by: Hanjun Guo +[ rjw: Subject and changelog edits ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/bus.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c +index 6b2c9d68d810..1c13e5fe10d9 100644 +--- a/drivers/acpi/bus.c ++++ b/drivers/acpi/bus.c +@@ -1184,6 +1184,7 @@ static int __init acpi_init(void) + init_acpi_device_notify(); + result = acpi_bus_init(); + if (result) { ++ kobject_put(acpi_kobj); + disable_acpi(); + return result; + } +-- +2.30.2 + diff --git a/queue-4.9/acpi-processor-idle-fix-up-c-state-latency-if-not-or.patch b/queue-4.9/acpi-processor-idle-fix-up-c-state-latency-if-not-or.patch new file mode 100644 index 00000000000..9d5a4f3f49b --- /dev/null +++ b/queue-4.9/acpi-processor-idle-fix-up-c-state-latency-if-not-or.patch @@ -0,0 +1,113 @@ +From 526e13a9d47ebb3a6ec5e2f8e5935bbd838cbc96 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 May 2021 17:15:14 -0500 +Subject: ACPI: processor idle: Fix up C-state latency if not ordered + +From: Mario Limonciello + +[ Upstream commit 65ea8f2c6e230bdf71fed0137cf9e9d1b307db32 ] + +Generally, the C-state latency is provided by the _CST method or +FADT, but some OEM platforms using AMD Picasso, Renoir, Van Gogh, +and Cezanne set the C2 latency greater than C3's which causes the +C2 state to be skipped. + +That will block the core entering PC6, which prevents S0ix working +properly on Linux systems. + +In other operating systems, the latency values are not validated and +this does not cause problems by skipping states. + +To avoid this issue on Linux, detect when latencies are not an +arithmetic progression and sort them. + +Link: https://gitlab.freedesktop.org/agd5f/linux/-/commit/026d186e4592c1ee9c1cb44295912d0294508725 +Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1230#note_712174 +Suggested-by: Prike Liang +Suggested-by: Alex Deucher +Signed-off-by: Mario Limonciello +[ rjw: Subject and changelog edits ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/processor_idle.c | 40 +++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c +index 2237d3f24f0e..8242e16f57c6 100644 +--- a/drivers/acpi/processor_idle.c ++++ b/drivers/acpi/processor_idle.c +@@ -29,6 +29,7 @@ + #include + #include + #include /* need_resched() */ ++#include + #include + #include + #include +@@ -538,10 +539,37 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr, + return; + } + ++static int acpi_cst_latency_cmp(const void *a, const void *b) ++{ ++ const struct acpi_processor_cx *x = a, *y = b; ++ ++ if (!(x->valid && y->valid)) ++ return 0; ++ if (x->latency > y->latency) ++ return 1; ++ if (x->latency < y->latency) ++ return -1; ++ return 0; ++} ++static void acpi_cst_latency_swap(void *a, void *b, int n) ++{ ++ struct acpi_processor_cx *x = a, *y = b; ++ u32 tmp; ++ ++ if (!(x->valid && y->valid)) ++ return; ++ tmp = x->latency; ++ x->latency = y->latency; ++ y->latency = tmp; ++} ++ + static int acpi_processor_power_verify(struct acpi_processor *pr) + { + unsigned int i; + unsigned int working = 0; ++ unsigned int last_latency = 0; ++ unsigned int last_type = 0; ++ bool buggy_latency = false; + + pr->power.timer_broadcast_on_state = INT_MAX; + +@@ -565,12 +593,24 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) + } + if (!cx->valid) + continue; ++ if (cx->type >= last_type && cx->latency < last_latency) ++ buggy_latency = true; ++ last_latency = cx->latency; ++ last_type = cx->type; + + lapic_timer_check_state(i, pr, cx); + tsc_check_state(cx->type); + working++; + } + ++ if (buggy_latency) { ++ pr_notice("FW issue: working around C-state latencies out of order\n"); ++ sort(&pr->power.states[1], max_cstate, ++ sizeof(struct acpi_processor_cx), ++ acpi_cst_latency_cmp, ++ acpi_cst_latency_swap); ++ } ++ + lapic_timer_propagate_broadcast(pr); + + return (working); +-- +2.30.2 + diff --git a/queue-4.9/acpi-sysfs-fix-a-buffer-overrun-problem-with-descrip.patch b/queue-4.9/acpi-sysfs-fix-a-buffer-overrun-problem-with-descrip.patch new file mode 100644 index 00000000000..50b70996734 --- /dev/null +++ b/queue-4.9/acpi-sysfs-fix-a-buffer-overrun-problem-with-descrip.patch @@ -0,0 +1,73 @@ +From 2d2376942c919c71ce48877c6b8e169095738f7e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jun 2021 17:12:01 +0000 +Subject: ACPI: sysfs: Fix a buffer overrun problem with description_show() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Krzysztof Wilczyński + +[ Upstream commit 888be6067b97132c3992866bbcf647572253ab3f ] + +Currently, a device description can be obtained using ACPI, if the _STR +method exists for a particular device, and then exposed to the userspace +via a sysfs object as a string value. + +If the _STR method is available for a given device then the data +(usually a Unicode string) is read and stored in a buffer (of the +ACPI_TYPE_BUFFER type) with a pointer to said buffer cached in the +struct acpi_device_pnp for later access. + +The description_show() function is responsible for exposing the device +description to the userspace via a corresponding sysfs object and +internally calls the utf16s_to_utf8s() function with a pointer to the +buffer that contains the Unicode string so that it can be converted from +UTF16 encoding to UTF8 and thus allowing for the value to be safely +stored and later displayed. + +When invoking the utf16s_to_utf8s() function, the description_show() +function also sets a limit of the data that can be saved into a provided +buffer as a result of the character conversion to be a total of +PAGE_SIZE, and upon completion, the utf16s_to_utf8s() function returns +an integer value denoting the number of bytes that have been written +into the provided buffer. + +Following the execution of the utf16s_to_utf8s() a newline character +will be added at the end of the resulting buffer so that when the value +is read in the userspace through the sysfs object then it would include +newline making it more accessible when working with the sysfs file +system in the shell, etc. Normally, this wouldn't be a problem, but if +the function utf16s_to_utf8s() happens to return the number of bytes +written to be precisely PAGE_SIZE, then we would overrun the buffer and +write the newline character outside the allotted space which can have +undefined consequences or result in a failure. + +To fix this buffer overrun, ensure that there always is enough space +left for the newline character to be safely appended. + +Fixes: d1efe3c324ea ("ACPI: Add new sysfs interface to export device description") +Signed-off-by: Krzysztof Wilczyński +Reviewed-by: Bjorn Helgaas +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/device_sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c +index fb610ad495f1..152ba55fd908 100644 +--- a/drivers/acpi/device_sysfs.c ++++ b/drivers/acpi/device_sysfs.c +@@ -452,7 +452,7 @@ static ssize_t description_show(struct device *dev, + (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer, + acpi_dev->pnp.str_obj->buffer.length, + UTF16_LITTLE_ENDIAN, buf, +- PAGE_SIZE); ++ PAGE_SIZE - 1); + + buf[result++] = '\n'; + +-- +2.30.2 + diff --git a/queue-4.9/acpi-tables-add-custom-dsdt-file-as-makefile-prerequ.patch b/queue-4.9/acpi-tables-add-custom-dsdt-file-as-makefile-prerequ.patch new file mode 100644 index 00000000000..b955367a30f --- /dev/null +++ b/queue-4.9/acpi-tables-add-custom-dsdt-file-as-makefile-prerequ.patch @@ -0,0 +1,43 @@ +From 5f010e351cc22a6d582375d74a6aed71082d6c15 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jun 2021 16:24:33 +0100 +Subject: ACPI: tables: Add custom DSDT file as makefile prerequisite + +From: Richard Fitzgerald + +[ Upstream commit d1059c1b1146870c52f3dac12cb7b6cbf39ed27f ] + +A custom DSDT file is mostly used during development or debugging, +and in that case it is quite likely to want to rebuild the kernel +after changing ONLY the content of the DSDT. + +This patch adds the custom DSDT as a prerequisite to tables.o +to ensure a rebuild if the DSDT file is updated. Make will merge +the prerequisites from multiple rules for the same target. + +Signed-off-by: Richard Fitzgerald +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile +index 4c5678cfa9c4..c466d7bc861a 100644 +--- a/drivers/acpi/Makefile ++++ b/drivers/acpi/Makefile +@@ -7,6 +7,11 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT + # + # ACPI Boot-Time Table Parsing + # ++ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y) ++tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ; ++ ++endif ++ + obj-$(CONFIG_ACPI) += tables.o + obj-$(CONFIG_X86) += blacklist.o + +-- +2.30.2 + diff --git a/queue-4.9/ath10k-fix-an-error-code-in-ath10k_add_interface.patch b/queue-4.9/ath10k-fix-an-error-code-in-ath10k_add_interface.patch new file mode 100644 index 00000000000..4006b08267e --- /dev/null +++ b/queue-4.9/ath10k-fix-an-error-code-in-ath10k_add_interface.patch @@ -0,0 +1,43 @@ +From 3963490913b13386ccc1413ab140bda913225762 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 18:46:17 +0800 +Subject: ath10k: Fix an error code in ath10k_add_interface() + +From: Yang Li + +[ Upstream commit e9ca70c735ce66fc6a0e02c8b6958434f74ef8de ] + +When the code execute this if statement, the value of ret is 0. +However, we can see from the ath10k_warn() log that the value of +ret should be -EINVAL. + +Clean up smatch warning: + +drivers/net/wireless/ath/ath10k/mac.c:5596 ath10k_add_interface() warn: +missing error code 'ret' + +Reported-by: Abaci Robot +Fixes: ccec9038c721 ("ath10k: enable raw encap mode and software crypto engine") +Signed-off-by: Yang Li +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/1621939577-62218-1-git-send-email-yang.lee@linux.alibaba.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/mac.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c +index 564181bb0906..314cac2ce087 100644 +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -4947,6 +4947,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, + + if (arvif->nohwcrypt && + !test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { ++ ret = -EINVAL; + ath10k_warn(ar, "cryptmode module param needed for sw crypto\n"); + goto err; + } +-- +2.30.2 + diff --git a/queue-4.9/block_dump-remove-block_dump-feature-in-mark_inode_d.patch b/queue-4.9/block_dump-remove-block_dump-feature-in-mark_inode_d.patch new file mode 100644 index 00000000000..af17153f962 --- /dev/null +++ b/queue-4.9/block_dump-remove-block_dump-feature-in-mark_inode_d.patch @@ -0,0 +1,84 @@ +From 07f9bfcbc8194f80f64305e0d50aaeb364521c01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 13 Mar 2021 11:01:44 +0800 +Subject: block_dump: remove block_dump feature in mark_inode_dirty() + +From: zhangyi (F) + +[ Upstream commit 12e0613715e1cf305fffafaf0e89d810d9a85cc0 ] + +block_dump is an old debugging interface, one of it's functions is used +to print the information about who write which file on disk. If we +enable block_dump through /proc/sys/vm/block_dump and turn on debug log +level, we can gather information about write process name, target file +name and disk from kernel message. This feature is realized in +block_dump___mark_inode_dirty(), it print above information into kernel +message directly when marking inode dirty, so it is noisy and can easily +trigger log storm. At the same time, get the dentry refcount is also not +safe, we found it will lead to deadlock on ext4 file system with +data=journal mode. + +After tracepoints has been introduced into the kernel, we got a +tracepoint in __mark_inode_dirty(), which is a better replacement of +block_dump___mark_inode_dirty(). The only downside is that it only trace +the inode number and not a file name, but it probably doesn't matter +because the original printed file name in block_dump is not accurate in +some cases, and we can still find it through the inode number and device +id. So this patch delete the dirting inode part of block_dump feature. + +Signed-off-by: zhangyi (F) +Reviewed-by: Jan Kara +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20210313030146.2882027-2-yi.zhang@huawei.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + fs/fs-writeback.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c +index 2de656ecc48b..008710314240 100644 +--- a/fs/fs-writeback.c ++++ b/fs/fs-writeback.c +@@ -2088,28 +2088,6 @@ int dirtytime_interval_handler(struct ctl_table *table, int write, + return ret; + } + +-static noinline void block_dump___mark_inode_dirty(struct inode *inode) +-{ +- if (inode->i_ino || strcmp(inode->i_sb->s_id, "bdev")) { +- struct dentry *dentry; +- const char *name = "?"; +- +- dentry = d_find_alias(inode); +- if (dentry) { +- spin_lock(&dentry->d_lock); +- name = (const char *) dentry->d_name.name; +- } +- printk(KERN_DEBUG +- "%s(%d): dirtied inode %lu (%s) on %s\n", +- current->comm, task_pid_nr(current), inode->i_ino, +- name, inode->i_sb->s_id); +- if (dentry) { +- spin_unlock(&dentry->d_lock); +- dput(dentry); +- } +- } +-} +- + /** + * __mark_inode_dirty - internal function + * @inode: inode to mark +@@ -2168,9 +2146,6 @@ void __mark_inode_dirty(struct inode *inode, int flags) + (dirtytime && (inode->i_state & I_DIRTY_INODE))) + return; + +- if (unlikely(block_dump)) +- block_dump___mark_inode_dirty(inode); +- + spin_lock(&inode->i_lock); + if (dirtytime && (inode->i_state & I_DIRTY_INODE)) + goto out_unlock_inode; +-- +2.30.2 + diff --git a/queue-4.9/bluetooth-mgmt-fix-slab-out-of-bounds-in-tlv_data_is.patch b/queue-4.9/bluetooth-mgmt-fix-slab-out-of-bounds-in-tlv_data_is.patch new file mode 100644 index 00000000000..0c39f0bc3e1 --- /dev/null +++ b/queue-4.9/bluetooth-mgmt-fix-slab-out-of-bounds-in-tlv_data_is.patch @@ -0,0 +1,65 @@ +From 886c59370a9fc6ea9c4088d6d40e38faad880192 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 May 2021 11:45:02 -0700 +Subject: Bluetooth: mgmt: Fix slab-out-of-bounds in tlv_data_is_valid + +From: Luiz Augusto von Dentz + +[ Upstream commit 799acb9347915bfe4eac0ff2345b468f0a1ca207 ] + +This fixes parsing of LTV entries when the length is 0. + +Found with: + +tools/mgmt-tester -s "Add Advertising - Success (ScRsp only)" + +Add Advertising - Success (ScRsp only) - run + Sending Add Advertising (0x003e) + Test condition added, total 1 +[ 11.004577] ================================================================== +[ 11.005292] BUG: KASAN: slab-out-of-bounds in tlv_data_is_valid+0x87/0xe0 +[ 11.005984] Read of size 1 at addr ffff888002c695b0 by task mgmt-tester/87 +[ 11.006711] +[ 11.007176] +[ 11.007429] Allocated by task 87: +[ 11.008151] +[ 11.008438] The buggy address belongs to the object at ffff888002c69580 +[ 11.008438] which belongs to the cache kmalloc-64 of size 64 +[ 11.010526] The buggy address is located 48 bytes inside of +[ 11.010526] 64-byte region [ffff888002c69580, ffff888002c695c0) +[ 11.012423] The buggy address belongs to the page: +[ 11.013291] +[ 11.013544] Memory state around the buggy address: +[ 11.014359] ffff888002c69480: fa fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc +[ 11.015453] ffff888002c69500: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc +[ 11.016232] >ffff888002c69580: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc +[ 11.017010] ^ +[ 11.017547] ffff888002c69600: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc +[ 11.018296] ffff888002c69680: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc +[ 11.019116] ================================================================== + +Fixes: 2bb36870e8cb2 ("Bluetooth: Unify advertising instance flags check") +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/mgmt.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c +index bca1408f815f..fa9526712b0a 100644 +--- a/net/bluetooth/mgmt.c ++++ b/net/bluetooth/mgmt.c +@@ -6087,6 +6087,9 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, + for (i = 0, cur_len = 0; i < len; i += (cur_len + 1)) { + cur_len = data[i]; + ++ if (!cur_len) ++ continue; ++ + if (data[i + 1] == EIR_FLAGS && + (!is_adv_data || flags_managed(adv_flags))) + return false; +-- +2.30.2 + diff --git a/queue-4.9/brcmsmac-mac80211_if-fix-a-resource-leak-in-an-error.patch b/queue-4.9/brcmsmac-mac80211_if-fix-a-resource-leak-in-an-error.patch new file mode 100644 index 00000000000..3dee0a744fa --- /dev/null +++ b/queue-4.9/brcmsmac-mac80211_if-fix-a-resource-leak-in-an-error.patch @@ -0,0 +1,55 @@ +From 5534f8736c835a97f289df41dd3a53d29d8b2a74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 May 2021 22:58:30 +0200 +Subject: brcmsmac: mac80211_if: Fix a resource leak in an error handling path + +From: Christophe JAILLET + +[ Upstream commit 9a25344d5177c2b9285532236dc3d10a091f39a8 ] + +If 'brcms_attach()' fails, we must undo the previous 'ieee80211_alloc_hw()' +as already done in the remove function. + +Fixes: 5b435de0d786 ("net: wireless: add brcm80211 drivers") +Signed-off-by: Christophe JAILLET +Acked-by: Arend van Spriel +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/8fbc171a1a493b38db5a6f0873c6021fca026a6c.1620852921.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Sasha Levin +--- + .../wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +index b820e80d4b4c..8b56aa627487 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +@@ -1221,6 +1221,7 @@ static int brcms_bcma_probe(struct bcma_device *pdev) + { + struct brcms_info *wl; + struct ieee80211_hw *hw; ++ int ret; + + dev_info(&pdev->dev, "mfg %x core %x rev %d class %d irq %d\n", + pdev->id.manuf, pdev->id.id, pdev->id.rev, pdev->id.class, +@@ -1245,11 +1246,16 @@ static int brcms_bcma_probe(struct bcma_device *pdev) + wl = brcms_attach(pdev); + if (!wl) { + pr_err("%s: brcms_attach failed!\n", __func__); +- return -ENODEV; ++ ret = -ENODEV; ++ goto err_free_ieee80211; + } + brcms_led_register(wl); + + return 0; ++ ++err_free_ieee80211: ++ ieee80211_free_hw(hw); ++ return ret; + } + + static int brcms_suspend(struct bcma_device *pdev) +-- +2.30.2 + diff --git a/queue-4.9/btrfs-abort-transaction-if-we-fail-to-update-the-del.patch b/queue-4.9/btrfs-abort-transaction-if-we-fail-to-update-the-del.patch new file mode 100644 index 00000000000..f885479419f --- /dev/null +++ b/queue-4.9/btrfs-abort-transaction-if-we-fail-to-update-the-del.patch @@ -0,0 +1,43 @@ +From a8bf70ff48bc76a14e39854af50df8934228d275 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 16:44:09 -0400 +Subject: btrfs: abort transaction if we fail to update the delayed inode + +From: Josef Bacik + +[ Upstream commit 04587ad9bef6ce9d510325b4ba9852b6129eebdb ] + +If we fail to update the delayed inode we need to abort the transaction, +because we could leave an inode with the improper counts or some other +such corruption behind. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/delayed-inode.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c +index 4d8f8a8c9c90..29e75fba5376 100644 +--- a/fs/btrfs/delayed-inode.c ++++ b/fs/btrfs/delayed-inode.c +@@ -1076,6 +1076,14 @@ err_out: + btrfs_delayed_inode_release_metadata(root, node); + btrfs_release_delayed_inode(node); + ++ /* ++ * If we fail to update the delayed inode we need to abort the ++ * transaction, because we could leave the inode with the improper ++ * counts behind. ++ */ ++ if (ret && ret != -ENOENT) ++ btrfs_abort_transaction(trans, ret); ++ + return ret; + + search: +-- +2.30.2 + diff --git a/queue-4.9/btrfs-disable-build-on-platforms-having-page-size-25.patch b/queue-4.9/btrfs-disable-build-on-platforms-having-page-size-25.patch new file mode 100644 index 00000000000..59b3e11652f --- /dev/null +++ b/queue-4.9/btrfs-disable-build-on-platforms-having-page-size-25.patch @@ -0,0 +1,54 @@ +From 361a1ae4e0c604b6c58fad1f79127b7cce37ee5c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jun 2021 05:23:02 +0000 +Subject: btrfs: disable build on platforms having page size 256K + +From: Christophe Leroy + +[ Upstream commit b05fbcc36be1f8597a1febef4892053a0b2f3f60 ] + +With a config having PAGE_SIZE set to 256K, BTRFS build fails +with the following message + + include/linux/compiler_types.h:326:38: error: call to + '__compiletime_assert_791' declared with attribute error: + BUILD_BUG_ON failed: (BTRFS_MAX_COMPRESSED % PAGE_SIZE) != 0 + +BTRFS_MAX_COMPRESSED being 128K, BTRFS cannot support platforms with +256K pages at the time being. + +There are two platforms that can select 256K pages: + - hexagon + - powerpc + +Disable BTRFS when 256K page size is selected. Supporting this would +require changes to the subpage mode that's currently being developed. +Given that 256K is many times larger than page sizes commonly used and +for what the algorithms and structures have been tuned, it's out of +scope and disabling build is a reasonable option. + +Reported-by: kernel test robot +Signed-off-by: Christophe Leroy +[ update changelog ] +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig +index 80e9c18ea64f..fd6b67c40d9d 100644 +--- a/fs/btrfs/Kconfig ++++ b/fs/btrfs/Kconfig +@@ -9,6 +9,8 @@ config BTRFS_FS + select RAID6_PQ + select XOR_BLOCKS + select SRCU ++ depends on !PPC_256K_PAGES # powerpc ++ depends on !PAGE_SIZE_256KB # hexagon + + help + Btrfs is a general purpose copy-on-write filesystem with extents, +-- +2.30.2 + diff --git a/queue-4.9/char-pcmcia-error-out-if-num_bytes_read-is-greater-t.patch b/queue-4.9/char-pcmcia-error-out-if-num_bytes_read-is-greater-t.patch new file mode 100644 index 00000000000..ab39d8eac3d --- /dev/null +++ b/queue-4.9/char-pcmcia-error-out-if-num_bytes_read-is-greater-t.patch @@ -0,0 +1,41 @@ +From 577e0223f163fb052936fb1bec274dc996d9ec55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 20:06:17 +0800 +Subject: char: pcmcia: error out if 'num_bytes_read' is greater than 4 in + set_protocol() + +From: Yu Kuai + +[ Upstream commit 37188559c610f1b7eec83c8e448936c361c578de ] + +Theoretically, it will cause index out of bounds error if +'num_bytes_read' is greater than 4. As we expect it(and was tested) +never to be greater than 4, error out if it happens. + +Fixes: c1986ee9bea3 ("[PATCH] New Omnikey Cardman 4000 driver") +Signed-off-by: Yu Kuai +Link: https://lore.kernel.org/r/20210521120617.138396-1-yukuai3@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/char/pcmcia/cm4000_cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c +index c115217c79ae..f8d98f7e6fb7 100644 +--- a/drivers/char/pcmcia/cm4000_cs.c ++++ b/drivers/char/pcmcia/cm4000_cs.c +@@ -544,6 +544,10 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) + io_read_num_rec_bytes(iobase, &num_bytes_read); + if (num_bytes_read >= 4) { + DEBUGP(2, dev, "NumRecBytes = %i\n", num_bytes_read); ++ if (num_bytes_read > 4) { ++ rc = -EIO; ++ goto exit_setprotocol; ++ } + break; + } + mdelay(10); +-- +2.30.2 + diff --git a/queue-4.9/configfs-fix-memleak-in-configfs_release_bin_file.patch b/queue-4.9/configfs-fix-memleak-in-configfs_release_bin_file.patch new file mode 100644 index 00000000000..77501b15108 --- /dev/null +++ b/queue-4.9/configfs-fix-memleak-in-configfs_release_bin_file.patch @@ -0,0 +1,47 @@ +From 43f65e155f6131000060ccd5c12db02e7b7ce918 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jun 2021 15:59:25 +0800 +Subject: configfs: fix memleak in configfs_release_bin_file + +From: Chung-Chiang Cheng + +[ Upstream commit 3c252b087de08d3cb32468b54a158bd7ad0ae2f7 ] + +When reading binary attributes in progress, buffer->bin_buffer is setup in +configfs_read_bin_file() but never freed. + +Fixes: 03607ace807b4 ("configfs: implement binary attributes") +Signed-off-by: Chung-Chiang Cheng +[hch: move the vfree rather than duplicating it] +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + fs/configfs/file.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/fs/configfs/file.c b/fs/configfs/file.c +index 896e90dc9193..71f665eb0316 100644 +--- a/fs/configfs/file.c ++++ b/fs/configfs/file.c +@@ -496,13 +496,13 @@ static int configfs_release_bin_file(struct inode *inode, struct file *file) + buffer->bin_buffer_size); + } + up_read(&frag->frag_sem); +- /* vfree on NULL is safe */ +- vfree(buffer->bin_buffer); +- buffer->bin_buffer = NULL; +- buffer->bin_buffer_size = 0; +- buffer->needs_read_fill = 1; + } + ++ vfree(buffer->bin_buffer); ++ buffer->bin_buffer = NULL; ++ buffer->bin_buffer_size = 0; ++ buffer->needs_read_fill = 1; ++ + configfs_release(inode, file); + return 0; + } +-- +2.30.2 + diff --git a/queue-4.9/crypto-ixp4xx-dma_unmap-the-correct-address.patch b/queue-4.9/crypto-ixp4xx-dma_unmap-the-correct-address.patch new file mode 100644 index 00000000000..fb423eff7e8 --- /dev/null +++ b/queue-4.9/crypto-ixp4xx-dma_unmap-the-correct-address.patch @@ -0,0 +1,38 @@ +From c2000bff79aad419c34e786a97cd861c00362386 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 May 2021 20:26:08 +0000 +Subject: crypto: ixp4xx - dma_unmap the correct address + +From: Corentin Labbe + +[ Upstream commit 9395c58fdddd79cdd3882132cdd04e8ac7ad525f ] + +Testing ixp4xx_crypto with CONFIG_DMA_API_DEBUG lead to the following error: +DMA-API: platform ixp4xx_crypto.0: device driver tries to free DMA memory it has not allocated [device address=0x0000000000000000] [size=24 bytes] + +This is due to dma_unmap using the wrong address. + +Fixes: 0d44dc59b2b4 ("crypto: ixp4xx - Fix handling of chained sg buffers") +Signed-off-by: Corentin Labbe +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/ixp4xx_crypto.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c +index a54de1299e9e..81b61e256f7c 100644 +--- a/drivers/crypto/ixp4xx_crypto.c ++++ b/drivers/crypto/ixp4xx_crypto.c +@@ -334,7 +334,7 @@ static void free_buf_chain(struct device *dev, struct buffer_desc *buf,u32 phys) + + buf1 = buf->next; + phys1 = buf->phys_next; +- dma_unmap_single(dev, buf->phys_next, buf->buf_len, buf->dir); ++ dma_unmap_single(dev, buf->phys_addr, buf->buf_len, buf->dir); + dma_pool_free(buffer_pool, buf, phys); + buf = buf1; + phys = phys1; +-- +2.30.2 + diff --git a/queue-4.9/crypto-nx-add-missing-module_device_table.patch b/queue-4.9/crypto-nx-add-missing-module_device_table.patch new file mode 100644 index 00000000000..bcb4605663e --- /dev/null +++ b/queue-4.9/crypto-nx-add-missing-module_device_table.patch @@ -0,0 +1,36 @@ +From 79459212b12e8dc47db371294fa34913f3686169 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 11:14:55 +0800 +Subject: crypto: nx - add missing MODULE_DEVICE_TABLE + +From: Bixuan Cui + +[ Upstream commit 06676aa1f455c74e3ad1624cea3acb9ed2ef71ae ] + +This patch adds missing MODULE_DEVICE_TABLE definition which generates +correct modalias for automatic loading of this driver when it is built +as an external module. + +Reported-by: Hulk Robot +Signed-off-by: Bixuan Cui +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/nx/nx-842-pseries.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c +index cddc6d8b55d9..2e5b4004f0ee 100644 +--- a/drivers/crypto/nx/nx-842-pseries.c ++++ b/drivers/crypto/nx/nx-842-pseries.c +@@ -1086,6 +1086,7 @@ static struct vio_device_id nx842_vio_driver_ids[] = { + {"ibm,compression-v1", "ibm,compression"}, + {"", ""}, + }; ++MODULE_DEVICE_TABLE(vio, nx842_vio_driver_ids); + + static struct vio_driver nx842_vio_driver = { + .name = KBUILD_MODNAME, +-- +2.30.2 + diff --git a/queue-4.9/crypto-nx-fix-rcu-warning-in-nx842_of_upd_status.patch b/queue-4.9/crypto-nx-fix-rcu-warning-in-nx842_of_upd_status.patch new file mode 100644 index 00000000000..5d2476d7703 --- /dev/null +++ b/queue-4.9/crypto-nx-fix-rcu-warning-in-nx842_of_upd_status.patch @@ -0,0 +1,61 @@ +From 0cc1038e5ff40cd2857bddf75c1a56e22d3e54ab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jun 2021 15:57:12 +0800 +Subject: crypto: nx - Fix RCU warning in nx842_OF_upd_status + +From: Herbert Xu + +[ Upstream commit 2a96726bd0ccde4f12b9b9a9f61f7b1ac5af7e10 ] + +The function nx842_OF_upd_status triggers a sparse RCU warning when +it directly dereferences the RCU-protected devdata. This appears +to be an accident as there was another variable of the same name +that was passed in from the caller. + +After it was removed (because the main purpose of using it, to +update the status member was itself removed) the global variable +unintenionally stood in as its replacement. + +This patch restores the devdata parameter. + +Fixes: 90fd73f912f0 ("crypto: nx - remove pSeries NX 'status' field") +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/nx/nx-842-pseries.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c +index 2e5b4004f0ee..1b8c87770645 100644 +--- a/drivers/crypto/nx/nx-842-pseries.c ++++ b/drivers/crypto/nx/nx-842-pseries.c +@@ -553,13 +553,15 @@ static int nx842_OF_set_defaults(struct nx842_devdata *devdata) + * The status field indicates if the device is enabled when the status + * is 'okay'. Otherwise the device driver will be disabled. + * +- * @prop - struct property point containing the maxsyncop for the update ++ * @devdata: struct nx842_devdata to use for dev_info ++ * @prop: struct property point containing the maxsyncop for the update + * + * Returns: + * 0 - Device is available + * -ENODEV - Device is not available + */ +-static int nx842_OF_upd_status(struct property *prop) ++static int nx842_OF_upd_status(struct nx842_devdata *devdata, ++ struct property *prop) + { + const char *status = (const char *)prop->value; + +@@ -773,7 +775,7 @@ static int nx842_OF_upd(struct property *new_prop) + goto out; + + /* Perform property updates */ +- ret = nx842_OF_upd_status(status); ++ ret = nx842_OF_upd_status(new_devdata, status); + if (ret) + goto error_out; + +-- +2.30.2 + diff --git a/queue-4.9/crypto-qat-check-return-code-of-qat_hal_rd_rel_reg.patch b/queue-4.9/crypto-qat-check-return-code-of-qat_hal_rd_rel_reg.patch new file mode 100644 index 00000000000..02b33e3174b --- /dev/null +++ b/queue-4.9/crypto-qat-check-return-code-of-qat_hal_rd_rel_reg.patch @@ -0,0 +1,47 @@ +From 558f9cb5d2c9df201b119c374b22919efe0d72e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 May 2021 05:13:15 -0400 +Subject: crypto: qat - check return code of qat_hal_rd_rel_reg() + +From: Jack Xu + +[ Upstream commit 96b57229209490c8bca4335b01a426a96173dc56 ] + +Check the return code of the function qat_hal_rd_rel_reg() and return it +to the caller. + +This is to fix the following warning when compiling the driver with +clang scan-build: + + drivers/crypto/qat/qat_common/qat_hal.c:1436:2: warning: 6th function call argument is an uninitialized value + +Signed-off-by: Jack Xu +Co-developed-by: Zhehui Xiang +Signed-off-by: Zhehui Xiang +Reviewed-by: Giovanni Cabiddu +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/qat/qat_common/qat_hal.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c +index 8c4fd255a601..cdf80c16a033 100644 +--- a/drivers/crypto/qat/qat_common/qat_hal.c ++++ b/drivers/crypto/qat/qat_common/qat_hal.c +@@ -1255,7 +1255,11 @@ static int qat_hal_put_rel_wr_xfer(struct icp_qat_fw_loader_handle *handle, + pr_err("QAT: bad xfrAddr=0x%x\n", xfr_addr); + return -EINVAL; + } +- qat_hal_rd_rel_reg(handle, ae, ctx, ICP_GPB_REL, gprnum, &gprval); ++ status = qat_hal_rd_rel_reg(handle, ae, ctx, ICP_GPB_REL, gprnum, &gprval); ++ if (status) { ++ pr_err("QAT: failed to read register"); ++ return status; ++ } + gpr_addr = qat_hal_get_reg_addr(ICP_GPB_REL, gprnum); + data16low = 0xffff & data; + data16hi = 0xffff & (data >> 0x10); +-- +2.30.2 + diff --git a/queue-4.9/crypto-qat-remove-unused-macro-in-fw-loader.patch b/queue-4.9/crypto-qat-remove-unused-macro-in-fw-loader.patch new file mode 100644 index 00000000000..c438d9e570c --- /dev/null +++ b/queue-4.9/crypto-qat-remove-unused-macro-in-fw-loader.patch @@ -0,0 +1,42 @@ +From 30584f57b85efdfe1a8313c93c5578abce3de3dd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 May 2021 05:13:16 -0400 +Subject: crypto: qat - remove unused macro in FW loader + +From: Jack Xu + +[ Upstream commit 9afe77cf25d9670e61b489fd52cc6f75fd7f6803 ] + +Remove the unused macro ICP_DH895XCC_PESRAM_BAR_SIZE in the firmware +loader. + +This is to fix the following warning when compiling the driver using the +clang compiler with CC=clang W=2: + + drivers/crypto/qat/qat_common/qat_uclo.c:345:9: warning: macro is not used [-Wunused-macros] + +Signed-off-by: Jack Xu +Co-developed-by: Zhehui Xiang +Signed-off-by: Zhehui Xiang +Reviewed-by: Giovanni Cabiddu +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/qat/qat_common/qat_uclo.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c +index 4f1cd83bf56f..a8e3191e5185 100644 +--- a/drivers/crypto/qat/qat_common/qat_uclo.c ++++ b/drivers/crypto/qat/qat_common/qat_uclo.c +@@ -385,7 +385,6 @@ static int qat_uclo_init_umem_seg(struct icp_qat_fw_loader_handle *handle, + return 0; + } + +-#define ICP_DH895XCC_PESRAM_BAR_SIZE 0x80000 + static int qat_uclo_init_ae_memory(struct icp_qat_fw_loader_handle *handle, + struct icp_qat_uof_initmem *init_mem) + { +-- +2.30.2 + diff --git a/queue-4.9/crypto-shash-avoid-comparing-pointers-to-exported-fu.patch b/queue-4.9/crypto-shash-avoid-comparing-pointers-to-exported-fu.patch new file mode 100644 index 00000000000..fcc3193b7c1 --- /dev/null +++ b/queue-4.9/crypto-shash-avoid-comparing-pointers-to-exported-fu.patch @@ -0,0 +1,88 @@ +From 58bed742767d652cb9f7fe252a3231b4b6b482c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jun 2021 08:21:50 +0200 +Subject: crypto: shash - avoid comparing pointers to exported functions under + CFI + +From: Ard Biesheuvel + +[ Upstream commit 22ca9f4aaf431a9413dcc115dd590123307f274f ] + +crypto_shash_alg_has_setkey() is implemented by testing whether the +.setkey() member of a struct shash_alg points to the default version, +called shash_no_setkey(). As crypto_shash_alg_has_setkey() is a static +inline, this requires shash_no_setkey() to be exported to modules. + +Unfortunately, when building with CFI, function pointers are routed +via CFI stubs which are private to each module (or to the kernel proper) +and so this function pointer comparison may fail spuriously. + +Let's fix this by turning crypto_shash_alg_has_setkey() into an out of +line function. + +Cc: Sami Tolvanen +Cc: Eric Biggers +Signed-off-by: Ard Biesheuvel +Reviewed-by: Eric Biggers +Reviewed-by: Sami Tolvanen +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + crypto/shash.c | 18 +++++++++++++++--- + include/crypto/internal/hash.h | 8 +------- + 2 files changed, 16 insertions(+), 10 deletions(-) + +diff --git a/crypto/shash.c b/crypto/shash.c +index a1c7609578ea..7eebf3cde7b7 100644 +--- a/crypto/shash.c ++++ b/crypto/shash.c +@@ -24,12 +24,24 @@ + + static const struct crypto_type crypto_shash_type; + +-int shash_no_setkey(struct crypto_shash *tfm, const u8 *key, +- unsigned int keylen) ++static int shash_no_setkey(struct crypto_shash *tfm, const u8 *key, ++ unsigned int keylen) + { + return -ENOSYS; + } +-EXPORT_SYMBOL_GPL(shash_no_setkey); ++ ++/* ++ * Check whether an shash algorithm has a setkey function. ++ * ++ * For CFI compatibility, this must not be an inline function. This is because ++ * when CFI is enabled, modules won't get the same address for shash_no_setkey ++ * (if it were exported, which inlining would require) as the core kernel will. ++ */ ++bool crypto_shash_alg_has_setkey(struct shash_alg *alg) ++{ ++ return alg->setkey != shash_no_setkey; ++} ++EXPORT_SYMBOL_GPL(crypto_shash_alg_has_setkey); + + static int shash_setkey_unaligned(struct crypto_shash *tfm, const u8 *key, + unsigned int keylen) +diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h +index 5203560f992e..000c049a75f7 100644 +--- a/include/crypto/internal/hash.h ++++ b/include/crypto/internal/hash.h +@@ -80,13 +80,7 @@ int ahash_register_instance(struct crypto_template *tmpl, + struct ahash_instance *inst); + void ahash_free_instance(struct crypto_instance *inst); + +-int shash_no_setkey(struct crypto_shash *tfm, const u8 *key, +- unsigned int keylen); +- +-static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg) +-{ +- return alg->setkey != shash_no_setkey; +-} ++bool crypto_shash_alg_has_setkey(struct shash_alg *alg); + + bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg); + +-- +2.30.2 + diff --git a/queue-4.9/crypto-ux500-fix-error-return-code-in-hash_hw_final.patch b/queue-4.9/crypto-ux500-fix-error-return-code-in-hash_hw_final.patch new file mode 100644 index 00000000000..b563921b73a --- /dev/null +++ b/queue-4.9/crypto-ux500-fix-error-return-code-in-hash_hw_final.patch @@ -0,0 +1,37 @@ +From eadb35df2bd776576d14413e9a7652960d6a4a65 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 15:00:49 +0800 +Subject: crypto: ux500 - Fix error return code in hash_hw_final() + +From: Zhen Lei + +[ Upstream commit b01360384009ab066940b45f34880991ea7ccbfb ] + +Fix to return a negative error code from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: 8a63b1994c50 ("crypto: ux500 - Add driver for HASH hardware") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Reviewed-by: Linus Walleij +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/ux500/hash/hash_core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c +index 17c8e2b28c42..7500ec9efa6a 100644 +--- a/drivers/crypto/ux500/hash/hash_core.c ++++ b/drivers/crypto/ux500/hash/hash_core.c +@@ -1006,6 +1006,7 @@ static int hash_hw_final(struct ahash_request *req) + goto out; + } + } else if (req->nbytes == 0 && ctx->keylen > 0) { ++ ret = -EPERM; + dev_err(device_data->dev, "%s: Empty message with keylength > 0, NOT supported\n", + __func__); + goto out; +-- +2.30.2 + diff --git a/queue-4.9/drm-qxl-ensure-surf.data-is-ininitialized.patch b/queue-4.9/drm-qxl-ensure-surf.data-is-ininitialized.patch new file mode 100644 index 00000000000..5e901d6acd8 --- /dev/null +++ b/queue-4.9/drm-qxl-ensure-surf.data-is-ininitialized.patch @@ -0,0 +1,40 @@ +From 564449da6c6199aafd79fc516cd0409a03357f11 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Jun 2021 17:13:13 +0100 +Subject: drm: qxl: ensure surf.data is ininitialized + +From: Colin Ian King + +[ Upstream commit fbbf23ddb2a1cc0c12c9f78237d1561c24006f50 ] + +The object surf is not fully initialized and the uninitialized +field surf.data is being copied by the call to qxl_bo_create +via the call to qxl_gem_object_create. Set surf.data to zero +to ensure garbage data from the stack is not being copied. + +Addresses-Coverity: ("Uninitialized scalar variable") +Fixes: f64122c1f6ad ("drm: add new QXL driver. (v1.4)") +Signed-off-by: Colin Ian King +Link: http://patchwork.freedesktop.org/patch/msgid/20210608161313.161922-1-colin.king@canonical.com +Signed-off-by: Gerd Hoffmann +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c +index 5e65d5d2d937..e7b7b8a31e52 100644 +--- a/drivers/gpu/drm/qxl/qxl_dumb.c ++++ b/drivers/gpu/drm/qxl/qxl_dumb.c +@@ -57,6 +57,8 @@ int qxl_mode_dumb_create(struct drm_file *file_priv, + surf.height = args->height; + surf.stride = pitch; + surf.format = format; ++ surf.data = 0; ++ + r = qxl_gem_object_create_with_handle(qdev, file_priv, + QXL_GEM_DOMAIN_VRAM, + args->size, &surf, &qobj, +-- +2.30.2 + diff --git a/queue-4.9/ehea-fix-error-return-code-in-ehea_restart_qps.patch b/queue-4.9/ehea-fix-error-return-code-in-ehea_restart_qps.patch new file mode 100644 index 00000000000..5216cef478c --- /dev/null +++ b/queue-4.9/ehea-fix-error-return-code-in-ehea_restart_qps.patch @@ -0,0 +1,69 @@ +From 93233c4e90cd0c9d4dece9e402e4d32c22627753 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 May 2021 16:55:55 +0800 +Subject: ehea: fix error return code in ehea_restart_qps() + +From: Zhen Lei + +[ Upstream commit 015dbf5662fd689d581c0bc980711b073ca09a1a ] + +Fix to return -EFAULT from the error handling case instead of 0, as done +elsewhere in this function. + +By the way, when get_zeroed_page() fails, directly return -ENOMEM to +simplify code. + +Fixes: 2c69448bbced ("ehea: DLPAR memory add fix") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Link: https://lore.kernel.org/r/20210528085555.9390-1-thunder.leizhen@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c +index 3692adb8902d..6c70cba92df0 100644 +--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c ++++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c +@@ -2656,10 +2656,8 @@ static int ehea_restart_qps(struct net_device *dev) + u16 dummy16 = 0; + + cb0 = (void *)get_zeroed_page(GFP_KERNEL); +- if (!cb0) { +- ret = -ENOMEM; +- goto out; +- } ++ if (!cb0) ++ return -ENOMEM; + + for (i = 0; i < (port->num_def_qps); i++) { + struct ehea_port_res *pr = &port->port_res[i]; +@@ -2679,6 +2677,7 @@ static int ehea_restart_qps(struct net_device *dev) + cb0); + if (hret != H_SUCCESS) { + netdev_err(dev, "query_ehea_qp failed (1)\n"); ++ ret = -EFAULT; + goto out; + } + +@@ -2691,6 +2690,7 @@ static int ehea_restart_qps(struct net_device *dev) + &dummy64, &dummy16, &dummy16); + if (hret != H_SUCCESS) { + netdev_err(dev, "modify_ehea_qp failed (1)\n"); ++ ret = -EFAULT; + goto out; + } + +@@ -2699,6 +2699,7 @@ static int ehea_restart_qps(struct net_device *dev) + cb0); + if (hret != H_SUCCESS) { + netdev_err(dev, "query_ehea_qp failed (2)\n"); ++ ret = -EFAULT; + goto out; + } + +-- +2.30.2 + diff --git a/queue-4.9/extcon-max8997-add-missing-modalias-string.patch b/queue-4.9/extcon-max8997-add-missing-modalias-string.patch new file mode 100644 index 00000000000..1ccc5b0b84e --- /dev/null +++ b/queue-4.9/extcon-max8997-add-missing-modalias-string.patch @@ -0,0 +1,33 @@ +From c2b7ead6c67f25ce558599b92328cb5e53a369fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Apr 2021 22:46:24 +0200 +Subject: extcon: max8997: Add missing modalias string + +From: Marek Szyprowski + +[ Upstream commit dc11fc2991e9efbceef93912b83e333d2835fb19 ] + +The platform device driver name is "max8997-muic", so advertise it +properly in the modalias string. This fixes automated module loading when +this driver is compiled as a module. + +Fixes: b76668ba8a77 ("Extcon: add MAX8997 extcon driver") +Signed-off-by: Marek Szyprowski +Signed-off-by: Chanwoo Choi +Signed-off-by: Sasha Levin +--- + drivers/extcon/extcon-max8997.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c +index b9b48d45a6dc..17d426829f5d 100644 +--- a/drivers/extcon/extcon-max8997.c ++++ b/drivers/extcon/extcon-max8997.c +@@ -783,3 +783,4 @@ module_platform_driver(max8997_muic_driver); + MODULE_DESCRIPTION("Maxim MAX8997 Extcon driver"); + MODULE_AUTHOR("Donggeun Kim "); + MODULE_LICENSE("GPL"); ++MODULE_ALIAS("platform:max8997-muic"); +-- +2.30.2 + diff --git a/queue-4.9/extcon-sm5502-drop-invalid-register-write-in-sm5502_.patch b/queue-4.9/extcon-sm5502-drop-invalid-register-write-in-sm5502_.patch new file mode 100644 index 00000000000..25cec31d514 --- /dev/null +++ b/queue-4.9/extcon-sm5502-drop-invalid-register-write-in-sm5502_.patch @@ -0,0 +1,40 @@ +From b29f69d2f7ab226a2a79be876a33762263d3f3ee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 May 2021 15:34:35 +0200 +Subject: extcon: sm5502: Drop invalid register write in sm5502_reg_data + +From: Stephan Gerhold + +[ Upstream commit d25b224f8e5507879b36a769a6d1324cf163466c ] + +When sm5502_init_dev_type() iterates over sm5502_reg_data to +initialize the registers it is limited by ARRAY_SIZE(sm5502_reg_data). +There is no need to add another empty element to sm5502_reg_data. + +Having the additional empty element in sm5502_reg_data will just +result in writing 0xff to register 0x00, which does not really +make sense. + +Fixes: 914b881f9452 ("extcon: sm5502: Add support new SM5502 extcon device driver") +Signed-off-by: Stephan Gerhold +Signed-off-by: Chanwoo Choi +Signed-off-by: Sasha Levin +--- + drivers/extcon/extcon-sm5502.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c +index 9d2d8a6673c8..dbe5fc278f09 100644 +--- a/drivers/extcon/extcon-sm5502.c ++++ b/drivers/extcon/extcon-sm5502.c +@@ -92,7 +92,6 @@ static struct reg_data sm5502_reg_data[] = { + | SM5502_REG_INTM2_MHL_MASK, + .invert = true, + }, +- { } + }; + + /* List of detectable cables */ +-- +2.30.2 + diff --git a/queue-4.9/fs-dlm-cancel-work-sync-othercon.patch b/queue-4.9/fs-dlm-cancel-work-sync-othercon.patch new file mode 100644 index 00000000000..a0983688e50 --- /dev/null +++ b/queue-4.9/fs-dlm-cancel-work-sync-othercon.patch @@ -0,0 +1,38 @@ +From 1ad1d39af83686a3de14386f446b541105197def Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 15:08:38 -0400 +Subject: fs: dlm: cancel work sync othercon + +From: Alexander Aring + +[ Upstream commit c6aa00e3d20c2767ba3f57b64eb862572b9744b3 ] + +These rx tx flags arguments are for signaling close_connection() from +which worker they are called. Obviously the receive worker cannot cancel +itself and vice versa for swork. For the othercon the receive worker +should only be used, however to avoid deadlocks we should pass the same +flags as the original close_connection() was called. + +Signed-off-by: Alexander Aring +Signed-off-by: David Teigland +Signed-off-by: Sasha Levin +--- + fs/dlm/lowcomms.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c +index 609998de533e..0d8aaf9c61be 100644 +--- a/fs/dlm/lowcomms.c ++++ b/fs/dlm/lowcomms.c +@@ -599,7 +599,7 @@ static void close_connection(struct connection *con, bool and_other, + } + if (con->othercon && and_other) { + /* Will only re-enter once. */ +- close_connection(con->othercon, false, true, true); ++ close_connection(con->othercon, false, tx, rx); + } + if (con->rx_page) { + __free_page(con->rx_page); +-- +2.30.2 + diff --git a/queue-4.9/fs-dlm-fix-memory-leak-when-fenced.patch b/queue-4.9/fs-dlm-fix-memory-leak-when-fenced.patch new file mode 100644 index 00000000000..e4323b135a2 --- /dev/null +++ b/queue-4.9/fs-dlm-fix-memory-leak-when-fenced.patch @@ -0,0 +1,85 @@ +From 40a18d082ad789fd72cde4003d5d448b9314cbcb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 09:45:16 -0400 +Subject: fs: dlm: fix memory leak when fenced + +From: Alexander Aring + +[ Upstream commit 700ab1c363c7b54c9ea3222379b33fc00ab02f7b ] + +I got some kmemleak report when a node was fenced. The user space tool +dlm_controld will therefore run some rmdir() in dlm configfs which was +triggering some memleaks. This patch stores the sps and cms attributes +which stores some handling for subdirectories of the configfs cluster +entry and free them if they get released as the parent directory gets +freed. + +unreferenced object 0xffff88810d9e3e00 (size 192): + comm "dlm_controld", pid 342, jiffies 4294698126 (age 55438.801s) + hex dump (first 32 bytes): + 00 00 00 00 00 00 00 00 73 70 61 63 65 73 00 00 ........spaces.. + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [<00000000db8b640b>] make_cluster+0x5d/0x360 + [<000000006a571db4>] configfs_mkdir+0x274/0x730 + [<00000000b094501c>] vfs_mkdir+0x27e/0x340 + [<0000000058b0adaf>] do_mkdirat+0xff/0x1b0 + [<00000000d1ffd156>] do_syscall_64+0x40/0x80 + [<00000000ab1408c8>] entry_SYSCALL_64_after_hwframe+0x44/0xae +unreferenced object 0xffff88810d9e3a00 (size 192): + comm "dlm_controld", pid 342, jiffies 4294698126 (age 55438.801s) + hex dump (first 32 bytes): + 00 00 00 00 00 00 00 00 63 6f 6d 6d 73 00 00 00 ........comms... + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [<00000000a7ef6ad2>] make_cluster+0x82/0x360 + [<000000006a571db4>] configfs_mkdir+0x274/0x730 + [<00000000b094501c>] vfs_mkdir+0x27e/0x340 + [<0000000058b0adaf>] do_mkdirat+0xff/0x1b0 + [<00000000d1ffd156>] do_syscall_64+0x40/0x80 + [<00000000ab1408c8>] entry_SYSCALL_64_after_hwframe+0x44/0xae + +Signed-off-by: Alexander Aring +Signed-off-by: David Teigland +Signed-off-by: Sasha Levin +--- + fs/dlm/config.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/fs/dlm/config.c b/fs/dlm/config.c +index 6def89d2209d..10d25b7830bf 100644 +--- a/fs/dlm/config.c ++++ b/fs/dlm/config.c +@@ -80,6 +80,9 @@ struct dlm_cluster { + unsigned int cl_new_rsb_count; + unsigned int cl_recover_callbacks; + char cl_cluster_name[DLM_LOCKSPACE_LEN]; ++ ++ struct dlm_spaces *sps; ++ struct dlm_comms *cms; + }; + + static struct dlm_cluster *config_item_to_cluster(struct config_item *i) +@@ -356,6 +359,9 @@ static struct config_group *make_cluster(struct config_group *g, + if (!cl || !sps || !cms) + goto fail; + ++ cl->sps = sps; ++ cl->cms = cms; ++ + config_group_init_type_name(&cl->group, name, &cluster_type); + config_group_init_type_name(&sps->ss_group, "spaces", &spaces_type); + config_group_init_type_name(&cms->cs_group, "comms", &comms_type); +@@ -405,6 +411,9 @@ static void drop_cluster(struct config_group *g, struct config_item *i) + static void release_cluster(struct config_item *i) + { + struct dlm_cluster *cl = config_item_to_cluster(i); ++ ++ kfree(cl->sps); ++ kfree(cl->cms); + kfree(cl); + } + +-- +2.30.2 + diff --git a/queue-4.9/hwmon-max31722-remove-non-standard-acpi-device-ids.patch b/queue-4.9/hwmon-max31722-remove-non-standard-acpi-device-ids.patch new file mode 100644 index 00000000000..ffc17543489 --- /dev/null +++ b/queue-4.9/hwmon-max31722-remove-non-standard-acpi-device-ids.patch @@ -0,0 +1,58 @@ +From 25ac74891b2286dd977e00ed7329a6dfacfe3d1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 09:50:25 -0700 +Subject: hwmon: (max31722) Remove non-standard ACPI device IDs + +From: Guenter Roeck + +[ Upstream commit 97387c2f06bcfd79d04a848d35517b32ee6dca7c ] + +Valid Maxim Integrated ACPI device IDs would start with MXIM, +not with MAX1. On top of that, ACPI device IDs reflecting chip names +are almost always invalid. + +Remove the invalid ACPI IDs. + +Fixes: 04e1e70afec6 ("hwmon: (max31722) Add support for MAX31722/MAX31723 temperature sensors") +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/max31722.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/drivers/hwmon/max31722.c b/drivers/hwmon/max31722.c +index 30a100e70a0d..877c3d7dca01 100644 +--- a/drivers/hwmon/max31722.c ++++ b/drivers/hwmon/max31722.c +@@ -9,7 +9,6 @@ + * directory of this archive for more details. + */ + +-#include + #include + #include + #include +@@ -138,20 +137,12 @@ static const struct spi_device_id max31722_spi_id[] = { + {"max31723", 0}, + {} + }; +- +-static const struct acpi_device_id __maybe_unused max31722_acpi_id[] = { +- {"MAX31722", 0}, +- {"MAX31723", 0}, +- {} +-}; +- + MODULE_DEVICE_TABLE(spi, max31722_spi_id); + + static struct spi_driver max31722_driver = { + .driver = { + .name = "max31722", + .pm = &max31722_pm_ops, +- .acpi_match_table = ACPI_PTR(max31722_acpi_id), + }, + .probe = max31722_probe, + .remove = max31722_remove, +-- +2.30.2 + diff --git a/queue-4.9/hwmon-max31790-fix-fan-speed-reporting-for-fan7.12.patch b/queue-4.9/hwmon-max31790-fix-fan-speed-reporting-for-fan7.12.patch new file mode 100644 index 00000000000..132b874770c --- /dev/null +++ b/queue-4.9/hwmon-max31790-fix-fan-speed-reporting-for-fan7.12.patch @@ -0,0 +1,50 @@ +From 13fa0a06f5348f6e3b5b6341cd9027b6c9a9bf22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 08:40:16 -0700 +Subject: hwmon: (max31790) Fix fan speed reporting for fan7..12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Guenter Roeck + +[ Upstream commit cbbf244f0515af3472084f22b6213121b4a63835 ] + +Fans 7..12 do not have their own set of configuration registers. +So far the code ignored that and read beyond the end of the configuration +register range to get the tachometer period. This resulted in more or less +random fan speed values for those fans. + +The datasheet is quite vague when it comes to defining the tachometer +period for fans 7..12. Experiments confirm that the period is the same +for both fans associated with a given set of configuration registers. + +Fixes: 54187ff9d766 ("hwmon: (max31790) Convert to use new hwmon registration API") +Fixes: 195a4b4298a7 ("hwmon: Driver for Maxim MAX31790") +Cc: Jan Kundrát +Reviewed-by: Jan Kundrát +Cc: Václav Kubernát +Reviewed-by: Jan Kundrát +Signed-off-by: Guenter Roeck +Link: https://lore.kernel.org/r/20210526154022.3223012-2-linux@roeck-us.net +Signed-off-by: Sasha Levin +--- + drivers/hwmon/max31790.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c +index 281491cca510..66cf772de7d2 100644 +--- a/drivers/hwmon/max31790.c ++++ b/drivers/hwmon/max31790.c +@@ -179,7 +179,7 @@ static int max31790_read_fan(struct device *dev, u32 attr, int channel, + + switch (attr) { + case hwmon_fan_input: +- sr = get_tach_period(data->fan_dynamics[channel]); ++ sr = get_tach_period(data->fan_dynamics[channel % NR_CHANNEL]); + rpm = RPM_FROM_REG(data->tach[channel], sr); + *val = rpm; + return 0; +-- +2.30.2 + diff --git a/queue-4.9/i40e-fix-error-handling-in-i40e_vsi_open.patch b/queue-4.9/i40e-fix-error-handling-in-i40e_vsi_open.patch new file mode 100644 index 00000000000..a8d6157a181 --- /dev/null +++ b/queue-4.9/i40e-fix-error-handling-in-i40e_vsi_open.patch @@ -0,0 +1,38 @@ +From bff69f144a51128528fada4e4f7f89f63344d996 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 28 Feb 2021 19:50:58 +0800 +Subject: i40e: Fix error handling in i40e_vsi_open + +From: Dinghao Liu + +[ Upstream commit 9c04cfcd4aad232e36306cdc5c74cd9fc9148a7e ] + +When vsi->type == I40E_VSI_FDIR, we have caught the return value of +i40e_vsi_request_irq() but without further handling. Check and execute +memory clean on failure just like the other i40e_vsi_request_irq(). + +Fixes: 8a9eb7d3cbcab ("i40e: rework fdir setup and teardown") +Signed-off-by: Dinghao Liu +Tested-by: Tony Brelinski +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c +index 0b1ee353f415..832fffed4a1f 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c +@@ -5478,6 +5478,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi) + dev_driver_string(&pf->pdev->dev), + dev_name(&pf->pdev->dev)); + err = i40e_vsi_request_irq(vsi, int_name); ++ if (err) ++ goto err_setup_rx; + + } else { + err = -EINVAL; +-- +2.30.2 + diff --git a/queue-4.9/ia64-mca_drv-fix-incorrect-array-size-calculation.patch b/queue-4.9/ia64-mca_drv-fix-incorrect-array-size-calculation.patch new file mode 100644 index 00000000000..80550f9fd23 --- /dev/null +++ b/queue-4.9/ia64-mca_drv-fix-incorrect-array-size-calculation.patch @@ -0,0 +1,48 @@ +From d692b9cb9fda0fdbb5c67350cf5c25e6cd17459b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Jun 2021 19:33:41 -0700 +Subject: ia64: mca_drv: fix incorrect array size calculation + +From: Arnd Bergmann + +[ Upstream commit c5f320ff8a79501bb59338278336ec43acb9d7e2 ] + +gcc points out a mistake in the mca driver that goes back to before the +git history: + +arch/ia64/kernel/mca_drv.c: In function 'init_record_index_pools': +arch/ia64/kernel/mca_drv.c:346:54: error: expression does not compute the number of elements in this array; element typ +e is 'int', not 'size_t' {aka 'long unsigned int'} [-Werror=sizeof-array-div] + 346 | for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) + | ^ + +This is the same as sizeof(size_t), which is two shorter than the actual +array. Use the ARRAY_SIZE() macro to get the correct calculation instead. + +Link: https://lkml.kernel.org/r/20210514214123.875971-1-arnd@kernel.org +Signed-off-by: Arnd Bergmann +Cc: Masahiro Yamada +Cc: Randy Dunlap +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + arch/ia64/kernel/mca_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c +index 94f8bf777afa..3503d488e9b3 100644 +--- a/arch/ia64/kernel/mca_drv.c ++++ b/arch/ia64/kernel/mca_drv.c +@@ -343,7 +343,7 @@ init_record_index_pools(void) + + /* - 2 - */ + sect_min_size = sal_log_sect_min_sizes[0]; +- for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) ++ for (i = 1; i < ARRAY_SIZE(sal_log_sect_min_sizes); i++) + if (sect_min_size > sal_log_sect_min_sizes[i]) + sect_min_size = sal_log_sect_min_sizes[i]; + +-- +2.30.2 + diff --git a/queue-4.9/iio-accel-bma180-fix-buffer-alignment-in-iio_push_to.patch b/queue-4.9/iio-accel-bma180-fix-buffer-alignment-in-iio_push_to.patch new file mode 100644 index 00000000000..cc672796a8a --- /dev/null +++ b/queue-4.9/iio-accel-bma180-fix-buffer-alignment-in-iio_push_to.patch @@ -0,0 +1,60 @@ +From 4eb20f32e80ca73f1fd2e5ede91b10ca64cbc53a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:03 +0100 +Subject: iio: accel: bma180: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit fc36da3131a747a9367a05caf06de19be1bcc972 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: b9a6a237ffc9 ("iio:bma180: Drop _update_scan_mode()") +Signed-off-by: Jonathan Cameron +Cc: Peter Meerwald +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-2-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/bma180.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c +index 0890934ef66f..73ea64a2bff0 100644 +--- a/drivers/iio/accel/bma180.c ++++ b/drivers/iio/accel/bma180.c +@@ -120,7 +120,11 @@ struct bma180_data { + int scale; + int bw; + bool pmode; +- u8 buff[16]; /* 3x 16-bit + 8-bit + padding + timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ s16 chan[4]; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + enum bma180_chan { +@@ -667,12 +671,12 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p) + mutex_unlock(&data->mutex); + goto err; + } +- ((s16 *)data->buff)[i++] = ret; ++ data->scan.chan[i++] = ret; + } + + mutex_unlock(&data->mutex); + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buff, time_ns); ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, time_ns); + err: + iio_trigger_notify_done(indio_dev->trig); + +-- +2.30.2 + diff --git a/queue-4.9/iio-accel-bma220-fix-buffer-alignment-in-iio_push_to.patch b/queue-4.9/iio-accel-bma220-fix-buffer-alignment-in-iio_push_to.patch new file mode 100644 index 00000000000..e9d08a4067e --- /dev/null +++ b/queue-4.9/iio-accel-bma220-fix-buffer-alignment-in-iio_push_to.patch @@ -0,0 +1,59 @@ +From 2607a0240117f44940d5c1a7ee71e848aead472b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:04 +0100 +Subject: iio: accel: bma220: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 151dbf0078da98206817ee0b87d499035479ef11 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: 194dc4c71413 ("iio: accel: Add triggered buffer support for BMA220") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-3-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/bma220_spi.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c +index 5099f295dd37..a96f2d530ae3 100644 +--- a/drivers/iio/accel/bma220_spi.c ++++ b/drivers/iio/accel/bma220_spi.c +@@ -76,7 +76,11 @@ static const int bma220_scale_table[][4] = { + struct bma220_data { + struct spi_device *spi_device; + struct mutex lock; +- s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 8x8 timestamp */ ++ struct { ++ s8 chans[3]; ++ /* Ensure timestamp is naturally aligned. */ ++ s64 timestamp __aligned(8); ++ } scan; + u8 tx_buf[2] ____cacheline_aligned; + }; + +@@ -107,12 +111,12 @@ static irqreturn_t bma220_trigger_handler(int irq, void *p) + + mutex_lock(&data->lock); + data->tx_buf[0] = BMA220_REG_ACCEL_X | BMA220_READ_MASK; +- ret = spi_write_then_read(spi, data->tx_buf, 1, data->buffer, ++ ret = spi_write_then_read(spi, data->tx_buf, 1, &data->scan.chans, + ARRAY_SIZE(bma220_channels) - 1); + if (ret < 0) + goto err; + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + pf->timestamp); + err: + mutex_unlock(&data->lock); +-- +2.30.2 + diff --git a/queue-4.9/iio-accel-kxcjk-1013-fix-buffer-alignment-in-iio_pus.patch b/queue-4.9/iio-accel-kxcjk-1013-fix-buffer-alignment-in-iio_pus.patch new file mode 100644 index 00000000000..04c95ad38e0 --- /dev/null +++ b/queue-4.9/iio-accel-kxcjk-1013-fix-buffer-alignment-in-iio_pus.patch @@ -0,0 +1,86 @@ +From 60a33526df8bdec2a1cf19e50d12f8e02d52ff1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:06 +0100 +Subject: iio: accel: kxcjk-1013: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 3ab3aa2e7bd57497f9a7c6275c00dce237d2c9ba ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: 1a4fbf6a9286 ("iio: accel: kxcjk1013 3-axis accelerometer driver") +Signed-off-by: Jonathan Cameron +Cc: Srinivas Pandruvada +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-5-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/kxcjk-1013.c | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c +index 261fbdb88fe1..626a605a0c0e 100644 +--- a/drivers/iio/accel/kxcjk-1013.c ++++ b/drivers/iio/accel/kxcjk-1013.c +@@ -96,12 +96,23 @@ enum kx_acpi_type { + ACPI_SMO8500, + }; + ++enum kxcjk1013_axis { ++ AXIS_X, ++ AXIS_Y, ++ AXIS_Z, ++ AXIS_MAX ++}; ++ + struct kxcjk1013_data { + struct i2c_client *client; + struct iio_trigger *dready_trig; + struct iio_trigger *motion_trig; + struct mutex mutex; +- s16 buffer[8]; ++ /* Ensure timestamp naturally aligned */ ++ struct { ++ s16 chans[AXIS_MAX]; ++ s64 timestamp __aligned(8); ++ } scan; + u8 odr_bits; + u8 range; + int wake_thres; +@@ -115,13 +126,6 @@ struct kxcjk1013_data { + enum kx_acpi_type acpi_type; + }; + +-enum kxcjk1013_axis { +- AXIS_X, +- AXIS_Y, +- AXIS_Z, +- AXIS_MAX, +-}; +- + enum kxcjk1013_mode { + STANDBY, + OPERATION, +@@ -971,12 +975,12 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) + ret = i2c_smbus_read_i2c_block_data_or_emulated(data->client, + KXCJK1013_REG_XOUT_L, + AXIS_MAX * 2, +- (u8 *)data->buffer); ++ (u8 *)data->scan.chans); + mutex_unlock(&data->mutex); + if (ret < 0) + goto err; + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + data->timestamp); + err: + iio_trigger_notify_done(indio_dev->trig); +-- +2.30.2 + diff --git a/queue-4.9/iio-accel-stk8312-fix-buffer-alignment-in-iio_push_t.patch b/queue-4.9/iio-accel-stk8312-fix-buffer-alignment-in-iio_push_t.patch new file mode 100644 index 00000000000..609755fad9a --- /dev/null +++ b/queue-4.9/iio-accel-stk8312-fix-buffer-alignment-in-iio_push_t.patch @@ -0,0 +1,68 @@ +From f479c28507a5038be85510c6af67ba87fdcfda56 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:08 +0100 +Subject: iio: accel: stk8312: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit f40a71ffec808e7e51848f63f0c0d3c32d65081b ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: 95c12bba51c3 ("iio: accel: Add buffer mode for Sensortek STK8312") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-7-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/stk8312.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c +index e31023dc5f1b..24a7499049f1 100644 +--- a/drivers/iio/accel/stk8312.c ++++ b/drivers/iio/accel/stk8312.c +@@ -106,7 +106,11 @@ struct stk8312_data { + u8 mode; + struct iio_trigger *dready_trig; + bool dready_trigger_on; +- s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 64-bit timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ s8 chans[3]; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL); +@@ -443,7 +447,7 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) + ret = i2c_smbus_read_i2c_block_data(data->client, + STK8312_REG_XOUT, + STK8312_ALL_CHANNEL_SIZE, +- data->buffer); ++ data->scan.chans); + if (ret < STK8312_ALL_CHANNEL_SIZE) { + dev_err(&data->client->dev, "register read failed\n"); + mutex_unlock(&data->lock); +@@ -457,12 +461,12 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) + mutex_unlock(&data->lock); + goto err; + } +- data->buffer[i++] = ret; ++ data->scan.chans[i++] = ret; + } + } + mutex_unlock(&data->lock); + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + pf->timestamp); + err: + iio_trigger_notify_done(indio_dev->trig); +-- +2.30.2 + diff --git a/queue-4.9/iio-accel-stk8ba50-fix-buffer-alignment-in-iio_push_.patch b/queue-4.9/iio-accel-stk8ba50-fix-buffer-alignment-in-iio_push_.patch new file mode 100644 index 00000000000..8a8d6d9bc5e --- /dev/null +++ b/queue-4.9/iio-accel-stk8ba50-fix-buffer-alignment-in-iio_push_.patch @@ -0,0 +1,71 @@ +From 77684ace56c5b54216473c9a9c591b794c1172d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:09 +0100 +Subject: iio: accel: stk8ba50: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 334883894bc1e145a1e0f5de1b0d1b6a1133f0e6 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: db6a19b8251f ("iio: accel: Add trigger support for STK8BA50") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-8-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/stk8ba50.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c +index 300d955bad00..5ca179cea2fb 100644 +--- a/drivers/iio/accel/stk8ba50.c ++++ b/drivers/iio/accel/stk8ba50.c +@@ -94,12 +94,11 @@ struct stk8ba50_data { + u8 sample_rate_idx; + struct iio_trigger *dready_trig; + bool dready_trigger_on; +- /* +- * 3 x 16-bit channels (10-bit data, 6-bit padding) + +- * 1 x 16 padding + +- * 4 x 16 64-bit timestamp +- */ +- s16 buffer[8]; ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ s16 chans[3]; ++ s64 timetamp __aligned(8); ++ } scan; + }; + + #define STK8BA50_ACCEL_CHANNEL(index, reg, axis) { \ +@@ -329,7 +328,7 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) + ret = i2c_smbus_read_i2c_block_data(data->client, + STK8BA50_REG_XOUT, + STK8BA50_ALL_CHANNEL_SIZE, +- (u8 *)data->buffer); ++ (u8 *)data->scan.chans); + if (ret < STK8BA50_ALL_CHANNEL_SIZE) { + dev_err(&data->client->dev, "register read failed\n"); + goto err; +@@ -342,10 +341,10 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) + if (ret < 0) + goto err; + +- data->buffer[i++] = ret; ++ data->scan.chans[i++] = ret; + } + } +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + pf->timestamp); + err: + mutex_unlock(&data->lock); +-- +2.30.2 + diff --git a/queue-4.9/iio-adc-ti-ads1015-fix-buffer-alignment-in-iio_push_.patch b/queue-4.9/iio-adc-ti-ads1015-fix-buffer-alignment-in-iio_push_.patch new file mode 100644 index 00000000000..dd9b6be2a5e --- /dev/null +++ b/queue-4.9/iio-adc-ti-ads1015-fix-buffer-alignment-in-iio_push_.patch @@ -0,0 +1,63 @@ +From 9cda766bc72a9b2e6096163bf015b83a1c7de104 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:10 +0100 +Subject: iio: adc: ti-ads1015: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit d85d71dd1ab67eaa7351f69fec512d8f09d164e1 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of this function. + +Fixes: ecc24e72f437 ("iio: adc: Add TI ADS1015 ADC driver support") +Signed-off-by: Jonathan Cameron +Cc: Daniel Baluta +Cc: Andy Shevchenko +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-9-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/ti-ads1015.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c +index 5afe32f6587b..d892c0fe5c31 100644 +--- a/drivers/iio/adc/ti-ads1015.c ++++ b/drivers/iio/adc/ti-ads1015.c +@@ -292,10 +292,14 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p) + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + struct ads1015_data *data = iio_priv(indio_dev); +- s16 buf[8]; /* 1x s16 ADC val + 3x s16 padding + 4x s16 timestamp */ ++ /* Ensure natural alignment of timestamp */ ++ struct { ++ s16 chan; ++ s64 timestamp __aligned(8); ++ } scan; + int chan, ret, res; + +- memset(buf, 0, sizeof(buf)); ++ memset(&scan, 0, sizeof(scan)); + + mutex_lock(&data->lock); + chan = find_first_bit(indio_dev->active_scan_mask, +@@ -306,10 +310,10 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p) + goto err; + } + +- buf[0] = res; ++ scan.chan = res; + mutex_unlock(&data->lock); + +- iio_push_to_buffers_with_timestamp(indio_dev, buf, ++ iio_push_to_buffers_with_timestamp(indio_dev, &scan, + iio_get_time_ns(indio_dev)); + + err: +-- +2.30.2 + diff --git a/queue-4.9/iio-adc-vf610-fix-buffer-alignment-in-iio_push_to_bu.patch b/queue-4.9/iio-adc-vf610-fix-buffer-alignment-in-iio_push_to_bu.patch new file mode 100644 index 00000000000..1c73422a479 --- /dev/null +++ b/queue-4.9/iio-adc-vf610-fix-buffer-alignment-in-iio_push_to_bu.patch @@ -0,0 +1,59 @@ +From c1785260a9be2f9be9a5367f7de8b13deddc0132 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:11 +0100 +Subject: iio: adc: vf610: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 7765dfaa22ea08abf0c175e7553826ba2a939632 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: 0010d6b44406 ("iio: adc: vf610: Add IIO buffer support for Vybrid ADC") +Signed-off-by: Jonathan Cameron +Cc: Stefan-Gabriel Mirea +Cc: Sanchayan Maity +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-10-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/vf610_adc.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c +index d1bde6d2721e..2a14800e6514 100644 +--- a/drivers/iio/adc/vf610_adc.c ++++ b/drivers/iio/adc/vf610_adc.c +@@ -180,7 +180,11 @@ struct vf610_adc { + u32 sample_freq_avail[5]; + + struct completion completion; +- u16 buffer[8]; ++ /* Ensure the timestamp is naturally aligned */ ++ struct { ++ u16 chan; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + static const u32 vf610_hw_avgs[] = { 1, 4, 8, 16, 32 }; +@@ -592,9 +596,9 @@ static irqreturn_t vf610_adc_isr(int irq, void *dev_id) + if (coco & VF610_ADC_HS_COCO0) { + info->value = vf610_adc_read_data(info); + if (iio_buffer_enabled(indio_dev)) { +- info->buffer[0] = info->value; ++ info->scan.chan = info->value; + iio_push_to_buffers_with_timestamp(indio_dev, +- info->buffer, ++ &info->scan, + iio_get_time_ns(indio_dev)); + iio_trigger_notify_done(indio_dev->trig); + } else +-- +2.30.2 + diff --git a/queue-4.9/iio-adis_buffer-do-not-return-ints-in-irq-handlers.patch b/queue-4.9/iio-adis_buffer-do-not-return-ints-in-irq-handlers.patch new file mode 100644 index 00000000000..46aa6b1dc41 --- /dev/null +++ b/queue-4.9/iio-adis_buffer-do-not-return-ints-in-irq-handlers.patch @@ -0,0 +1,42 @@ +From a8080520f95763da93241abb5408bbb0f26de7eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Apr 2021 12:19:03 +0200 +Subject: iio: adis_buffer: do not return ints in irq handlers + +From: Nuno Sa + +[ Upstream commit d877539ad8e8fdde9af69887055fec6402be1a13 ] + +On an IRQ handler we should not return normal error codes as 'irqreturn_t' +is expected. + +Not necessarily stable material as the old check cannot fail, so it's a bug +we can not hit. + +Fixes: ccd2b52f4ac69 ("staging:iio: Add common ADIS library") +Reviewed-by: Alexandru Ardelean +Signed-off-by: Nuno Sa +Link: https://lore.kernel.org/r/20210422101911.135630-2-nuno.sa@analog.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/imu/adis_buffer.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c +index 9de553e8c214..625f54d9e382 100644 +--- a/drivers/iio/imu/adis_buffer.c ++++ b/drivers/iio/imu/adis_buffer.c +@@ -83,9 +83,6 @@ static irqreturn_t adis_trigger_handler(int irq, void *p) + struct adis *adis = iio_device_get_drvdata(indio_dev); + int ret; + +- if (!adis->buffer) +- return -ENOMEM; +- + if (adis->data->has_paging) { + mutex_lock(&adis->txrx_lock); + if (adis->current_page != 0) { +-- +2.30.2 + diff --git a/queue-4.9/iio-gyro-bmg160-fix-buffer-alignment-in-iio_push_to_.patch b/queue-4.9/iio-gyro-bmg160-fix-buffer-alignment-in-iio_push_to_.patch new file mode 100644 index 00000000000..bb7b4a58669 --- /dev/null +++ b/queue-4.9/iio-gyro-bmg160-fix-buffer-alignment-in-iio_push_to_.patch @@ -0,0 +1,61 @@ +From 354590886f40db38b3f536f7dd4ad6efa1d9edbc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:12 +0100 +Subject: iio: gyro: bmg160: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 06778d881f3798ce93ffbbbf801234292250b598 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: 13426454b649 ("iio: bmg160: Separate i2c and core driver") +Signed-off-by: Jonathan Cameron +Cc: Stephan Gerhold +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-11-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/gyro/bmg160_core.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c +index b5a5517e3ce1..ec2830c16433 100644 +--- a/drivers/iio/gyro/bmg160_core.c ++++ b/drivers/iio/gyro/bmg160_core.c +@@ -104,7 +104,11 @@ struct bmg160_data { + struct iio_trigger *dready_trig; + struct iio_trigger *motion_trig; + struct mutex mutex; +- s16 buffer[8]; ++ /* Ensure naturally aligned timestamp */ ++ struct { ++ s16 chans[3]; ++ s64 timestamp __aligned(8); ++ } scan; + u32 dps_range; + int ev_enable_state; + int slope_thres; +@@ -874,12 +878,12 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p) + + mutex_lock(&data->mutex); + ret = regmap_bulk_read(data->regmap, BMG160_REG_XOUT_L, +- data->buffer, AXIS_MAX * 2); ++ data->scan.chans, AXIS_MAX * 2); + mutex_unlock(&data->mutex); + if (ret < 0) + goto err; + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + pf->timestamp); + err: + iio_trigger_notify_done(indio_dev->trig); +-- +2.30.2 + diff --git a/queue-4.9/iio-humidity-am2315-fix-buffer-alignment-in-iio_push.patch b/queue-4.9/iio-humidity-am2315-fix-buffer-alignment-in-iio_push.patch new file mode 100644 index 00000000000..65ed1915cf6 --- /dev/null +++ b/queue-4.9/iio-humidity-am2315-fix-buffer-alignment-in-iio_push.patch @@ -0,0 +1,71 @@ +From 92e440c35c149abdc44fbfc26c1d84b2277695a0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:13 +0100 +Subject: iio: humidity: am2315: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit f4ca2e2595d9fee65d5ce0d218b22ce00e5b2915 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: 0d96d5ead3f7 ("iio: humidity: Add triggered buffer support for AM2315") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-12-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/humidity/am2315.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c +index ff96b6d0fdae..77513fd84b99 100644 +--- a/drivers/iio/humidity/am2315.c ++++ b/drivers/iio/humidity/am2315.c +@@ -36,7 +36,11 @@ + struct am2315_data { + struct i2c_client *client; + struct mutex lock; +- s16 buffer[8]; /* 2x16-bit channels + 2x16 padding + 4x16 timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ s16 chans[2]; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + struct am2315_sensor_data { +@@ -170,20 +174,20 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p) + + mutex_lock(&data->lock); + if (*(indio_dev->active_scan_mask) == AM2315_ALL_CHANNEL_MASK) { +- data->buffer[0] = sensor_data.hum_data; +- data->buffer[1] = sensor_data.temp_data; ++ data->scan.chans[0] = sensor_data.hum_data; ++ data->scan.chans[1] = sensor_data.temp_data; + } else { + i = 0; + for_each_set_bit(bit, indio_dev->active_scan_mask, + indio_dev->masklength) { +- data->buffer[i] = (bit ? sensor_data.temp_data : +- sensor_data.hum_data); ++ data->scan.chans[i] = (bit ? sensor_data.temp_data : ++ sensor_data.hum_data); + i++; + } + } + mutex_unlock(&data->lock); + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + pf->timestamp); + err: + iio_trigger_notify_done(indio_dev->trig); +-- +2.30.2 + diff --git a/queue-4.9/iio-light-isl29125-fix-buffer-alignment-in-iio_push_.patch b/queue-4.9/iio-light-isl29125-fix-buffer-alignment-in-iio_push_.patch new file mode 100644 index 00000000000..a867ab32646 --- /dev/null +++ b/queue-4.9/iio-light-isl29125-fix-buffer-alignment-in-iio_push_.patch @@ -0,0 +1,58 @@ +From e12b7c56bd57dcb9c9b3bbe5b9564e2b3ee32a74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:19 +0100 +Subject: iio: light: isl29125: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 3d4725194de6935dba2ad7c9cc075c885008f747 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: 6c25539cbc46 ("iio: Add Intersil isl29125 digital color light sensor driver") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-18-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/light/isl29125.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c +index 1d2c0c8a1d4f..207b856cef8c 100644 +--- a/drivers/iio/light/isl29125.c ++++ b/drivers/iio/light/isl29125.c +@@ -54,7 +54,11 @@ + struct isl29125_data { + struct i2c_client *client; + u8 conf1; +- u16 buffer[8]; /* 3x 16-bit, padding, 8 bytes timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ u16 chans[3]; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + #define ISL29125_CHANNEL(_color, _si) { \ +@@ -187,10 +191,10 @@ static irqreturn_t isl29125_trigger_handler(int irq, void *p) + if (ret < 0) + goto done; + +- data->buffer[j++] = ret; ++ data->scan.chans[j++] = ret; + } + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + iio_get_time_ns(indio_dev)); + + done: +-- +2.30.2 + diff --git a/queue-4.9/iio-light-tcs3414-fix-buffer-alignment-in-iio_push_t.patch b/queue-4.9/iio-light-tcs3414-fix-buffer-alignment-in-iio_push_t.patch new file mode 100644 index 00000000000..e716ccbd94a --- /dev/null +++ b/queue-4.9/iio-light-tcs3414-fix-buffer-alignment-in-iio_push_t.patch @@ -0,0 +1,58 @@ +From 47e2d55793735021db3f4cb09c359c9fd2ad7bb9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:20 +0100 +Subject: iio: light: tcs3414: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit ff08fbc22ab32ccc6690c21b0e5e1d402dcc076f ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: a244e7b57f0f ("iio: Add driver for AMS/TAOS tcs3414 digital color sensor") +Signed-off-by: Jonathan Cameron +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-19-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/light/tcs3414.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c +index a795afb7667b..b51cd43ef824 100644 +--- a/drivers/iio/light/tcs3414.c ++++ b/drivers/iio/light/tcs3414.c +@@ -56,7 +56,11 @@ struct tcs3414_data { + u8 control; + u8 gain; + u8 timing; +- u16 buffer[8]; /* 4x 16-bit + 8 bytes timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ u16 chans[4]; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + #define TCS3414_CHANNEL(_color, _si, _addr) { \ +@@ -212,10 +216,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p) + if (ret < 0) + goto done; + +- data->buffer[j++] = ret; ++ data->scan.chans[j++] = ret; + } + +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + iio_get_time_ns(indio_dev)); + + done: +-- +2.30.2 + diff --git a/queue-4.9/iio-prox-pulsed-light-fix-buffer-alignment-in-iio_pu.patch b/queue-4.9/iio-prox-pulsed-light-fix-buffer-alignment-in-iio_pu.patch new file mode 100644 index 00000000000..fe2e2ed99d9 --- /dev/null +++ b/queue-4.9/iio-prox-pulsed-light-fix-buffer-alignment-in-iio_pu.patch @@ -0,0 +1,59 @@ +From 2c66493e5bee2c1b53cb006212c651396c9b125f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 1 May 2021 18:01:15 +0100 +Subject: iio: prox: pulsed-light: Fix buffer alignment in + iio_push_to_buffers_with_timestamp() + +From: Jonathan Cameron + +[ Upstream commit 679cc377a03ff1944491eafc7355c1eb1fad4109 ] + +To make code more readable, use a structure to express the channel +layout and ensure the timestamp is 8 byte aligned. + +Found during an audit of all calls of uses of +iio_push_to_buffers_with_timestamp() + +Fixes: cb119d535083 ("iio: proximity: add support for PulsedLight LIDAR") +Signed-off-by: Jonathan Cameron +Cc: Matt Ranostay +Acked-by: Matt Ranostay +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20210501170121.512209-14-jic23@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +index 46e969a3a9b7..ed7397f0b4c8 100644 +--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c ++++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +@@ -51,7 +51,11 @@ struct lidar_data { + int (*xfer)(struct lidar_data *data, u8 reg, u8 *val, int len); + int i2c_enabled; + +- u16 buffer[8]; /* 2 byte distance + 8 byte timestamp */ ++ /* Ensure timestamp is naturally aligned */ ++ struct { ++ u16 chan; ++ s64 timestamp __aligned(8); ++ } scan; + }; + + static const struct iio_chan_spec lidar_channels[] = { +@@ -236,9 +240,9 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private) + struct lidar_data *data = iio_priv(indio_dev); + int ret; + +- ret = lidar_get_measurement(data, data->buffer); ++ ret = lidar_get_measurement(data, &data->scan.chan); + if (!ret) { +- iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, ++ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, + iio_get_time_ns(indio_dev)); + } else if (ret != -EINVAL) { + dev_err(&data->client->dev, "cannot read LIDAR measurement"); +-- +2.30.2 + diff --git a/queue-4.9/input-hil_kbd-fix-error-return-code-in-hil_dev_conne.patch b/queue-4.9/input-hil_kbd-fix-error-return-code-in-hil_dev_conne.patch new file mode 100644 index 00000000000..bd901ac9c1d --- /dev/null +++ b/queue-4.9/input-hil_kbd-fix-error-return-code-in-hil_dev_conne.patch @@ -0,0 +1,37 @@ +From 3ec5a9fee6f9f85ba4de0db10f62e200ed1b99a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 May 2021 11:52:42 -0700 +Subject: Input: hil_kbd - fix error return code in hil_dev_connect() + +From: Zhen Lei + +[ Upstream commit d9b576917a1d0efa293801a264150a1b37691617 ] + +Return error code -EINVAL rather than '0' when the combo devices are not +supported. + +Fixes: fa71c605c2bb ("Input: combine hil_kbd and hil_ptr drivers") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Link: https://lore.kernel.org/r/20210515030053.6824-1-thunder.leizhen@huawei.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/keyboard/hil_kbd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c +index 5b152f25a8e1..da07742fd9a4 100644 +--- a/drivers/input/keyboard/hil_kbd.c ++++ b/drivers/input/keyboard/hil_kbd.c +@@ -512,6 +512,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv) + HIL_IDD_NUM_AXES_PER_SET(*idd)) { + printk(KERN_INFO PREFIX + "combo devices are not supported.\n"); ++ error = -EINVAL; + goto bail1; + } + +-- +2.30.2 + diff --git a/queue-4.9/leds-ktd2692-fix-an-error-handling-path.patch b/queue-4.9/leds-ktd2692-fix-an-error-handling-path.patch new file mode 100644 index 00000000000..b66134d3837 --- /dev/null +++ b/queue-4.9/leds-ktd2692-fix-an-error-handling-path.patch @@ -0,0 +1,85 @@ +From e04c93f9d845c394bcaa1cb3f9ef5857be867091 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 13:21:01 +0200 +Subject: leds: ktd2692: Fix an error handling path + +From: Christophe JAILLET + +[ Upstream commit ee78b9360e14c276f5ceaa4a0d06f790f04ccdad ] + +In 'ktd2692_parse_dt()', if an error occurs after a successful +'regulator_enable()' call, we should call 'regulator_enable()'. + +This is the same in 'ktd2692_probe()', if an error occurs after a +successful 'ktd2692_parse_dt()' call. + +Instead of adding 'regulator_enable()' in several places, implement a +resource managed solution and simplify the remove function accordingly. + +Fixes: b7da8c5c725c ("leds: Add ktd2692 flash LED driver") +Signed-off-by: Christophe JAILLET +Signed-off-by: Pavel Machek +Signed-off-by: Sasha Levin +--- + drivers/leds/leds-ktd2692.c | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c +index 45296aaca9da..02738b5b1dbf 100644 +--- a/drivers/leds/leds-ktd2692.c ++++ b/drivers/leds/leds-ktd2692.c +@@ -259,6 +259,17 @@ static void ktd2692_setup(struct ktd2692_context *led) + | KTD2692_REG_FLASH_CURRENT_BASE); + } + ++static void regulator_disable_action(void *_data) ++{ ++ struct device *dev = _data; ++ struct ktd2692_context *led = dev_get_drvdata(dev); ++ int ret; ++ ++ ret = regulator_disable(led->regulator); ++ if (ret) ++ dev_err(dev, "Failed to disable supply: %d\n", ret); ++} ++ + static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, + struct ktd2692_led_config_data *cfg) + { +@@ -289,8 +300,14 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, + + if (led->regulator) { + ret = regulator_enable(led->regulator); +- if (ret) ++ if (ret) { + dev_err(dev, "Failed to enable supply: %d\n", ret); ++ } else { ++ ret = devm_add_action_or_reset(dev, ++ regulator_disable_action, dev); ++ if (ret) ++ return ret; ++ } + } + + child_node = of_get_next_available_child(np, NULL); +@@ -380,17 +397,9 @@ static int ktd2692_probe(struct platform_device *pdev) + static int ktd2692_remove(struct platform_device *pdev) + { + struct ktd2692_context *led = platform_get_drvdata(pdev); +- int ret; + + led_classdev_flash_unregister(&led->fled_cdev); + +- if (led->regulator) { +- ret = regulator_disable(led->regulator); +- if (ret) +- dev_err(&pdev->dev, +- "Failed to disable supply: %d\n", ret); +- } +- + mutex_destroy(&led->lock); + + return 0; +-- +2.30.2 + diff --git a/queue-4.9/media-bt8xx-fix-a-missing-check-bug-in-bt878_probe.patch b/queue-4.9/media-bt8xx-fix-a-missing-check-bug-in-bt878_probe.patch new file mode 100644 index 00000000000..d9c483da261 --- /dev/null +++ b/queue-4.9/media-bt8xx-fix-a-missing-check-bug-in-bt878_probe.patch @@ -0,0 +1,122 @@ +From aafa678e87ad73f9e6356f548dabfedaa392a293 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 May 2021 17:18:36 +0200 +Subject: media: bt8xx: Fix a missing check bug in bt878_probe + +From: Zheyu Ma + +[ Upstream commit 1a4520090681853e6b850cbe54b27247a013e0e5 ] + +In 'bt878_irq', the driver calls 'tasklet_schedule', but this tasklet is +set in 'dvb_bt8xx_load_card' of another driver 'dvb-bt8xx'. +However, this two drivers are separate. The user may not load the +'dvb-bt8xx' driver when loading the 'bt8xx' driver, that is, the tasklet +has not been initialized when 'tasklet_schedule' is called, so it is +necessary to check whether the tasklet is initialized in 'bt878_probe'. + +Fix this by adding a check at the end of bt878_probe. + +The KASAN's report reveals it: + +BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 +PGD 800000006aab2067 P4D 800000006aab2067 PUD 6b2ea067 PMD 0 +Oops: 0010 [#1] PREEMPT SMP KASAN PTI +CPU: 2 PID: 8724 Comm: syz-executor.0 Not tainted 4.19.177- +gdba4159c14ef-dirty #40 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59- +gc9ba5276e321-prebuilt.qemu.org 04/01/2014 +RIP: 0010: (null) +Code: Bad RIP value. +RSP: 0018:ffff88806c287ea0 EFLAGS: 00010246 +RAX: fffffbfff1b01774 RBX: dffffc0000000000 RCX: 0000000000000000 +RDX: 0000000000000000 RSI: 1ffffffff1b01775 RDI: 0000000000000000 +RBP: ffff88806c287f00 R08: fffffbfff1b01774 R09: fffffbfff1b01774 +R10: 0000000000000001 R11: fffffbfff1b01773 R12: 0000000000000000 +R13: ffff88806c29f530 R14: ffffffff8d80bb88 R15: ffffffff8d80bb90 +FS: 00007f6b550e6700(0000) GS:ffff88806c280000(0000) knlGS: +0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: ffffffffffffffd6 CR3: 000000005ec98000 CR4: 00000000000006e0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: + + tasklet_action_common.isra.17+0x141/0x420 kernel/softirq.c:522 + tasklet_action+0x50/0x70 kernel/softirq.c:540 + __do_softirq+0x224/0x92c kernel/softirq.c:292 + invoke_softirq kernel/softirq.c:372 [inline] + irq_exit+0x15a/0x180 kernel/softirq.c:412 + exiting_irq arch/x86/include/asm/apic.h:535 [inline] + do_IRQ+0x123/0x1e0 arch/x86/kernel/irq.c:260 + common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:670 + +RIP: 0010:__do_sys_interrupt kernel/sys.c:2593 [inline] +RIP: 0010:__se_sys_interrupt kernel/sys.c:2584 [inline] +RIP: 0010:__x64_sys_interrupt+0x5b/0x80 kernel/sys.c:2584 +Code: ba 00 04 00 00 48 c7 c7 c0 99 31 8c e8 ae 76 5e 01 48 85 c0 75 21 e8 +14 ae 24 00 48 c7 c3 c0 99 31 8c b8 0c 00 00 00 0f 01 c1 <31> db e8 fe ad +24 00 48 89 d8 5b 5d c3 48 c7 c3 ea ff ff ff eb ec +RSP: 0018:ffff888054167f10 EFLAGS: 00000212 ORIG_RAX: ffffffffffffffde +RAX: 000000000000000c RBX: ffffffff8c3199c0 RCX: ffffc90001ca6000 +RDX: 000000000000001a RSI: ffffffff813478fc RDI: ffffffff8c319dc0 +RBP: ffff888054167f18 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000080 R11: fffffbfff18633b7 R12: ffff888054167f58 +R13: ffff88805f638000 R14: 0000000000000000 R15: 0000000000000000 + do_syscall_64+0xb0/0x4e0 arch/x86/entry/common.c:293 + entry_SYSCALL_64_after_hwframe+0x49/0xbe +RIP: 0033:0x4692a9 +Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 +48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff +ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007f6b550e5c48 EFLAGS: 00000246 ORIG_RAX: 000000000000014f +RAX: ffffffffffffffda RBX: 000000000077bf60 RCX: 00000000004692a9 +RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000140 +RBP: 00000000004cf7eb R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 000000000077bf60 +R13: 0000000000000000 R14: 000000000077bf60 R15: 00007fff55a1dca0 +Modules linked in: +Dumping ftrace buffer: + (ftrace buffer empty) +CR2: 0000000000000000 +---[ end trace 68e5849c3f77cbb6 ]--- +RIP: 0010: (null) +Code: Bad RIP value. +RSP: 0018:ffff88806c287ea0 EFLAGS: 00010246 +RAX: fffffbfff1b01774 RBX: dffffc0000000000 RCX: 0000000000000000 +RDX: 0000000000000000 RSI: 1ffffffff1b01775 RDI: 0000000000000000 +RBP: ffff88806c287f00 R08: fffffbfff1b01774 R09: fffffbfff1b01774 +R10: 0000000000000001 R11: fffffbfff1b01773 R12: 0000000000000000 +R13: ffff88806c29f530 R14: ffffffff8d80bb88 R15: ffffffff8d80bb90 +FS: 00007f6b550e6700(0000) GS:ffff88806c280000(0000) knlGS: +0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: ffffffffffffffd6 CR3: 000000005ec98000 CR4: 00000000000006e0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 + +Reported-by: Zheyu Ma +Signed-off-by: Zheyu Ma +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/pci/bt8xx/bt878.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c +index 90fcccc05b56..c678d7120727 100644 +--- a/drivers/media/pci/bt8xx/bt878.c ++++ b/drivers/media/pci/bt8xx/bt878.c +@@ -494,6 +494,9 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) + btwrite(0, BT878_AINT_MASK); + bt878_num++; + ++ if (!bt->tasklet.func) ++ tasklet_disable(&bt->tasklet); ++ + return 0; + + fail2: +-- +2.30.2 + diff --git a/queue-4.9/media-cobalt-fix-race-condition-in-setting-hpd.patch b/queue-4.9/media-cobalt-fix-race-condition-in-setting-hpd.patch new file mode 100644 index 00000000000..d47e6a68652 --- /dev/null +++ b/queue-4.9/media-cobalt-fix-race-condition-in-setting-hpd.patch @@ -0,0 +1,70 @@ +From c3aaca3ff3852cc507f77e7f7bf8500a08b09765 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Apr 2021 10:00:49 +0200 +Subject: media: cobalt: fix race condition in setting HPD + +From: Hans Verkuil + +[ Upstream commit 3d37ef41bed0854805ab9af22c422267510e1344 ] + +The cobalt_s_bit_sysctrl reads the old register value over PCI, +then changes a bit and sets writes the new value to the register. + +This is used among other things for setting the HPD output pin. + +But if the HPD is changed for multiple inputs at the same time, +then this causes a race condition where a stale value is read. + +Serialize this function with a mutex. + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/pci/cobalt/cobalt-driver.c | 1 + + drivers/media/pci/cobalt/cobalt-driver.h | 7 ++++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c +index 979634000597..17b717a1c7fa 100644 +--- a/drivers/media/pci/cobalt/cobalt-driver.c ++++ b/drivers/media/pci/cobalt/cobalt-driver.c +@@ -689,6 +689,7 @@ static int cobalt_probe(struct pci_dev *pci_dev, + return -ENOMEM; + cobalt->pci_dev = pci_dev; + cobalt->instance = i; ++ mutex_init(&cobalt->pci_lock); + + retval = v4l2_device_register(&pci_dev->dev, &cobalt->v4l2_dev); + if (retval) { +diff --git a/drivers/media/pci/cobalt/cobalt-driver.h b/drivers/media/pci/cobalt/cobalt-driver.h +index ed00dc9d9399..8f9454d30b95 100644 +--- a/drivers/media/pci/cobalt/cobalt-driver.h ++++ b/drivers/media/pci/cobalt/cobalt-driver.h +@@ -262,6 +262,8 @@ struct cobalt { + int instance; + struct pci_dev *pci_dev; + struct v4l2_device v4l2_dev; ++ /* serialize PCI access in cobalt_s_bit_sysctrl() */ ++ struct mutex pci_lock; + + void __iomem *bar0, *bar1; + +@@ -333,10 +335,13 @@ static inline u32 cobalt_g_sysctrl(struct cobalt *cobalt) + static inline void cobalt_s_bit_sysctrl(struct cobalt *cobalt, + int bit, int val) + { +- u32 ctrl = cobalt_read_bar1(cobalt, COBALT_SYS_CTRL_BASE); ++ u32 ctrl; + ++ mutex_lock(&cobalt->pci_lock); ++ ctrl = cobalt_read_bar1(cobalt, COBALT_SYS_CTRL_BASE); + cobalt_write_bar1(cobalt, COBALT_SYS_CTRL_BASE, + (ctrl & ~(1UL << bit)) | (val << bit)); ++ mutex_unlock(&cobalt->pci_lock); + } + + static inline u32 cobalt_g_sysstat(struct cobalt *cobalt) +-- +2.30.2 + diff --git a/queue-4.9/media-cpia2-fix-memory-leak-in-cpia2_usb_probe.patch b/queue-4.9/media-cpia2-fix-memory-leak-in-cpia2_usb_probe.patch new file mode 100644 index 00000000000..874bd08aec2 --- /dev/null +++ b/queue-4.9/media-cpia2-fix-memory-leak-in-cpia2_usb_probe.patch @@ -0,0 +1,104 @@ +From 33f5eda69d7b9f75c0d614c998450abc5844ab16 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Apr 2021 21:43:45 +0200 +Subject: media: cpia2: fix memory leak in cpia2_usb_probe + +From: Pavel Skripkin + +[ Upstream commit be8656e62e9e791837b606a027802b504a945c97 ] + +syzbot reported leak in cpia2 usb driver. The problem was +in invalid error handling. + +v4l2_device_register() is called in cpia2_init_camera_struct(), but +all error cases after cpia2_init_camera_struct() did not call the +v4l2_device_unregister() + +Reported-by: syzbot+d1e69c888f0d3866ead4@syzkaller.appspotmail.com +Signed-off-by: Pavel Skripkin +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/cpia2/cpia2.h | 1 + + drivers/media/usb/cpia2/cpia2_core.c | 12 ++++++++++++ + drivers/media/usb/cpia2/cpia2_usb.c | 13 +++++++------ + 3 files changed, 20 insertions(+), 6 deletions(-) + +diff --git a/drivers/media/usb/cpia2/cpia2.h b/drivers/media/usb/cpia2/cpia2.h +index cdef677d57ec..80a7af6482ae 100644 +--- a/drivers/media/usb/cpia2/cpia2.h ++++ b/drivers/media/usb/cpia2/cpia2.h +@@ -442,6 +442,7 @@ int cpia2_send_command(struct camera_data *cam, struct cpia2_command *cmd); + int cpia2_do_command(struct camera_data *cam, + unsigned int command, + unsigned char direction, unsigned char param); ++void cpia2_deinit_camera_struct(struct camera_data *cam, struct usb_interface *intf); + struct camera_data *cpia2_init_camera_struct(struct usb_interface *intf); + int cpia2_init_camera(struct camera_data *cam); + int cpia2_allocate_buffers(struct camera_data *cam); +diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c +index 0310fd6ed103..828f9689f4a1 100644 +--- a/drivers/media/usb/cpia2/cpia2_core.c ++++ b/drivers/media/usb/cpia2/cpia2_core.c +@@ -2158,6 +2158,18 @@ static void reset_camera_struct(struct camera_data *cam) + cam->height = cam->params.roi.height; + } + ++/****************************************************************************** ++ * ++ * cpia2_init_camera_struct ++ * ++ * Deinitialize camera struct ++ *****************************************************************************/ ++void cpia2_deinit_camera_struct(struct camera_data *cam, struct usb_interface *intf) ++{ ++ v4l2_device_unregister(&cam->v4l2_dev); ++ kfree(cam); ++} ++ + /****************************************************************************** + * + * cpia2_init_camera_struct +diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c +index 30e27844e0e9..4f4a130f17af 100644 +--- a/drivers/media/usb/cpia2/cpia2_usb.c ++++ b/drivers/media/usb/cpia2/cpia2_usb.c +@@ -860,15 +860,13 @@ static int cpia2_usb_probe(struct usb_interface *intf, + ret = set_alternate(cam, USBIF_CMDONLY); + if (ret < 0) { + ERR("%s: usb_set_interface error (ret = %d)\n", __func__, ret); +- kfree(cam); +- return ret; ++ goto alt_err; + } + + + if((ret = cpia2_init_camera(cam)) < 0) { + ERR("%s: failed to initialize cpia2 camera (ret = %d)\n", __func__, ret); +- kfree(cam); +- return ret; ++ goto alt_err; + } + LOG(" CPiA Version: %d.%02d (%d.%d)\n", + cam->params.version.firmware_revision_hi, +@@ -888,11 +886,14 @@ static int cpia2_usb_probe(struct usb_interface *intf, + ret = cpia2_register_camera(cam); + if (ret < 0) { + ERR("%s: Failed to register cpia2 camera (ret = %d)\n", __func__, ret); +- kfree(cam); +- return ret; ++ goto alt_err; + } + + return 0; ++ ++alt_err: ++ cpia2_deinit_camera_struct(cam, intf); ++ return ret; + } + + /****************************************************************************** +-- +2.30.2 + diff --git a/queue-4.9/media-dvb_net-avoid-speculation-from-net-slot.patch b/queue-4.9/media-dvb_net-avoid-speculation-from-net-slot.patch new file mode 100644 index 00000000000..ad240868847 --- /dev/null +++ b/queue-4.9/media-dvb_net-avoid-speculation-from-net-slot.patch @@ -0,0 +1,89 @@ +From 1aa0ee319ff5698f6ebb8193d4cc99c5e331d361 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jun 2021 13:13:54 +0200 +Subject: media: dvb_net: avoid speculation from net slot + +From: Mauro Carvalho Chehab + +[ Upstream commit abc0226df64dc137b48b911c1fe4319aec5891bb ] + +The risk of especulation is actually almost-non-existing here, +as there are very few users of TCP/IP using the DVB stack, +as, this is mainly used with DVB-S/S2 cards, and only by people +that receives TCP/IP from satellite connections, which limits +a lot the number of users of such feature(*). + +(*) In thesis, DVB-C cards could also benefit from it, but I'm +yet to see a hardware that supports it. + +Yet, fixing it is trivial. + +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-core/dvb_net.c | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c +index 9914f69a4a02..f133489af9b9 100644 +--- a/drivers/media/dvb-core/dvb_net.c ++++ b/drivers/media/dvb-core/dvb_net.c +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1350,14 +1351,20 @@ static int dvb_net_do_ioctl(struct file *file, + struct net_device *netdev; + struct dvb_net_priv *priv_data; + struct dvb_net_if *dvbnetif = parg; ++ int if_num = dvbnetif->if_num; + +- if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX || +- !dvbnet->state[dvbnetif->if_num]) { ++ if (if_num >= DVB_NET_DEVICES_MAX) { + ret = -EINVAL; + goto ioctl_error; + } ++ if_num = array_index_nospec(if_num, DVB_NET_DEVICES_MAX); + +- netdev = dvbnet->device[dvbnetif->if_num]; ++ if (!dvbnet->state[if_num]) { ++ ret = -EINVAL; ++ goto ioctl_error; ++ } ++ ++ netdev = dvbnet->device[if_num]; + + priv_data = netdev_priv(netdev); + dvbnetif->pid=priv_data->pid; +@@ -1410,14 +1417,20 @@ static int dvb_net_do_ioctl(struct file *file, + struct net_device *netdev; + struct dvb_net_priv *priv_data; + struct __dvb_net_if_old *dvbnetif = parg; ++ int if_num = dvbnetif->if_num; ++ ++ if (if_num >= DVB_NET_DEVICES_MAX) { ++ ret = -EINVAL; ++ goto ioctl_error; ++ } ++ if_num = array_index_nospec(if_num, DVB_NET_DEVICES_MAX); + +- if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX || +- !dvbnet->state[dvbnetif->if_num]) { ++ if (!dvbnet->state[if_num]) { + ret = -EINVAL; + goto ioctl_error; + } + +- netdev = dvbnet->device[dvbnetif->if_num]; ++ netdev = dvbnet->device[if_num]; + + priv_data = netdev_priv(netdev); + dvbnetif->pid=priv_data->pid; +-- +2.30.2 + diff --git a/queue-4.9/media-i2c-change-rst-to-rset-to-fix-multiple-build-e.patch b/queue-4.9/media-i2c-change-rst-to-rset-to-fix-multiple-build-e.patch new file mode 100644 index 00000000000..a6466d8c43e --- /dev/null +++ b/queue-4.9/media-i2c-change-rst-to-rset-to-fix-multiple-build-e.patch @@ -0,0 +1,244 @@ +From e0949de790dc509aa86127bbecec22835b2365c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 30 Apr 2021 22:19:55 +0200 +Subject: media: I2C: change 'RST' to "RSET" to fix multiple build errors + +From: Randy Dunlap + +[ Upstream commit 8edcb5049ac29aa3c8acc5ef15dd4036543d747e ] + +The use of an enum named 'RST' conflicts with a #define macro +named 'RST' in arch/mips/include/asm/mach-rc32434/rb.h. + +The MIPS use of RST was there first (AFAICT), so change the +media/i2c/ uses of RST to be named 'RSET'. +'git grep -w RSET' does not report any naming conflicts with the +new name. + +This fixes multiple build errors: + +arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token + 15 | #define RST (1 << 15) + | ^ +drivers/media/i2c/s5c73m3/s5c73m3.h:356:2: note: in expansion of macro 'RST' + 356 | RST, + | ^~~ + +../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token + 15 | #define RST (1 << 15) + | ^ +../drivers/media/i2c/s5k6aa.c:180:2: note: in expansion of macro 'RST' + 180 | RST, + | ^~~ + +../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token + 15 | #define RST (1 << 15) + | ^ +../drivers/media/i2c/s5k5baf.c:238:2: note: in expansion of macro 'RST' + 238 | RST, + | ^~~ + +and some others that I have trimmed. + +Fixes: cac47f1822fc ("[media] V4L: Add S5C73M3 camera driver") +Fixes: 8b99312b7214 ("[media] Add v4l2 subdev driver for S5K4ECGX sensor") +Fixes: 7d459937dc09 ("[media] Add driver for Samsung S5K5BAF camera sensor") +Fixes: bfa8dd3a0524 ("[media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +Cc: Shawn Guo +Cc: Sascha Hauer +Cc: Pengutronix Kernel Team +Cc: Fabio Estevam +Cc: NXP Linux Team +Cc: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +Cc: Andrzej Hajda +Cc: Sylwester Nawrocki +Cc: Sangwook Lee +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +++--- + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/s5k4ecgx.c | 10 +++++----- + drivers/media/i2c/s5k5baf.c | 6 +++--- + drivers/media/i2c/s5k6aa.c | 10 +++++----- + 5 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c +index 3844853ab0a0..9d55abfe070f 100644 +--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c ++++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c +@@ -1393,7 +1393,7 @@ static int __s5c73m3_power_on(struct s5c73m3 *state) + s5c73m3_gpio_deassert(state, STBY); + usleep_range(100, 200); + +- s5c73m3_gpio_deassert(state, RST); ++ s5c73m3_gpio_deassert(state, RSET); + usleep_range(50, 100); + + return 0; +@@ -1408,7 +1408,7 @@ static int __s5c73m3_power_off(struct s5c73m3 *state) + { + int i, ret; + +- if (s5c73m3_gpio_assert(state, RST)) ++ if (s5c73m3_gpio_assert(state, RSET)) + usleep_range(10, 50); + + if (s5c73m3_gpio_assert(state, STBY)) +@@ -1613,7 +1613,7 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) + + state->mclk_frequency = pdata->mclk_frequency; + state->gpio[STBY] = pdata->gpio_stby; +- state->gpio[RST] = pdata->gpio_reset; ++ state->gpio[RSET] = pdata->gpio_reset; + return 0; + } + +diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h +index 653f68e7ea07..e267b2522149 100644 +--- a/drivers/media/i2c/s5c73m3/s5c73m3.h ++++ b/drivers/media/i2c/s5c73m3/s5c73m3.h +@@ -361,7 +361,7 @@ struct s5c73m3_ctrls { + + enum s5c73m3_gpio_id { + STBY, +- RST, ++ RSET, + GPIO_NUM, + }; + +diff --git a/drivers/media/i2c/s5k4ecgx.c b/drivers/media/i2c/s5k4ecgx.c +index 6ebcf254989a..75fb13a33eab 100644 +--- a/drivers/media/i2c/s5k4ecgx.c ++++ b/drivers/media/i2c/s5k4ecgx.c +@@ -177,7 +177,7 @@ static const char * const s5k4ecgx_supply_names[] = { + + enum s5k4ecgx_gpio_id { + STBY, +- RST, ++ RSET, + GPIO_NUM, + }; + +@@ -482,7 +482,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv) + if (s5k4ecgx_gpio_set_value(priv, STBY, priv->gpio[STBY].level)) + usleep_range(30, 50); + +- if (s5k4ecgx_gpio_set_value(priv, RST, priv->gpio[RST].level)) ++ if (s5k4ecgx_gpio_set_value(priv, RSET, priv->gpio[RSET].level)) + usleep_range(30, 50); + + return 0; +@@ -490,7 +490,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv) + + static int __s5k4ecgx_power_off(struct s5k4ecgx *priv) + { +- if (s5k4ecgx_gpio_set_value(priv, RST, !priv->gpio[RST].level)) ++ if (s5k4ecgx_gpio_set_value(priv, RSET, !priv->gpio[RSET].level)) + usleep_range(30, 50); + + if (s5k4ecgx_gpio_set_value(priv, STBY, !priv->gpio[STBY].level)) +@@ -878,7 +878,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv, + int ret; + + priv->gpio[STBY].gpio = -EINVAL; +- priv->gpio[RST].gpio = -EINVAL; ++ priv->gpio[RSET].gpio = -EINVAL; + + ret = s5k4ecgx_config_gpio(gpio->gpio, gpio->level, "S5K4ECGX_STBY"); + +@@ -897,7 +897,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv, + s5k4ecgx_free_gpios(priv); + return ret; + } +- priv->gpio[RST] = *gpio; ++ priv->gpio[RSET] = *gpio; + if (gpio_is_valid(gpio->gpio)) + gpio_set_value(gpio->gpio, 0); + +diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c +index db82ed05792e..e8c820cb418b 100644 +--- a/drivers/media/i2c/s5k5baf.c ++++ b/drivers/media/i2c/s5k5baf.c +@@ -238,7 +238,7 @@ struct s5k5baf_gpio { + + enum s5k5baf_gpio_id { + STBY, +- RST, ++ RSET, + NUM_GPIOS, + }; + +@@ -973,7 +973,7 @@ static int s5k5baf_power_on(struct s5k5baf *state) + + s5k5baf_gpio_deassert(state, STBY); + usleep_range(50, 100); +- s5k5baf_gpio_deassert(state, RST); ++ s5k5baf_gpio_deassert(state, RSET); + return 0; + + err_reg_dis: +@@ -991,7 +991,7 @@ static int s5k5baf_power_off(struct s5k5baf *state) + state->apply_cfg = 0; + state->apply_crop = 0; + +- s5k5baf_gpio_assert(state, RST); ++ s5k5baf_gpio_assert(state, RSET); + s5k5baf_gpio_assert(state, STBY); + + if (!IS_ERR(state->clock)) +diff --git a/drivers/media/i2c/s5k6aa.c b/drivers/media/i2c/s5k6aa.c +index 4b615b4b0463..4d92aac279dc 100644 +--- a/drivers/media/i2c/s5k6aa.c ++++ b/drivers/media/i2c/s5k6aa.c +@@ -181,7 +181,7 @@ static const char * const s5k6aa_supply_names[] = { + + enum s5k6aa_gpio_id { + STBY, +- RST, ++ RSET, + GPIO_NUM, + }; + +@@ -845,7 +845,7 @@ static int __s5k6aa_power_on(struct s5k6aa *s5k6aa) + ret = s5k6aa->s_power(1); + usleep_range(4000, 4000); + +- if (s5k6aa_gpio_deassert(s5k6aa, RST)) ++ if (s5k6aa_gpio_deassert(s5k6aa, RSET)) + msleep(20); + + return ret; +@@ -855,7 +855,7 @@ static int __s5k6aa_power_off(struct s5k6aa *s5k6aa) + { + int ret; + +- if (s5k6aa_gpio_assert(s5k6aa, RST)) ++ if (s5k6aa_gpio_assert(s5k6aa, RSET)) + usleep_range(100, 150); + + if (s5k6aa->s_power) { +@@ -1514,7 +1514,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa, + int ret; + + s5k6aa->gpio[STBY].gpio = -EINVAL; +- s5k6aa->gpio[RST].gpio = -EINVAL; ++ s5k6aa->gpio[RSET].gpio = -EINVAL; + + gpio = &pdata->gpio_stby; + if (gpio_is_valid(gpio->gpio)) { +@@ -1537,7 +1537,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa, + if (ret < 0) + return ret; + +- s5k6aa->gpio[RST] = *gpio; ++ s5k6aa->gpio[RSET] = *gpio; + } + + return 0; +-- +2.30.2 + diff --git a/queue-4.9/media-pvrusb2-fix-warning-in-pvr2_i2c_core_done.patch b/queue-4.9/media-pvrusb2-fix-warning-in-pvr2_i2c_core_done.patch new file mode 100644 index 00000000000..f64a4f5bac5 --- /dev/null +++ b/queue-4.9/media-pvrusb2-fix-warning-in-pvr2_i2c_core_done.patch @@ -0,0 +1,60 @@ +From 4af69a7f1b2ae3a164c829ecb19b10eaaf0c9b32 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 4 May 2021 19:08:58 +0200 +Subject: media: pvrusb2: fix warning in pvr2_i2c_core_done + +From: Anirudh Rayabharam + +[ Upstream commit f8194e5e63fdcb349e8da9eef9e574d5b1d687cb ] + +syzbot has reported the following warning in pvr2_i2c_done: + + sysfs group 'power' not found for kobject '1-0043' + +When the device is disconnected (pvr_hdw_disconnect), the i2c adapter is +not unregistered along with the USB and v4l2 teardown. As part of the USB +device disconnect, the sysfs files of the subdevices are also deleted. +So, by the time pvr_i2c_core_done is called by pvr_context_destroy, the +sysfs files have been deleted. + +To fix this, unregister the i2c adapter too in pvr_hdw_disconnect. Make +the device deregistration code shared by calling pvr_hdw_disconnect from +pvr2_hdw_destroy. + +Reported-by: syzbot+e74a998ca8f1df9cc332@syzkaller.appspotmail.com +Tested-by: syzbot+e74a998ca8f1df9cc332@syzkaller.appspotmail.com +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Anirudh Rayabharam +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +index ff489645e070..0cb8dd585235 100644 +--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c ++++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +@@ -2722,9 +2722,8 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) + pvr2_stream_destroy(hdw->vid_stream); + hdw->vid_stream = NULL; + } +- pvr2_i2c_core_done(hdw); + v4l2_device_unregister(&hdw->v4l2_dev); +- pvr2_hdw_remove_usb_stuff(hdw); ++ pvr2_hdw_disconnect(hdw); + mutex_lock(&pvr2_unit_mtx); + do { + if ((hdw->unit_number >= 0) && +@@ -2751,6 +2750,7 @@ void pvr2_hdw_disconnect(struct pvr2_hdw *hdw) + { + pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_disconnect(hdw=%p)",hdw); + LOCK_TAKE(hdw->big_lock); ++ pvr2_i2c_core_done(hdw); + LOCK_TAKE(hdw->ctl_lock); + pvr2_hdw_remove_usb_stuff(hdw); + LOCK_GIVE(hdw->ctl_lock); +-- +2.30.2 + diff --git a/queue-4.9/media-s5p-g2d-fix-a-memory-leak-on-ctx-fh.m2m_ctx.patch b/queue-4.9/media-s5p-g2d-fix-a-memory-leak-on-ctx-fh.m2m_ctx.patch new file mode 100644 index 00000000000..f175586fb1f --- /dev/null +++ b/queue-4.9/media-s5p-g2d-fix-a-memory-leak-on-ctx-fh.m2m_ctx.patch @@ -0,0 +1,40 @@ +From 141c2cc2b504f1d7030e5979294ecd24d9d36470 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:18:32 +0200 +Subject: media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx + +From: Dillon Min + +[ Upstream commit 5d11e6aad1811ea293ee2996cec9124f7fccb661 ] + +The m2m_ctx resources was allocated by v4l2_m2m_ctx_init() in g2d_open() +should be freed from g2d_release() when it's not used. + +Fix it + +Fixes: 918847341af0 ("[media] v4l: add G2D driver for s5p device family") +Signed-off-by: Dillon Min +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/s5p-g2d/g2d.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c +index 5f6ccf492111..8f083f28dcf3 100644 +--- a/drivers/media/platform/s5p-g2d/g2d.c ++++ b/drivers/media/platform/s5p-g2d/g2d.c +@@ -283,6 +283,9 @@ static int g2d_release(struct file *file) + struct g2d_dev *dev = video_drvdata(file); + struct g2d_ctx *ctx = fh2ctx(file->private_data); + ++ mutex_lock(&dev->mutex); ++ v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); ++ mutex_unlock(&dev->mutex); + v4l2_ctrl_handler_free(&ctx->ctrl_handler); + v4l2_fh_del(&ctx->fh); + v4l2_fh_exit(&ctx->fh); +-- +2.30.2 + diff --git a/queue-4.9/media-s5p_cec-decrement-usage-count-if-disabled.patch b/queue-4.9/media-s5p_cec-decrement-usage-count-if-disabled.patch new file mode 100644 index 00000000000..a86d69b7a65 --- /dev/null +++ b/queue-4.9/media-s5p_cec-decrement-usage-count-if-disabled.patch @@ -0,0 +1,39 @@ +From 728116c33ef5df6f7c3c31fef12e9a1fd96fe6e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 28 Apr 2021 09:38:56 +0200 +Subject: media: s5p_cec: decrement usage count if disabled + +From: Mauro Carvalho Chehab + +[ Upstream commit 747bad54a677d8633ec14b39dfbeb859c821d7f2 ] + +There's a bug at s5p_cec_adap_enable(): if called to +disable the device, it should call pm_runtime_put() +instead of pm_runtime_disable(), as the goal here is to +decrement the usage_count and not to disable PM runtime. + +Reported-by: Sylwester Nawrocki +Reviewed-by: Jonathan Cameron +Fixes: 1bcbf6f4b6b0 ("[media] cec: s5p-cec: Add s5p-cec driver") +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/staging/media/s5p-cec/s5p_cec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/staging/media/s5p-cec/s5p_cec.c +index 58d756231136..bebd44d9bd51 100644 +--- a/drivers/staging/media/s5p-cec/s5p_cec.c ++++ b/drivers/staging/media/s5p-cec/s5p_cec.c +@@ -54,7 +54,7 @@ static int s5p_cec_adap_enable(struct cec_adapter *adap, bool enable) + } else { + s5p_cec_mask_tx_interrupts(cec); + s5p_cec_mask_rx_interrupts(cec); +- pm_runtime_disable(cec->dev); ++ pm_runtime_put(cec->dev); + } + + return 0; +-- +2.30.2 + diff --git a/queue-4.9/media-siano-fix-device-register-error-path.patch b/queue-4.9/media-siano-fix-device-register-error-path.patch new file mode 100644 index 00000000000..79afe571dea --- /dev/null +++ b/queue-4.9/media-siano-fix-device-register-error-path.patch @@ -0,0 +1,39 @@ +From ee2b32b8c0258b1da47903586cbf993fcc48b482 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jun 2021 08:57:02 +0200 +Subject: media: siano: fix device register error path + +From: Mauro Carvalho Chehab + +[ Upstream commit 5368b1ee2939961a16e74972b69088433fc52195 ] + +As reported by smatch: + drivers/media/common/siano/smsdvb-main.c:1231 smsdvb_hotplug() warn: '&client->entry' not removed from list + +If an error occur at the end of the registration logic, it won't +drop the device from the list. + +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/common/siano/smsdvb-main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c +index 9d5eb8b6aede..3a5b5f94398a 100644 +--- a/drivers/media/common/siano/smsdvb-main.c ++++ b/drivers/media/common/siano/smsdvb-main.c +@@ -1187,6 +1187,10 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, + return 0; + + media_graph_error: ++ mutex_lock(&g_smsdvb_clientslock); ++ list_del(&client->entry); ++ mutex_unlock(&g_smsdvb_clientslock); ++ + smsdvb_debugfs_release(client); + + client_error: +-- +2.30.2 + diff --git a/queue-4.9/media-siano-fix-out-of-bounds-warnings-in-smscore_lo.patch b/queue-4.9/media-siano-fix-out-of-bounds-warnings-in-smscore_lo.patch new file mode 100644 index 00000000000..4847e5253a6 --- /dev/null +++ b/queue-4.9/media-siano-fix-out-of-bounds-warnings-in-smscore_lo.patch @@ -0,0 +1,167 @@ +From 2240a3f21c47c81ddc9ca3f5b3b1bebb988814a3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Mar 2021 19:40:43 -0600 +Subject: media: siano: Fix out-of-bounds warnings in + smscore_load_firmware_family2() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gustavo A. R. Silva + +[ Upstream commit 13dfead49db07225335d4f587a560a2210391a1a ] + +Rename struct sms_msg_data4 to sms_msg_data5 and increase the size of +its msg_data array from 4 to 5 elements. Notice that at some point +the 5th element of msg_data is being accessed in function +smscore_load_firmware_family2(): + +1006 trigger_msg->msg_data[4] = 4; /* Task ID */ + +Also, there is no need for the object _trigger_msg_ of type struct +sms_msg_data *, when _msg_ can be used, directly. Notice that msg_data +in struct sms_msg_data is a one-element array, which causes multiple +out-of-bounds warnings when accessing beyond its first element +in function smscore_load_firmware_family2(): + + 992 struct sms_msg_data *trigger_msg = + 993 (struct sms_msg_data *) msg; + 994 + 995 pr_debug("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n"); + 996 SMS_INIT_MSG(&msg->x_msg_header, + 997 MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, + 998 sizeof(struct sms_msg_hdr) + + 999 sizeof(u32) * 5); +1000 +1001 trigger_msg->msg_data[0] = firmware->start_address; +1002 /* Entry point */ +1003 trigger_msg->msg_data[1] = 6; /* Priority */ +1004 trigger_msg->msg_data[2] = 0x200; /* Stack size */ +1005 trigger_msg->msg_data[3] = 0; /* Parameter */ +1006 trigger_msg->msg_data[4] = 4; /* Task ID */ + +even when enough dynamic memory is allocated for _msg_: + + 929 /* PAGE_SIZE buffer shall be enough and dma aligned */ + 930 msg = kmalloc(PAGE_SIZE, GFP_KERNEL | coredev->gfp_buf_flags); + +but as _msg_ is casted to (struct sms_msg_data *): + + 992 struct sms_msg_data *trigger_msg = + 993 (struct sms_msg_data *) msg; + +the out-of-bounds warnings are actually valid and should be addressed. + +Fix this by declaring object _msg_ of type struct sms_msg_data5 *, +which contains a 5-elements array, instead of just 4. And use +_msg_ directly, instead of creating object trigger_msg. + +This helps with the ongoing efforts to enable -Warray-bounds by fixing +the following warnings: + + CC [M] drivers/media/common/siano/smscoreapi.o +drivers/media/common/siano/smscoreapi.c: In function ‘smscore_load_firmware_family2’: +drivers/media/common/siano/smscoreapi.c:1003:24: warning: array subscript 1 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds] + 1003 | trigger_msg->msg_data[1] = 6; /* Priority */ + | ~~~~~~~~~~~~~~~~~~~~~^~~ +In file included from drivers/media/common/siano/smscoreapi.c:12: +drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’ + 619 | u32 msg_data[1]; + | ^~~~~~~~ +drivers/media/common/siano/smscoreapi.c:1004:24: warning: array subscript 2 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds] + 1004 | trigger_msg->msg_data[2] = 0x200; /* Stack size */ + | ~~~~~~~~~~~~~~~~~~~~~^~~ +In file included from drivers/media/common/siano/smscoreapi.c:12: +drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’ + 619 | u32 msg_data[1]; + | ^~~~~~~~ +drivers/media/common/siano/smscoreapi.c:1005:24: warning: array subscript 3 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds] + 1005 | trigger_msg->msg_data[3] = 0; /* Parameter */ + | ~~~~~~~~~~~~~~~~~~~~~^~~ +In file included from drivers/media/common/siano/smscoreapi.c:12: +drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’ + 619 | u32 msg_data[1]; + | ^~~~~~~~ +drivers/media/common/siano/smscoreapi.c:1006:24: warning: array subscript 4 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds] + 1006 | trigger_msg->msg_data[4] = 4; /* Task ID */ + | ~~~~~~~~~~~~~~~~~~~~~^~~ +In file included from drivers/media/common/siano/smscoreapi.c:12: +drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’ + 619 | u32 msg_data[1]; + | ^~~~~~~~ + +Fixes: 018b0c6f8acb ("[media] siano: make load firmware logic to work with newer firmwares") +Co-developed-by: Kees Cook +Signed-off-by: Kees Cook +Signed-off-by: Gustavo A. R. Silva +Signed-off-by: Sasha Levin +--- + drivers/media/common/siano/smscoreapi.c | 22 +++++++++------------- + drivers/media/common/siano/smscoreapi.h | 4 ++-- + 2 files changed, 11 insertions(+), 15 deletions(-) + +diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c +index f3a42834d7d6..b10bd45da9c5 100644 +--- a/drivers/media/common/siano/smscoreapi.c ++++ b/drivers/media/common/siano/smscoreapi.c +@@ -914,7 +914,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, + void *buffer, size_t size) + { + struct sms_firmware *firmware = (struct sms_firmware *) buffer; +- struct sms_msg_data4 *msg; ++ struct sms_msg_data5 *msg; + u32 mem_address, calc_checksum = 0; + u32 i, *ptr; + u8 *payload = firmware->payload; +@@ -995,24 +995,20 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, + goto exit_fw_download; + + if (coredev->mode == DEVICE_MODE_NONE) { +- struct sms_msg_data *trigger_msg = +- (struct sms_msg_data *) msg; +- + pr_debug("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n"); + SMS_INIT_MSG(&msg->x_msg_header, + MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, +- sizeof(struct sms_msg_hdr) + +- sizeof(u32) * 5); ++ sizeof(*msg)); + +- trigger_msg->msg_data[0] = firmware->start_address; ++ msg->msg_data[0] = firmware->start_address; + /* Entry point */ +- trigger_msg->msg_data[1] = 6; /* Priority */ +- trigger_msg->msg_data[2] = 0x200; /* Stack size */ +- trigger_msg->msg_data[3] = 0; /* Parameter */ +- trigger_msg->msg_data[4] = 4; /* Task ID */ ++ msg->msg_data[1] = 6; /* Priority */ ++ msg->msg_data[2] = 0x200; /* Stack size */ ++ msg->msg_data[3] = 0; /* Parameter */ ++ msg->msg_data[4] = 4; /* Task ID */ + +- rc = smscore_sendrequest_and_wait(coredev, trigger_msg, +- trigger_msg->x_msg_header.msg_length, ++ rc = smscore_sendrequest_and_wait(coredev, msg, ++ msg->x_msg_header.msg_length, + &coredev->trigger_done); + } else { + SMS_INIT_MSG(&msg->x_msg_header, MSG_SW_RELOAD_EXEC_REQ, +diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h +index 4cc39e4a8318..55d02c27f124 100644 +--- a/drivers/media/common/siano/smscoreapi.h ++++ b/drivers/media/common/siano/smscoreapi.h +@@ -636,9 +636,9 @@ struct sms_msg_data2 { + u32 msg_data[2]; + }; + +-struct sms_msg_data4 { ++struct sms_msg_data5 { + struct sms_msg_hdr x_msg_header; +- u32 msg_data[4]; ++ u32 msg_data[5]; + }; + + struct sms_data_download { +-- +2.30.2 + diff --git a/queue-4.9/media-st-hva-fix-potential-null-pointer-dereferences.patch b/queue-4.9/media-st-hva-fix-potential-null-pointer-dereferences.patch new file mode 100644 index 00000000000..f7907538c6f --- /dev/null +++ b/queue-4.9/media-st-hva-fix-potential-null-pointer-dereferences.patch @@ -0,0 +1,40 @@ +From 207f0b790c49e550d81d7b87b0ff5b51dca782ba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 May 2021 14:04:49 +0200 +Subject: media: st-hva: Fix potential NULL pointer dereferences + +From: Evgeny Novikov + +[ Upstream commit b7fdd208687ba59ebfb09b2199596471c63b69e3 ] + +When ctx_id >= HVA_MAX_INSTANCES in hva_hw_its_irq_thread() it tries to +access fields of ctx that is NULL at that point. The patch gets rid of +these accesses. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Evgeny Novikov +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/sti/hva/hva-hw.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/sti/hva/hva-hw.c +index c4d97fb80aae..1653892da9a5 100644 +--- a/drivers/media/platform/sti/hva/hva-hw.c ++++ b/drivers/media/platform/sti/hva/hva-hw.c +@@ -127,8 +127,7 @@ static irqreturn_t hva_hw_its_irq_thread(int irq, void *arg) + ctx_id = (hva->sts_reg & 0xFF00) >> 8; + if (ctx_id >= HVA_MAX_INSTANCES) { + dev_err(dev, "%s %s: bad context identifier: %d\n", +- ctx->name, __func__, ctx_id); +- ctx->hw_err = true; ++ HVA_PREFIX, __func__, ctx_id); + goto out; + } + +-- +2.30.2 + diff --git a/queue-4.9/media-tc358743-fix-error-return-code-in-tc358743_pro.patch b/queue-4.9/media-tc358743-fix-error-return-code-in-tc358743_pro.patch new file mode 100644 index 00000000000..dc1eaaae6a5 --- /dev/null +++ b/queue-4.9/media-tc358743-fix-error-return-code-in-tc358743_pro.patch @@ -0,0 +1,38 @@ +From f285aa3475f6873d7644135d8d8b35d9ec18540e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 May 2021 08:58:30 +0200 +Subject: media: tc358743: Fix error return code in tc358743_probe_of() + +From: Zhen Lei + +[ Upstream commit a6b1e7093f0a099571fc8836ab4a589633f956a8 ] + +When the CSI bps per lane is not in the valid range, an appropriate error +code -EINVAL should be returned. However, we currently do not explicitly +assign this error code to 'ret'. As a result, 0 was incorrectly returned. + +Fixes: 256148246852 ("[media] tc358743: support probe from device tree") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/tc358743.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c +index 3e47b432d0f4..c799071be66f 100644 +--- a/drivers/media/i2c/tc358743.c ++++ b/drivers/media/i2c/tc358743.c +@@ -1763,6 +1763,7 @@ static int tc358743_probe_of(struct tc358743_state *state) + bps_pr_lane = 2 * endpoint->link_frequencies[0]; + if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) { + dev_err(dev, "unsupported bps per lane: %u bps\n", bps_pr_lane); ++ ret = -EINVAL; + goto disable_clk; + } + +-- +2.30.2 + diff --git a/queue-4.9/media-v4l2-core-avoid-the-dangling-pointer-in-v4l2_f.patch b/queue-4.9/media-v4l2-core-avoid-the-dangling-pointer-in-v4l2_f.patch new file mode 100644 index 00000000000..dd65a2fb262 --- /dev/null +++ b/queue-4.9/media-v4l2-core-avoid-the-dangling-pointer-in-v4l2_f.patch @@ -0,0 +1,39 @@ +From 8901b602d1ca765d80e4349497281e2f7d974688 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 9 May 2021 10:24:02 +0200 +Subject: media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release + +From: Lv Yunlong + +[ Upstream commit 7dd0c9e547b6924e18712b6b51aa3cba1896ee2c ] + +A use after free bug caused by the dangling pointer +filp->privitate_data in v4l2_fh_release. +See https://lore.kernel.org/patchwork/patch/1419058/. + +My patch sets the dangling pointer to NULL to provide +robust. + +Signed-off-by: Lv Yunlong +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/v4l2-core/v4l2-fh.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c +index 0c5e69070586..d44b289205b4 100644 +--- a/drivers/media/v4l2-core/v4l2-fh.c ++++ b/drivers/media/v4l2-core/v4l2-fh.c +@@ -109,6 +109,7 @@ int v4l2_fh_release(struct file *filp) + v4l2_fh_del(fh); + v4l2_fh_exit(fh); + kfree(fh); ++ filp->private_data = NULL; + } + return 0; + } +-- +2.30.2 + diff --git a/queue-4.9/mm-huge_memory.c-don-t-discard-hugepage-if-other-pro.patch b/queue-4.9/mm-huge_memory.c-don-t-discard-hugepage-if-other-pro.patch new file mode 100644 index 00000000000..5f13873bba7 --- /dev/null +++ b/queue-4.9/mm-huge_memory.c-don-t-discard-hugepage-if-other-pro.patch @@ -0,0 +1,58 @@ +From 3fdd1e7a972b1c6d2655811639f386b007cab14b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Jun 2021 18:47:57 -0700 +Subject: mm/huge_memory.c: don't discard hugepage if other processes are + mapping it + +From: Miaohe Lin + +[ Upstream commit babbbdd08af98a59089334eb3effbed5a7a0cf7f ] + +If other processes are mapping any other subpages of the hugepage, i.e. +in pte-mapped thp case, page_mapcount() will return 1 incorrectly. Then +we would discard the page while other processes are still mapping it. Fix +it by using total_mapcount() which can tell whether other processes are +still mapping it. + +Link: https://lkml.kernel.org/r/20210511134857.1581273-6-linmiaohe@huawei.com +Fixes: b8d3c4c3009d ("mm/huge_memory.c: don't split THP page when MADV_FREE syscall is called") +Reviewed-by: Yang Shi +Signed-off-by: Miaohe Lin +Cc: Alexey Dobriyan +Cc: "Aneesh Kumar K . V" +Cc: Anshuman Khandual +Cc: David Hildenbrand +Cc: Hugh Dickins +Cc: Johannes Weiner +Cc: Kirill A. Shutemov +Cc: Matthew Wilcox +Cc: Minchan Kim +Cc: Ralph Campbell +Cc: Rik van Riel +Cc: Song Liu +Cc: William Kucharski +Cc: Zi Yan +Cc: Mike Kravetz +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + mm/huge_memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mm/huge_memory.c b/mm/huge_memory.c +index 177ca028b986..91f33bb43f17 100644 +--- a/mm/huge_memory.c ++++ b/mm/huge_memory.c +@@ -1369,7 +1369,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, + * If other processes are mapping this page, we couldn't discard + * the page unless they all do MADV_FREE so let's skip the page. + */ +- if (page_mapcount(page) != 1) ++ if (total_mapcount(page) != 1) + goto out; + + if (!trylock_page(page)) +-- +2.30.2 + diff --git a/queue-4.9/mmc-usdhi6rol0-fix-error-return-code-in-usdhi6_probe.patch b/queue-4.9/mmc-usdhi6rol0-fix-error-return-code-in-usdhi6_probe.patch new file mode 100644 index 00000000000..8f59917e4e0 --- /dev/null +++ b/queue-4.9/mmc-usdhi6rol0-fix-error-return-code-in-usdhi6_probe.patch @@ -0,0 +1,37 @@ +From c2c28355bd37e9c1f1ab8782b40a1d00e5028f47 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 10:03:21 +0800 +Subject: mmc: usdhi6rol0: fix error return code in usdhi6_probe() + +From: Zhen Lei + +[ Upstream commit 2f9ae69e5267f53e89e296fccee291975a85f0eb ] + +Fix to return a negative error code from the error handling case instead +of 0, as done elsewhere in this function. + +Fixes: 75fa9ea6e3c0 ("mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Link: https://lore.kernel.org/r/20210508020321.1677-1-thunder.leizhen@huawei.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/usdhi6rol0.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c +index 003aecc44122..ad0a467bb464 100644 +--- a/drivers/mmc/host/usdhi6rol0.c ++++ b/drivers/mmc/host/usdhi6rol0.c +@@ -1809,6 +1809,7 @@ static int usdhi6_probe(struct platform_device *pdev) + + version = usdhi6_read(host, USDHI6_VERSION); + if ((version & 0xfff) != 0xa0d) { ++ ret = -EPERM; + dev_err(dev, "Version not recognized %x\n", version); + goto e_clk_off; + } +-- +2.30.2 + diff --git a/queue-4.9/mmc-via-sdmmc-add-a-check-against-null-pointer-deref.patch b/queue-4.9/mmc-via-sdmmc-add-a-check-against-null-pointer-deref.patch new file mode 100644 index 00000000000..91c5195c4e5 --- /dev/null +++ b/queue-4.9/mmc-via-sdmmc-add-a-check-against-null-pointer-deref.patch @@ -0,0 +1,140 @@ +From 0582c43318a5ebfa065dce35ab04f59804c810c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jun 2021 13:33:20 +0000 +Subject: mmc: via-sdmmc: add a check against NULL pointer dereference + +From: Zheyu Ma + +[ Upstream commit 45c8ddd06c4b729c56a6083ab311bfbd9643f4a6 ] + +Before referencing 'host->data', the driver needs to check whether it is +null pointer, otherwise it will cause a null pointer reference. + +This log reveals it: + +[ 29.355199] BUG: kernel NULL pointer dereference, address: +0000000000000014 +[ 29.357323] #PF: supervisor write access in kernel mode +[ 29.357706] #PF: error_code(0x0002) - not-present page +[ 29.358088] PGD 0 P4D 0 +[ 29.358280] Oops: 0002 [#1] PREEMPT SMP PTI +[ 29.358595] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 5.12.4- +g70e7f0549188-dirty #102 +[ 29.359164] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), +BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 +[ 29.359978] RIP: 0010:via_sdc_isr+0x21f/0x410 +[ 29.360314] Code: ff ff e8 84 aa d0 fd 66 45 89 7e 28 66 41 f7 c4 00 +10 75 56 e8 72 aa d0 fd 66 41 f7 c4 00 c0 74 10 e8 65 aa d0 fd 48 8b 43 +18 40 14 ac ff ff ff e8 55 aa d0 fd 48 89 df e8 ad fb ff ff e9 77 +[ 29.361661] RSP: 0018:ffffc90000118e98 EFLAGS: 00010046 +[ 29.362042] RAX: 0000000000000000 RBX: ffff888107d77880 +RCX: 0000000000000000 +[ 29.362564] RDX: 0000000000000000 RSI: ffffffff835d20bb +RDI: 00000000ffffffff +[ 29.363085] RBP: ffffc90000118ed8 R08: 0000000000000001 +R09: 0000000000000001 +[ 29.363604] R10: 0000000000000000 R11: 0000000000000001 +R12: 0000000000008600 +[ 29.364128] R13: ffff888107d779c8 R14: ffffc90009c00200 +R15: 0000000000008000 +[ 29.364651] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) +knlGS:0000000000000000 +[ 29.365235] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 29.365655] CR2: 0000000000000014 CR3: 0000000005a2e000 +CR4: 00000000000006e0 +[ 29.366170] DR0: 0000000000000000 DR1: 0000000000000000 +DR2: 0000000000000000 +[ 29.366683] DR3: 0000000000000000 DR6: 00000000fffe0ff0 +DR7: 0000000000000400 +[ 29.367197] Call Trace: +[ 29.367381] +[ 29.367537] __handle_irq_event_percpu+0x53/0x3e0 +[ 29.367916] handle_irq_event_percpu+0x35/0x90 +[ 29.368247] handle_irq_event+0x39/0x60 +[ 29.368632] handle_fasteoi_irq+0xc2/0x1d0 +[ 29.368950] __common_interrupt+0x7f/0x150 +[ 29.369254] common_interrupt+0xb4/0xd0 +[ 29.369547] +[ 29.369708] asm_common_interrupt+0x1e/0x40 +[ 29.370016] RIP: 0010:native_safe_halt+0x17/0x20 +[ 29.370360] Code: 07 0f 00 2d db 80 43 00 f4 5d c3 0f 1f 84 00 00 00 +00 00 8b 05 c2 37 e5 01 55 48 89 e5 85 c0 7e 07 0f 00 2d bb 80 43 00 fb +f4 <5d> c3 cc cc cc cc cc cc cc 55 48 89 e5 e8 67 53 ff ff 8b 0d f9 91 +[ 29.371696] RSP: 0018:ffffc9000008fe90 EFLAGS: 00000246 +[ 29.372079] RAX: 0000000000000000 RBX: 0000000000000002 +RCX: 0000000000000000 +[ 29.372595] RDX: 0000000000000000 RSI: ffffffff854f67a4 +RDI: ffffffff85403406 +[ 29.373122] RBP: ffffc9000008fe90 R08: 0000000000000001 +R09: 0000000000000001 +[ 29.373646] R10: 0000000000000000 R11: 0000000000000001 +R12: ffffffff86009188 +[ 29.374160] R13: 0000000000000000 R14: 0000000000000000 +R15: ffff888100258000 +[ 29.374690] default_idle+0x9/0x10 +[ 29.374944] arch_cpu_idle+0xa/0x10 +[ 29.375198] default_idle_call+0x6e/0x250 +[ 29.375491] do_idle+0x1f0/0x2d0 +[ 29.375740] cpu_startup_entry+0x18/0x20 +[ 29.376034] start_secondary+0x11f/0x160 +[ 29.376328] secondary_startup_64_no_verify+0xb0/0xbb +[ 29.376705] Modules linked in: +[ 29.376939] Dumping ftrace buffer: +[ 29.377187] (ftrace buffer empty) +[ 29.377460] CR2: 0000000000000014 +[ 29.377712] ---[ end trace 51a473dffb618c47 ]--- +[ 29.378056] RIP: 0010:via_sdc_isr+0x21f/0x410 +[ 29.378380] Code: ff ff e8 84 aa d0 fd 66 45 89 7e 28 66 41 f7 c4 00 +10 75 56 e8 72 aa d0 fd 66 41 f7 c4 00 c0 74 10 e8 65 aa d0 fd 48 8b 43 +18 40 14 ac ff ff ff e8 55 aa d0 fd 48 89 df e8 ad fb ff ff e9 77 +[ 29.379714] RSP: 0018:ffffc90000118e98 EFLAGS: 00010046 +[ 29.380098] RAX: 0000000000000000 RBX: ffff888107d77880 +RCX: 0000000000000000 +[ 29.380614] RDX: 0000000000000000 RSI: ffffffff835d20bb +RDI: 00000000ffffffff +[ 29.381134] RBP: ffffc90000118ed8 R08: 0000000000000001 +R09: 0000000000000001 +[ 29.381653] R10: 0000000000000000 R11: 0000000000000001 +R12: 0000000000008600 +[ 29.382176] R13: ffff888107d779c8 R14: ffffc90009c00200 +R15: 0000000000008000 +[ 29.382697] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) +knlGS:0000000000000000 +[ 29.383277] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 29.383697] CR2: 0000000000000014 CR3: 0000000005a2e000 +CR4: 00000000000006e0 +[ 29.384223] DR0: 0000000000000000 DR1: 0000000000000000 +DR2: 0000000000000000 +[ 29.384736] DR3: 0000000000000000 DR6: 00000000fffe0ff0 +DR7: 0000000000000400 +[ 29.385260] Kernel panic - not syncing: Fatal exception in interrupt +[ 29.385882] Dumping ftrace buffer: +[ 29.386135] (ftrace buffer empty) +[ 29.386401] Kernel Offset: disabled +[ 29.386656] Rebooting in 1 seconds.. + +Signed-off-by: Zheyu Ma +Link: https://lore.kernel.org/r/1622727200-15808-1-git-send-email-zheyuma97@gmail.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/via-sdmmc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c +index b455e9cf95af..a3472127bea3 100644 +--- a/drivers/mmc/host/via-sdmmc.c ++++ b/drivers/mmc/host/via-sdmmc.c +@@ -859,6 +859,9 @@ static void via_sdc_data_isr(struct via_crdr_mmc_host *host, u16 intmask) + { + BUG_ON(intmask == 0); + ++ if (!host->data) ++ return; ++ + if (intmask & VIA_CRDR_SDSTS_DT) + host->data->error = -ETIMEDOUT; + else if (intmask & (VIA_CRDR_SDSTS_RC | VIA_CRDR_SDSTS_WC)) +-- +2.30.2 + diff --git a/queue-4.9/net-ethernet-aeroflex-fix-uaf-in-greth_of_remove.patch b/queue-4.9/net-ethernet-aeroflex-fix-uaf-in-greth_of_remove.patch new file mode 100644 index 00000000000..b675371243c --- /dev/null +++ b/queue-4.9/net-ethernet-aeroflex-fix-uaf-in-greth_of_remove.patch @@ -0,0 +1,54 @@ +From 00b3f8a3423253a10220e84ddede846ab58e4af5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jun 2021 17:57:31 +0300 +Subject: net: ethernet: aeroflex: fix UAF in greth_of_remove + +From: Pavel Skripkin + +[ Upstream commit e3a5de6d81d8b2199935c7eb3f7d17a50a7075b7 ] + +static int greth_of_remove(struct platform_device *of_dev) +{ +... + struct greth_private *greth = netdev_priv(ndev); +... + unregister_netdev(ndev); + free_netdev(ndev); + + of_iounmap(&of_dev->resource[0], greth->regs, resource_size(&of_dev->resource[0])); +... +} + +greth is netdev private data, but it is used +after free_netdev(). It can cause use-after-free when accessing greth +pointer. So, fix it by moving free_netdev() after of_iounmap() +call. + +Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver") +Signed-off-by: Pavel Skripkin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/aeroflex/greth.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c +index f8df8248035e..31e02ca56572 100644 +--- a/drivers/net/ethernet/aeroflex/greth.c ++++ b/drivers/net/ethernet/aeroflex/greth.c +@@ -1554,10 +1554,11 @@ static int greth_of_remove(struct platform_device *of_dev) + mdiobus_unregister(greth->mdio); + + unregister_netdev(ndev); +- free_netdev(ndev); + + of_iounmap(&of_dev->resource[0], greth->regs, resource_size(&of_dev->resource[0])); + ++ free_netdev(ndev); ++ + return 0; + } + +-- +2.30.2 + diff --git a/queue-4.9/net-ethernet-ezchip-fix-error-handling.patch b/queue-4.9/net-ethernet-ezchip-fix-error-handling.patch new file mode 100644 index 00000000000..39326dbc9b9 --- /dev/null +++ b/queue-4.9/net-ethernet-ezchip-fix-error-handling.patch @@ -0,0 +1,44 @@ +From a315b4857446646547bb0d27ed1df712aa17ba8f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jun 2021 19:14:47 +0300 +Subject: net: ethernet: ezchip: fix error handling + +From: Pavel Skripkin + +[ Upstream commit 0de449d599594f5472e00267d651615c7f2c6c1d ] + +As documented at drivers/base/platform.c for platform_get_irq: + + * Gets an IRQ for a platform device and prints an error message if finding the + * IRQ fails. Device drivers should check the return value for errors so as to + * not pass a negative integer value to the request_irq() APIs. + +So, the driver should check that platform_get_irq() return value +is _negative_, not that it's equal to zero, because -ENXIO (return +value from request_irq() if irq was not found) will +pass this check and it leads to passing negative irq to request_irq() + +Fixes: 0dd077093636 ("NET: Add ezchip ethernet driver") +Signed-off-by: Pavel Skripkin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c +index 1edf1c76c22c..6de29f2a0a09 100644 +--- a/drivers/net/ethernet/ezchip/nps_enet.c ++++ b/drivers/net/ethernet/ezchip/nps_enet.c +@@ -624,7 +624,7 @@ static s32 nps_enet_probe(struct platform_device *pdev) + + /* Get IRQ number */ + priv->irq = platform_get_irq(pdev, 0); +- if (!priv->irq) { ++ if (priv->irq < 0) { + dev_err(dev, "failed to retrieve value from device tree\n"); + err = -ENODEV; + goto out_netdev; +-- +2.30.2 + diff --git a/queue-4.9/net-ethernet-ezchip-fix-uaf-in-nps_enet_remove.patch b/queue-4.9/net-ethernet-ezchip-fix-uaf-in-nps_enet_remove.patch new file mode 100644 index 00000000000..363515a5d30 --- /dev/null +++ b/queue-4.9/net-ethernet-ezchip-fix-uaf-in-nps_enet_remove.patch @@ -0,0 +1,39 @@ +From 9b87738ec0a87114f76defacf349a9591a262632 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jun 2021 19:14:31 +0300 +Subject: net: ethernet: ezchip: fix UAF in nps_enet_remove + +From: Pavel Skripkin + +[ Upstream commit e4b8700e07a86e8eab6916aa5c5ba99042c34089 ] + +priv is netdev private data, but it is used +after free_netdev(). It can cause use-after-free when accessing priv +pointer. So, fix it by moving free_netdev() after netif_napi_del() +call. + +Fixes: 0dd077093636 ("NET: Add ezchip ethernet driver") +Signed-off-by: Pavel Skripkin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c +index 223f35cc034c..1edf1c76c22c 100644 +--- a/drivers/net/ethernet/ezchip/nps_enet.c ++++ b/drivers/net/ethernet/ezchip/nps_enet.c +@@ -659,8 +659,8 @@ static s32 nps_enet_remove(struct platform_device *pdev) + struct nps_enet_priv *priv = netdev_priv(ndev); + + unregister_netdev(ndev); +- free_netdev(ndev); + netif_napi_del(&priv->napi); ++ free_netdev(ndev); + + return 0; + } +-- +2.30.2 + diff --git a/queue-4.9/net-pch_gbe-propagate-error-from-devm_gpio_request_o.patch b/queue-4.9/net-pch_gbe-propagate-error-from-devm_gpio_request_o.patch new file mode 100644 index 00000000000..2553d45f761 --- /dev/null +++ b/queue-4.9/net-pch_gbe-propagate-error-from-devm_gpio_request_o.patch @@ -0,0 +1,56 @@ +From e9a719ff74c08671cc8110785f1b2b76b151a591 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 May 2021 19:39:27 +0300 +Subject: net: pch_gbe: Propagate error from devm_gpio_request_one() + +From: Andy Shevchenko + +[ Upstream commit 9e3617a7b84512bf96c04f9cf82d1a7257d33794 ] + +If GPIO controller is not available yet we need to defer +the probe of GBE until provider will become available. + +While here, drop GPIOF_EXPORT because it's deprecated and +may not be available. + +Fixes: f1a26fdf5944 ("pch_gbe: Add MinnowBoard support") +Signed-off-by: Andy Shevchenko +Tested-by: Flavio Suligoi +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +index 3cd87a41ac92..5d39b5319d50 100644 +--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c ++++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +@@ -2617,9 +2617,13 @@ static int pch_gbe_probe(struct pci_dev *pdev, + adapter->pdev = pdev; + adapter->hw.back = adapter; + adapter->hw.reg = pcim_iomap_table(pdev)[PCH_GBE_PCI_BAR]; ++ + adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data; +- if (adapter->pdata && adapter->pdata->platform_init) +- adapter->pdata->platform_init(pdev); ++ if (adapter->pdata && adapter->pdata->platform_init) { ++ ret = adapter->pdata->platform_init(pdev); ++ if (ret) ++ goto err_free_netdev; ++ } + + adapter->ptp_pdev = pci_get_bus_and_slot(adapter->pdev->bus->number, + PCI_DEVFN(12, 4)); +@@ -2709,7 +2713,7 @@ err_free_netdev: + */ + static int pch_gbe_minnow_platform_init(struct pci_dev *pdev) + { +- unsigned long flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH | GPIOF_EXPORT; ++ unsigned long flags = GPIOF_OUT_INIT_HIGH; + unsigned gpio = MINNOW_PHY_RESET_GPIO; + int ret; + +-- +2.30.2 + diff --git a/queue-4.9/net-sched-fix-warning-in-tcindex_alloc_perfect_hash.patch b/queue-4.9/net-sched-fix-warning-in-tcindex_alloc_perfect_hash.patch new file mode 100644 index 00000000000..b6b09655a5d --- /dev/null +++ b/queue-4.9/net-sched-fix-warning-in-tcindex_alloc_perfect_hash.patch @@ -0,0 +1,40 @@ +From 0df5991ddde5625353012d27371421c4a4065c49 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Jun 2021 23:23:48 +0300 +Subject: net: sched: fix warning in tcindex_alloc_perfect_hash + +From: Pavel Skripkin + +[ Upstream commit 3f2db250099f46988088800052cdf2332c7aba61 ] + +Syzbot reported warning in tcindex_alloc_perfect_hash. The problem +was in too big cp->hash, which triggers warning in kmalloc. Since +cp->hash comes from userspace, there is no need to warn if value +is not correct + +Fixes: b9a24bb76bf6 ("net_sched: properly handle failure case of tcf_exts_init()") +Reported-and-tested-by: syzbot+1071ad60cd7df39fdadb@syzkaller.appspotmail.com +Signed-off-by: Pavel Skripkin +Acked-by: Cong Wang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/sched/cls_tcindex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c +index 70ee78d8f8fb..7aafb402e5c7 100644 +--- a/net/sched/cls_tcindex.c ++++ b/net/sched/cls_tcindex.c +@@ -247,7 +247,7 @@ static int tcindex_alloc_perfect_hash(struct tcindex_data *cp) + int i, err = 0; + + cp->perfect = kcalloc(cp->hash, sizeof(struct tcindex_filter_result), +- GFP_KERNEL); ++ GFP_KERNEL | __GFP_NOWARN); + if (!cp->perfect) + return -ENOMEM; + +-- +2.30.2 + diff --git a/queue-4.9/netfilter-nft_exthdr-check-for-ipv6-packet-before-fu.patch b/queue-4.9/netfilter-nft_exthdr-check-for-ipv6-packet-before-fu.patch new file mode 100644 index 00000000000..ea8778bcd35 --- /dev/null +++ b/queue-4.9/netfilter-nft_exthdr-check-for-ipv6-packet-before-fu.patch @@ -0,0 +1,38 @@ +From afc35bd92b4da75e9ae4fb004b56c76a0fe01975 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jun 2021 20:20:30 +0200 +Subject: netfilter: nft_exthdr: check for IPv6 packet before further + processing + +From: Pablo Neira Ayuso + +[ Upstream commit cdd73cc545c0fb9b1a1f7b209f4f536e7990cff4 ] + +ipv6_find_hdr() does not validate that this is an IPv6 packet. Add a +sanity check for calling ipv6_find_hdr() to make sure an IPv6 packet +is passed for parsing. + +Fixes: 96518518cc41 ("netfilter: add nftables") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nft_exthdr.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c +index 47beb3abcc9d..e2c815ee06d0 100644 +--- a/net/netfilter/nft_exthdr.c ++++ b/net/netfilter/nft_exthdr.c +@@ -34,6 +34,9 @@ static void nft_exthdr_eval(const struct nft_expr *expr, + unsigned int offset = 0; + int err; + ++ if (pkt->skb->protocol != htons(ETH_P_IPV6)) ++ goto err; ++ + err = ipv6_find_hdr(pkt->skb, &offset, priv->type, NULL, NULL); + if (err < 0) + goto err; +-- +2.30.2 + diff --git a/queue-4.9/netlabel-fix-memory-leak-in-netlbl_mgmt_add_common.patch b/queue-4.9/netlabel-fix-memory-leak-in-netlbl_mgmt_add_common.patch new file mode 100644 index 00000000000..06e7319924f --- /dev/null +++ b/queue-4.9/netlabel-fix-memory-leak-in-netlbl_mgmt_add_common.patch @@ -0,0 +1,114 @@ +From a026ab254f82fe7e1838523d3615579af78df2ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jun 2021 10:14:44 +0800 +Subject: netlabel: Fix memory leak in netlbl_mgmt_add_common + +From: Liu Shixin + +[ Upstream commit b8f6b0522c298ae9267bd6584e19b942a0636910 ] + +Hulk Robot reported memory leak in netlbl_mgmt_add_common. +The problem is non-freed map in case of netlbl_domhsh_add() failed. + +BUG: memory leak +unreferenced object 0xffff888100ab7080 (size 96): + comm "syz-executor537", pid 360, jiffies 4294862456 (age 22.678s) + hex dump (first 32 bytes): + 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + fe 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 ................ + backtrace: + [<0000000008b40026>] netlbl_mgmt_add_common.isra.0+0xb2a/0x1b40 + [<000000003be10950>] netlbl_mgmt_add+0x271/0x3c0 + [<00000000c70487ed>] genl_family_rcv_msg_doit.isra.0+0x20e/0x320 + [<000000001f2ff614>] genl_rcv_msg+0x2bf/0x4f0 + [<0000000089045792>] netlink_rcv_skb+0x134/0x3d0 + [<0000000020e96fdd>] genl_rcv+0x24/0x40 + [<0000000042810c66>] netlink_unicast+0x4a0/0x6a0 + [<000000002e1659f0>] netlink_sendmsg+0x789/0xc70 + [<000000006e43415f>] sock_sendmsg+0x139/0x170 + [<00000000680a73d7>] ____sys_sendmsg+0x658/0x7d0 + [<0000000065cbb8af>] ___sys_sendmsg+0xf8/0x170 + [<0000000019932b6c>] __sys_sendmsg+0xd3/0x190 + [<00000000643ac172>] do_syscall_64+0x37/0x90 + [<000000009b79d6dc>] entry_SYSCALL_64_after_hwframe+0x44/0xae + +Fixes: 63c416887437 ("netlabel: Add network address selectors to the NetLabel/LSM domain mapping") +Reported-by: Hulk Robot +Signed-off-by: Liu Shixin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/netlabel/netlabel_mgmt.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c +index f85d0e07af2d..9be851ce97c2 100644 +--- a/net/netlabel/netlabel_mgmt.c ++++ b/net/netlabel/netlabel_mgmt.c +@@ -96,6 +96,7 @@ static const struct nla_policy netlbl_mgmt_genl_policy[NLBL_MGMT_A_MAX + 1] = { + static int netlbl_mgmt_add_common(struct genl_info *info, + struct netlbl_audit *audit_info) + { ++ void *pmap = NULL; + int ret_val = -EINVAL; + struct netlbl_domaddr_map *addrmap = NULL; + struct cipso_v4_doi *cipsov4 = NULL; +@@ -195,6 +196,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, + ret_val = -ENOMEM; + goto add_free_addrmap; + } ++ pmap = map; + map->list.addr = addr->s_addr & mask->s_addr; + map->list.mask = mask->s_addr; + map->list.valid = 1; +@@ -203,10 +205,8 @@ static int netlbl_mgmt_add_common(struct genl_info *info, + map->def.cipso = cipsov4; + + ret_val = netlbl_af4list_add(&map->list, &addrmap->list4); +- if (ret_val != 0) { +- kfree(map); +- goto add_free_addrmap; +- } ++ if (ret_val != 0) ++ goto add_free_map; + + entry->family = AF_INET; + entry->def.type = NETLBL_NLTYPE_ADDRSELECT; +@@ -243,6 +243,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, + ret_val = -ENOMEM; + goto add_free_addrmap; + } ++ pmap = map; + map->list.addr = *addr; + map->list.addr.s6_addr32[0] &= mask->s6_addr32[0]; + map->list.addr.s6_addr32[1] &= mask->s6_addr32[1]; +@@ -255,10 +256,8 @@ static int netlbl_mgmt_add_common(struct genl_info *info, + map->def.calipso = calipso; + + ret_val = netlbl_af6list_add(&map->list, &addrmap->list6); +- if (ret_val != 0) { +- kfree(map); +- goto add_free_addrmap; +- } ++ if (ret_val != 0) ++ goto add_free_map; + + entry->family = AF_INET6; + entry->def.type = NETLBL_NLTYPE_ADDRSELECT; +@@ -268,10 +267,12 @@ static int netlbl_mgmt_add_common(struct genl_info *info, + + ret_val = netlbl_domhsh_add(entry, audit_info); + if (ret_val != 0) +- goto add_free_addrmap; ++ goto add_free_map; + + return 0; + ++add_free_map: ++ kfree(pmap); + add_free_addrmap: + kfree(addrmap); + add_doi_put_def: +-- +2.30.2 + diff --git a/queue-4.9/ocfs2-fix-snprintf-checking.patch b/queue-4.9/ocfs2-fix-snprintf-checking.patch new file mode 100644 index 00000000000..db5c576ffc2 --- /dev/null +++ b/queue-4.9/ocfs2-fix-snprintf-checking.patch @@ -0,0 +1,85 @@ +From 3ed32cc916da867f4c56c9964462ba4853c20dbb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Jun 2021 19:34:01 -0700 +Subject: ocfs2: fix snprintf() checking + +From: Dan Carpenter + +[ Upstream commit 54e948c60cc843b6e84dc44496edc91f51d2a28e ] + +The snprintf() function returns the number of bytes which would have been +printed if the buffer was large enough. In other words it can return ">= +remain" but this code assumes it returns "== remain". + +The run time impact of this bug is not very severe. The next iteration +through the loop would trigger a WARN() when we pass a negative limit to +snprintf(). We would then return success instead of -E2BIG. + +The kernel implementation of snprintf() will never return negatives so +there is no need to check and I have deleted that dead code. + +Link: https://lkml.kernel.org/r/20210511135350.GV1955@kadam +Fixes: a860f6eb4c6a ("ocfs2: sysfile interfaces for online file check") +Fixes: 74ae4e104dfc ("ocfs2: Create stack glue sysfs files.") +Signed-off-by: Dan Carpenter +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/ocfs2/filecheck.c | 6 +----- + fs/ocfs2/stackglue.c | 8 ++------ + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c +index 2cabbcf2f28e..5571268b681c 100644 +--- a/fs/ocfs2/filecheck.c ++++ b/fs/ocfs2/filecheck.c +@@ -431,11 +431,7 @@ static ssize_t ocfs2_filecheck_show(struct kobject *kobj, + ret = snprintf(buf + total, remain, "%lu\t\t%u\t%s\n", + p->fe_ino, p->fe_done, + ocfs2_filecheck_error(p->fe_status)); +- if (ret < 0) { +- total = ret; +- break; +- } +- if (ret == remain) { ++ if (ret >= remain) { + /* snprintf() didn't fit */ + total = -E2BIG; + break; +diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c +index 52c07346bea3..03e1c6cd6f3c 100644 +--- a/fs/ocfs2/stackglue.c ++++ b/fs/ocfs2/stackglue.c +@@ -510,11 +510,7 @@ static ssize_t ocfs2_loaded_cluster_plugins_show(struct kobject *kobj, + list_for_each_entry(p, &ocfs2_stack_list, sp_list) { + ret = snprintf(buf, remain, "%s\n", + p->sp_name); +- if (ret < 0) { +- total = ret; +- break; +- } +- if (ret == remain) { ++ if (ret >= remain) { + /* snprintf() didn't fit */ + total = -E2BIG; + break; +@@ -541,7 +537,7 @@ static ssize_t ocfs2_active_cluster_plugin_show(struct kobject *kobj, + if (active_stack) { + ret = snprintf(buf, PAGE_SIZE, "%s\n", + active_stack->sp_name); +- if (ret == PAGE_SIZE) ++ if (ret >= PAGE_SIZE) + ret = -E2BIG; + } + spin_unlock(&ocfs2_stack_lock); +-- +2.30.2 + diff --git a/queue-4.9/of-fix-truncation-of-memory-sizes-on-32-bit-platform.patch b/queue-4.9/of-fix-truncation-of-memory-sizes-on-32-bit-platform.patch new file mode 100644 index 00000000000..e23c0260468 --- /dev/null +++ b/queue-4.9/of-fix-truncation-of-memory-sizes-on-32-bit-platform.patch @@ -0,0 +1,87 @@ +From 592c2f8aa06ae222a348cf618290b47851f6e2f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jun 2021 11:27:44 +0200 +Subject: of: Fix truncation of memory sizes on 32-bit platforms + +From: Geert Uytterhoeven + +[ Upstream commit 2892d8a00d23d511a0591ac4b2ff3f050ae1f004 ] + +Variable "size" has type "phys_addr_t", which can be either 32-bit or +64-bit on 32-bit systems, while "unsigned long" is always 32-bit on +32-bit systems. Hence the cast in + + (unsigned long)size / SZ_1M + +may truncate a 64-bit size to 32-bit, as casts have a higher operator +precedence than divisions. + +Fix this by inverting the order of the cast and division, which should +be safe for memory blocks smaller than 4 PiB. Note that the division is +actually a shift, as SZ_1M is a power-of-two constant, hence there is no +need to use div_u64(). + +While at it, use "%lu" to format "unsigned long". + +Fixes: e8d9d1f5485b52ec ("drivers: of: add initialization code for static reserved memory") +Fixes: 3f0c8206644836e4 ("drivers: of: add initialization code for dynamic reserved memory") +Signed-off-by: Geert Uytterhoeven +Acked-by: Marek Szyprowski +Link: https://lore.kernel.org/r/4a1117e72d13d26126f57be034c20dac02f1e915.1623835273.git.geert+renesas@glider.be +Signed-off-by: Rob Herring +Signed-off-by: Sasha Levin +--- + drivers/of/fdt.c | 8 ++++---- + drivers/of/of_reserved_mem.c | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c +index e9360d5cbcba..6a239c9bbf59 100644 +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -605,11 +605,11 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, + + if (size && + early_init_dt_reserve_memory_arch(base, size, nomap) == 0) +- pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n", +- uname, &base, (unsigned long)size / SZ_1M); ++ pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n", ++ uname, &base, (unsigned long)(size / SZ_1M)); + else +- pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n", +- uname, &base, (unsigned long)size / SZ_1M); ++ pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n", ++ uname, &base, (unsigned long)(size / SZ_1M)); + + len -= t_len; + if (first) { +diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c +index f15bb936dfd8..fca446a13bbb 100644 +--- a/drivers/of/of_reserved_mem.c ++++ b/drivers/of/of_reserved_mem.c +@@ -158,9 +158,9 @@ static int __init __reserved_mem_alloc_size(unsigned long node, + ret = early_init_dt_alloc_reserved_memory_arch(size, + align, start, end, nomap, &base); + if (ret == 0) { +- pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", ++ pr_debug("allocated memory for '%s' node: base %pa, size %lu MiB\n", + uname, &base, +- (unsigned long)size / SZ_1M); ++ (unsigned long)(size / SZ_1M)); + break; + } + len -= t_len; +@@ -170,8 +170,8 @@ static int __init __reserved_mem_alloc_size(unsigned long node, + ret = early_init_dt_alloc_reserved_memory_arch(size, align, + 0, 0, nomap, &base); + if (ret == 0) +- pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", +- uname, &base, (unsigned long)size / SZ_1M); ++ pr_debug("allocated memory for '%s' node: base %pa, size %lu MiB\n", ++ uname, &base, (unsigned long)(size / SZ_1M)); + } + + if (base == 0) { +-- +2.30.2 + diff --git a/queue-4.9/pata_ep93xx-fix-deferred-probing.patch b/queue-4.9/pata_ep93xx-fix-deferred-probing.patch new file mode 100644 index 00000000000..bc056ba351b --- /dev/null +++ b/queue-4.9/pata_ep93xx-fix-deferred-probing.patch @@ -0,0 +1,39 @@ +From 4e87eefc654665fb227e3adcfc2a7fee86860776 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 20 Mar 2021 23:32:38 +0300 +Subject: pata_ep93xx: fix deferred probing + +From: Sergey Shtylyov + +[ Upstream commit 5c8121262484d99bffb598f39a0df445cecd8efb ] + +The driver overrides the error codes returned by platform_get_irq() to +-ENXIO, so if it returns -EPROBE_DEFER, the driver would fail the probe +permanently instead of the deferred probing. Propagate the error code +upstream, as it should have been done from the start... + +Fixes: 2fff27512600 ("PATA host controller driver for ep93xx") +Signed-off-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/509fda88-2e0d-2cc7-f411-695d7e94b136@omprussia.ru +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_ep93xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c +index 634c814cbeda..ebdd2dfabbeb 100644 +--- a/drivers/ata/pata_ep93xx.c ++++ b/drivers/ata/pata_ep93xx.c +@@ -927,7 +927,7 @@ static int ep93xx_pata_probe(struct platform_device *pdev) + /* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ + irq = platform_get_irq(pdev, 0); + if (irq < 0) { +- err = -ENXIO; ++ err = irq; + goto err_rel_gpio; + } + +-- +2.30.2 + diff --git a/queue-4.9/pata_octeon_cf-avoid-warn_on-in-ata_host_activate.patch b/queue-4.9/pata_octeon_cf-avoid-warn_on-in-ata_host_activate.patch new file mode 100644 index 00000000000..a88fe9f451a --- /dev/null +++ b/queue-4.9/pata_octeon_cf-avoid-warn_on-in-ata_host_activate.patch @@ -0,0 +1,45 @@ +From 75cb0078579296a91f4cf39a223196b6a66c95da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 May 2021 23:38:54 +0300 +Subject: pata_octeon_cf: avoid WARN_ON() in ata_host_activate() + +From: Sergey Shtylyov + +[ Upstream commit bfc1f378c8953e68ccdbfe0a8c20748427488b80 ] + +Iff platform_get_irq() fails (or returns IRQ0) and thus the polling mode +has to be used, ata_host_activate() hits the WARN_ON() due to 'irq_handler' +parameter being non-NULL if the polling mode is selected. Let's only set +the pointer to the driver's IRQ handler if platform_get_irq() returns a +valid IRQ # -- this should avoid the unnecessary WARN_ON()... + +Fixes: 43f01da0f279 ("MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.") +Signed-off-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/3a241167-f84d-1d25-5b9b-be910afbe666@omp.ru +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_octeon_cf.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c +index 475a00669427..7e6359e32ab6 100644 +--- a/drivers/ata/pata_octeon_cf.c ++++ b/drivers/ata/pata_octeon_cf.c +@@ -908,10 +908,11 @@ static int octeon_cf_probe(struct platform_device *pdev) + return -EINVAL; + } + +- irq_handler = octeon_cf_interrupt; + i = platform_get_irq(dma_dev, 0); +- if (i > 0) ++ if (i > 0) { + irq = i; ++ irq_handler = octeon_cf_interrupt; ++ } + } + of_node_put(dma_node); + } +-- +2.30.2 + diff --git a/queue-4.9/pata_rb532_cf-fix-deferred-probing.patch b/queue-4.9/pata_rb532_cf-fix-deferred-probing.patch new file mode 100644 index 00000000000..8da43f4c3aa --- /dev/null +++ b/queue-4.9/pata_rb532_cf-fix-deferred-probing.patch @@ -0,0 +1,46 @@ +From 03a39dda90061fb805a430851d885455d2b68d84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Mar 2021 14:46:53 +0300 +Subject: pata_rb532_cf: fix deferred probing + +From: Sergey Shtylyov + +[ Upstream commit 2d3a62fbae8e5badc2342388f65ab2191c209cc0 ] + +The driver overrides the error codes returned by platform_get_irq() to +-ENOENT, so if it returns -EPROBE_DEFER, the driver would fail the probe +permanently instead of the deferred probing. Switch to propagating the +error code upstream, still checking/overriding IRQ0 as libata regards it +as "no IRQ" (thus polling) anyway... + +Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") +Signed-off-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/771ced55-3efb-21f5-f21c-b99920aae611@omprussia.ru +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_rb532_cf.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c +index c8b6a780a290..76c550e160f6 100644 +--- a/drivers/ata/pata_rb532_cf.c ++++ b/drivers/ata/pata_rb532_cf.c +@@ -120,10 +120,12 @@ static int rb532_pata_driver_probe(struct platform_device *pdev) + } + + irq = platform_get_irq(pdev, 0); +- if (irq <= 0) { ++ if (irq < 0) { + dev_err(&pdev->dev, "no IRQ resource found\n"); +- return -ENOENT; ++ return irq; + } ++ if (!irq) ++ return -EINVAL; + + pdata = dev_get_platdata(&pdev->dev); + if (!pdata) { +-- +2.30.2 + diff --git a/queue-4.9/phy-ti-dm816x-fix-the-error-handling-path-in-dm816x_.patch b/queue-4.9/phy-ti-dm816x-fix-the-error-handling-path-in-dm816x_.patch new file mode 100644 index 00000000000..044da29e6f0 --- /dev/null +++ b/queue-4.9/phy-ti-dm816x-fix-the-error-handling-path-in-dm816x_.patch @@ -0,0 +1,62 @@ +From 532fab9a8c2f42762fdcfa2c7470bce621557071 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 5 Jun 2021 15:17:43 +0200 +Subject: phy: ti: dm816x: Fix the error handling path in + 'dm816x_usb_phy_probe() + +From: Christophe JAILLET + +[ Upstream commit f7eedcb8539ddcbb6fe7791f1b4ccf43f905c72f ] + +Add an error handling path in the probe to release some resources, as +already done in the remove function. + +Fixes: 609adde838f4 ("phy: Add a driver for dm816x USB PHY") +Signed-off-by: Christophe JAILLET +Link: https://lore.kernel.org/r/ac5136881f6bdec50be19b3bf73b3bc1b15ef1f1.1622898974.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/phy-dm816x-usb.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/drivers/phy/phy-dm816x-usb.c b/drivers/phy/phy-dm816x-usb.c +index cbcce7cf0028..2ed5fe20d779 100644 +--- a/drivers/phy/phy-dm816x-usb.c ++++ b/drivers/phy/phy-dm816x-usb.c +@@ -246,19 +246,28 @@ static int dm816x_usb_phy_probe(struct platform_device *pdev) + + pm_runtime_enable(phy->dev); + generic_phy = devm_phy_create(phy->dev, NULL, &ops); +- if (IS_ERR(generic_phy)) +- return PTR_ERR(generic_phy); ++ if (IS_ERR(generic_phy)) { ++ error = PTR_ERR(generic_phy); ++ goto clk_unprepare; ++ } + + phy_set_drvdata(generic_phy, phy); + + phy_provider = devm_of_phy_provider_register(phy->dev, + of_phy_simple_xlate); +- if (IS_ERR(phy_provider)) +- return PTR_ERR(phy_provider); ++ if (IS_ERR(phy_provider)) { ++ error = PTR_ERR(phy_provider); ++ goto clk_unprepare; ++ } + + usb_add_phy_dev(&phy->phy); + + return 0; ++ ++clk_unprepare: ++ pm_runtime_disable(phy->dev); ++ clk_unprepare(phy->refclk); ++ return error; + } + + static int dm816x_usb_phy_remove(struct platform_device *pdev) +-- +2.30.2 + diff --git a/queue-4.9/platform-x86-toshiba_acpi-fix-missing-error-code-in-.patch b/queue-4.9/platform-x86-toshiba_acpi-fix-missing-error-code-in-.patch new file mode 100644 index 00000000000..e957645b3c6 --- /dev/null +++ b/queue-4.9/platform-x86-toshiba_acpi-fix-missing-error-code-in-.patch @@ -0,0 +1,42 @@ +From eeed1a70a2e4d81f5b60e7695bb566fff16eac9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 18:05:48 +0800 +Subject: platform/x86: toshiba_acpi: Fix missing error code in + toshiba_acpi_setup_keyboard() + +From: Jiapeng Chong + +[ Upstream commit 28e367127718a9cb85d615a71e152f7acee41bfc ] + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'error'. + +Eliminate the follow smatch warning: + +drivers/platform/x86/toshiba_acpi.c:2834 toshiba_acpi_setup_keyboard() +warn: missing error code 'error'. + +Reported-by: Abaci Robot +Signed-off-by: Jiapeng Chong +Link: https://lore.kernel.org/r/1622628348-87035-1-git-send-email-jiapeng.chong@linux.alibaba.com +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/toshiba_acpi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c +index f25278bb3e1a..90b17cf74e9f 100644 +--- a/drivers/platform/x86/toshiba_acpi.c ++++ b/drivers/platform/x86/toshiba_acpi.c +@@ -2866,6 +2866,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) + + if (!dev->info_supported && !dev->system_event_supported) { + pr_warn("No hotkey query interface found\n"); ++ error = -EINVAL; + goto err_remove_filter; + } + +-- +2.30.2 + diff --git a/queue-4.9/random32-fix-implicit-truncation-warning-in-prandom_.patch b/queue-4.9/random32-fix-implicit-truncation-warning-in-prandom_.patch new file mode 100644 index 00000000000..8d687ddaace --- /dev/null +++ b/queue-4.9/random32-fix-implicit-truncation-warning-in-prandom_.patch @@ -0,0 +1,48 @@ +From 85138f41113df4de8deb9a07edd7f51d985e7f01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 13:20:12 +0100 +Subject: random32: Fix implicit truncation warning in prandom_seed_state() + +From: Richard Fitzgerald + +[ Upstream commit d327ea15a305024ef0085252fa3657bbb1ce25f5 ] + +sparse generates the following warning: + + include/linux/prandom.h:114:45: sparse: sparse: cast truncates bits from + constant value + +This is because the 64-bit seed value is manipulated and then placed in a +u32, causing an implicit cast and truncation. A forced cast to u32 doesn't +prevent this warning, which is reasonable because a typecast doesn't prove +that truncation was expected. + +Logical-AND the value with 0xffffffff to make explicit that truncation to +32-bit is intended. + +Reported-by: kernel test robot +Signed-off-by: Richard Fitzgerald +Reviewed-by: Petr Mladek +Signed-off-by: Petr Mladek +Link: https://lore.kernel.org/r/20210525122012.6336-3-rf@opensource.cirrus.com +Signed-off-by: Sasha Levin +--- + include/linux/prandom.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/prandom.h b/include/linux/prandom.h +index cc1e71334e53..e20339c78a84 100644 +--- a/include/linux/prandom.h ++++ b/include/linux/prandom.h +@@ -93,7 +93,7 @@ static inline u32 __seed(u32 x, u32 m) + */ + static inline void prandom_seed_state(struct rnd_state *state, u64 seed) + { +- u32 i = (seed >> 32) ^ (seed << 10) ^ seed; ++ u32 i = ((seed >> 32) ^ (seed << 10) ^ seed) & 0xffffffffUL; + + state->s1 = __seed(i, 2U); + state->s2 = __seed(i, 8U); +-- +2.30.2 + diff --git a/queue-4.9/rdma-rxe-fix-failure-during-driver-load.patch b/queue-4.9/rdma-rxe-fix-failure-during-driver-load.patch new file mode 100644 index 00000000000..c98fdda3a22 --- /dev/null +++ b/queue-4.9/rdma-rxe-fix-failure-during-driver-load.patch @@ -0,0 +1,58 @@ +From bb616b6b148cd5b58e80fdef64118a9d139298ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jun 2021 12:01:12 +0300 +Subject: RDMA/rxe: Fix failure during driver load + +From: Kamal Heib + +[ Upstream commit 32a25f2ea690dfaace19f7a3a916f5d7e1ddafe8 ] + +To avoid the following failure when trying to load the rdma_rxe module +while IPv6 is disabled, add a check for EAFNOSUPPORT and ignore the +failure, also delete the needless debug print from rxe_setup_udp_tunnel(). + +$ modprobe rdma_rxe +modprobe: ERROR: could not insert 'rdma_rxe': Operation not permitted + +Fixes: dfdd6158ca2c ("IB/rxe: Fix kernel panic in udp_setup_tunnel") +Link: https://lore.kernel.org/r/20210603090112.36341-1-kamalheib1@gmail.com +Reported-by: Yi Zhang +Signed-off-by: Kamal Heib +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c +index e39261234528..f431cecd8b56 100644 +--- a/drivers/infiniband/sw/rxe/rxe_net.c ++++ b/drivers/infiniband/sw/rxe/rxe_net.c +@@ -259,10 +259,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port, + + /* Create UDP socket */ + err = udp_sock_create(net, &udp_cfg, &sock); +- if (err < 0) { +- pr_err("failed to create udp socket. err = %d\n", err); ++ if (err < 0) + return ERR_PTR(err); +- } + + tnl_cfg.encap_type = 1; + tnl_cfg.encap_rcv = rxe_udp_encap_recv; +@@ -665,6 +663,12 @@ int rxe_net_ipv6_init(void) + + recv_sockets.sk6 = rxe_setup_udp_tunnel(&init_net, + htons(ROCE_V2_UDP_DPORT), true); ++ if (PTR_ERR(recv_sockets.sk6) == -EAFNOSUPPORT) { ++ recv_sockets.sk6 = NULL; ++ pr_warn("IPv6 is not supported, can not create a UDPv6 socket\n"); ++ return 0; ++ } ++ + if (IS_ERR(recv_sockets.sk6)) { + recv_sockets.sk6 = NULL; + pr_err("Failed to create IPv6 UDP tunnel\n"); +-- +2.30.2 + diff --git a/queue-4.9/regulator-da9052-ensure-enough-delay-time-for-.set_v.patch b/queue-4.9/regulator-da9052-ensure-enough-delay-time-for-.set_v.patch new file mode 100644 index 00000000000..9c0cf628872 --- /dev/null +++ b/queue-4.9/regulator-da9052-ensure-enough-delay-time-for-.set_v.patch @@ -0,0 +1,39 @@ +From 379f560d318fcc1db666f2011f59ef31eaa0f841 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jun 2021 22:14:11 +0800 +Subject: regulator: da9052: Ensure enough delay time for .set_voltage_time_sel + +From: Axel Lin + +[ Upstream commit a336dc8f683e5be794186b5643cd34cb28dd2c53 ] + +Use DIV_ROUND_UP to prevent truncation by integer division issue. +This ensures we return enough delay time. + +Also fix returning negative value when new_sel < old_sel. + +Signed-off-by: Axel Lin +Link: https://lore.kernel.org/r/20210618141412.4014912-1-axel.lin@ingics.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/regulator/da9052-regulator.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c +index 9ececfef42d6..bd91c95f73e0 100644 +--- a/drivers/regulator/da9052-regulator.c ++++ b/drivers/regulator/da9052-regulator.c +@@ -258,7 +258,8 @@ static int da9052_regulator_set_voltage_time_sel(struct regulator_dev *rdev, + case DA9052_ID_BUCK3: + case DA9052_ID_LDO2: + case DA9052_ID_LDO3: +- ret = (new_sel - old_sel) * info->step_uV / 6250; ++ ret = DIV_ROUND_UP(abs(new_sel - old_sel) * info->step_uV, ++ 6250); + break; + } + +-- +2.30.2 + diff --git a/queue-4.9/s390-appldata-depends-on-proc_sysctl.patch b/queue-4.9/s390-appldata-depends-on-proc_sysctl.patch new file mode 100644 index 00000000000..2e84ffb63b4 --- /dev/null +++ b/queue-4.9/s390-appldata-depends-on-proc_sysctl.patch @@ -0,0 +1,46 @@ +From 3fae68969454c5537de84846463dd1d403768fd7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 May 2021 17:24:20 -0700 +Subject: s390: appldata depends on PROC_SYSCTL + +From: Randy Dunlap + +[ Upstream commit 5d3516b3647621d5a1180672ea9e0817fb718ada ] + +APPLDATA_BASE should depend on PROC_SYSCTL instead of PROC_FS. +Building with PROC_FS but not PROC_SYSCTL causes a build error, +since appldata_base.c uses data and APIs from fs/proc/proc_sysctl.c. + +arch/s390/appldata/appldata_base.o: in function `appldata_generic_handler': +appldata_base.c:(.text+0x192): undefined reference to `sysctl_vals' + +Fixes: c185b783b099 ("[S390] Remove config options.") +Signed-off-by: Randy Dunlap +Cc: Heiko Carstens +Cc: Vasily Gorbik +Cc: Christian Borntraeger +Cc: linux-s390@vger.kernel.org +Signed-off-by: Vasily Gorbik +Link: https://lore.kernel.org/r/20210528002420.17634-1-rdunlap@infradead.org +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig +index 1c4a595e8224..1dff52abc786 100644 +--- a/arch/s390/Kconfig ++++ b/arch/s390/Kconfig +@@ -833,7 +833,7 @@ config CMM_IUCV + config APPLDATA_BASE + def_bool n + prompt "Linux - VM Monitor Stream, base infrastructure" +- depends on PROC_FS ++ depends on PROC_SYSCTL + help + This provides a kernel interface for creating and updating z/VM APPLDATA + monitor records. The monitor records are updated at certain time +-- +2.30.2 + diff --git a/queue-4.9/sata_highbank-fix-deferred-probing.patch b/queue-4.9/sata_highbank-fix-deferred-probing.patch new file mode 100644 index 00000000000..756c156e5f7 --- /dev/null +++ b/queue-4.9/sata_highbank-fix-deferred-probing.patch @@ -0,0 +1,46 @@ +From b6fc584e88f7b67586c3bf6e5b4e354d56bc3a45 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Mar 2021 23:34:27 +0300 +Subject: sata_highbank: fix deferred probing + +From: Sergey Shtylyov + +[ Upstream commit 4a24efa16e7db02306fb5db84518bb0a7ada5a46 ] + +The driver overrides the error codes returned by platform_get_irq() to +-EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe +permanently instead of the deferred probing. Switch to propagating the +error code upstream, still checking/overriding IRQ0 as libata regards it +as "no IRQ" (thus polling) anyway... + +Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") +Signed-off-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/105b456d-1199-f6e9-ceb7-ffc5ba551d1a@omprussia.ru +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/sata_highbank.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c +index aafb8cc03523..13f339f07f2a 100644 +--- a/drivers/ata/sata_highbank.c ++++ b/drivers/ata/sata_highbank.c +@@ -483,10 +483,12 @@ static int ahci_highbank_probe(struct platform_device *pdev) + } + + irq = platform_get_irq(pdev, 0); +- if (irq <= 0) { ++ if (irq < 0) { + dev_err(dev, "no irq\n"); +- return -EINVAL; ++ return irq; + } ++ if (!irq) ++ return -EINVAL; + + hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); + if (!hpriv) { +-- +2.30.2 + diff --git a/queue-4.9/scsi-flashpoint-rename-si_flags-field.patch b/queue-4.9/scsi-flashpoint-rename-si_flags-field.patch new file mode 100644 index 00000000000..ad4a6d607cd --- /dev/null +++ b/queue-4.9/scsi-flashpoint-rename-si_flags-field.patch @@ -0,0 +1,163 @@ +From a796288beec91e83e504c35315c3bba655a81748 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 May 2021 16:48:57 -0700 +Subject: scsi: FlashPoint: Rename si_flags field + +From: Randy Dunlap + +[ Upstream commit 4d431153e751caa93f3b7e6f6313446974e92253 ] + +The BusLogic driver has build errors on ia64 due to a name collision (in +the #included FlashPoint.c file). Rename the struct field in struct +sccb_mgr_info from si_flags to si_mflags (manager flags) to mend the build. + +This is the first problem. There are 50+ others after this one: + +In file included from ../include/uapi/linux/signal.h:6, + from ../include/linux/signal_types.h:10, + from ../include/linux/sched.h:29, + from ../include/linux/hardirq.h:9, + from ../include/linux/interrupt.h:11, + from ../drivers/scsi/BusLogic.c:27: +../arch/ia64/include/uapi/asm/siginfo.h:15:27: error: expected ':', ',', ';', '}' or '__attribute__' before '.' token + 15 | #define si_flags _sifields._sigfault._flags + | ^ +../drivers/scsi/FlashPoint.c:43:6: note: in expansion of macro 'si_flags' + 43 | u16 si_flags; + | ^~~~~~~~ +In file included from ../drivers/scsi/BusLogic.c:51: +../drivers/scsi/FlashPoint.c: In function 'FlashPoint_ProbeHostAdapter': +../drivers/scsi/FlashPoint.c:1076:11: error: 'struct sccb_mgr_info' has no member named '_sifields' + 1076 | pCardInfo->si_flags = 0x0000; + | ^~ +../drivers/scsi/FlashPoint.c:1079:12: error: 'struct sccb_mgr_info' has no member named '_sifields' + +Link: https://lore.kernel.org/r/20210529234857.6870-1-rdunlap@infradead.org +Fixes: 391e2f25601e ("[SCSI] BusLogic: Port driver to 64-bit.") +Cc: "James E.J. Bottomley" +Cc: "Martin K. Petersen" +Cc: Christoph Hellwig +Cc: Jens Axboe +Cc: Hannes Reinecke +Cc: Khalid Aziz +Cc: Khalid Aziz +Reported-by: kernel test robot +Reviewed-by: Hannes Reinecke +Signed-off-by: Randy Dunlap +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/FlashPoint.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c +index 867b864f5047..4bca37d52bad 100644 +--- a/drivers/scsi/FlashPoint.c ++++ b/drivers/scsi/FlashPoint.c +@@ -40,7 +40,7 @@ struct sccb_mgr_info { + u16 si_per_targ_ultra_nego; + u16 si_per_targ_no_disc; + u16 si_per_targ_wide_nego; +- u16 si_flags; ++ u16 si_mflags; + unsigned char si_card_family; + unsigned char si_bustype; + unsigned char si_card_model[3]; +@@ -1070,22 +1070,22 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo) + ScamFlg = + (unsigned char)FPT_utilEERead(ioport, SCAM_CONFIG / 2); + +- pCardInfo->si_flags = 0x0000; ++ pCardInfo->si_mflags = 0x0000; + + if (i & 0x01) +- pCardInfo->si_flags |= SCSI_PARITY_ENA; ++ pCardInfo->si_mflags |= SCSI_PARITY_ENA; + + if (!(i & 0x02)) +- pCardInfo->si_flags |= SOFT_RESET; ++ pCardInfo->si_mflags |= SOFT_RESET; + + if (i & 0x10) +- pCardInfo->si_flags |= EXTENDED_TRANSLATION; ++ pCardInfo->si_mflags |= EXTENDED_TRANSLATION; + + if (ScamFlg & SCAM_ENABLED) +- pCardInfo->si_flags |= FLAG_SCAM_ENABLED; ++ pCardInfo->si_mflags |= FLAG_SCAM_ENABLED; + + if (ScamFlg & SCAM_LEVEL2) +- pCardInfo->si_flags |= FLAG_SCAM_LEVEL2; ++ pCardInfo->si_mflags |= FLAG_SCAM_LEVEL2; + + j = (RD_HARPOON(ioport + hp_bm_ctrl) & ~SCSI_TERM_ENA_L); + if (i & 0x04) { +@@ -1101,7 +1101,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo) + + if (!(RD_HARPOON(ioport + hp_page_ctrl) & NARROW_SCSI_CARD)) + +- pCardInfo->si_flags |= SUPPORT_16TAR_32LUN; ++ pCardInfo->si_mflags |= SUPPORT_16TAR_32LUN; + + pCardInfo->si_card_family = HARPOON_FAMILY; + pCardInfo->si_bustype = BUSTYPE_PCI; +@@ -1137,15 +1137,15 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo) + + if (pCardInfo->si_card_model[1] == '3') { + if (RD_HARPOON(ioport + hp_ee_ctrl) & BIT(7)) +- pCardInfo->si_flags |= LOW_BYTE_TERM; ++ pCardInfo->si_mflags |= LOW_BYTE_TERM; + } else if (pCardInfo->si_card_model[2] == '0') { + temp = RD_HARPOON(ioport + hp_xfer_pad); + WR_HARPOON(ioport + hp_xfer_pad, (temp & ~BIT(4))); + if (RD_HARPOON(ioport + hp_ee_ctrl) & BIT(7)) +- pCardInfo->si_flags |= LOW_BYTE_TERM; ++ pCardInfo->si_mflags |= LOW_BYTE_TERM; + WR_HARPOON(ioport + hp_xfer_pad, (temp | BIT(4))); + if (RD_HARPOON(ioport + hp_ee_ctrl) & BIT(7)) +- pCardInfo->si_flags |= HIGH_BYTE_TERM; ++ pCardInfo->si_mflags |= HIGH_BYTE_TERM; + WR_HARPOON(ioport + hp_xfer_pad, temp); + } else { + temp = RD_HARPOON(ioport + hp_ee_ctrl); +@@ -1163,9 +1163,9 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo) + WR_HARPOON(ioport + hp_ee_ctrl, temp); + WR_HARPOON(ioport + hp_xfer_pad, temp2); + if (!(temp3 & BIT(7))) +- pCardInfo->si_flags |= LOW_BYTE_TERM; ++ pCardInfo->si_mflags |= LOW_BYTE_TERM; + if (!(temp3 & BIT(6))) +- pCardInfo->si_flags |= HIGH_BYTE_TERM; ++ pCardInfo->si_mflags |= HIGH_BYTE_TERM; + } + + ARAM_ACCESS(ioport); +@@ -1272,7 +1272,7 @@ static void *FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info + WR_HARPOON(ioport + hp_arb_id, pCardInfo->si_id); + CurrCard->ourId = pCardInfo->si_id; + +- i = (unsigned char)pCardInfo->si_flags; ++ i = (unsigned char)pCardInfo->si_mflags; + if (i & SCSI_PARITY_ENA) + WR_HARPOON(ioport + hp_portctrl_1, (HOST_MODE8 | CHK_SCSI_P)); + +@@ -1286,14 +1286,14 @@ static void *FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info + j |= SCSI_TERM_ENA_H; + WR_HARPOON(ioport + hp_ee_ctrl, j); + +- if (!(pCardInfo->si_flags & SOFT_RESET)) { ++ if (!(pCardInfo->si_mflags & SOFT_RESET)) { + + FPT_sresb(ioport, thisCard); + + FPT_scini(thisCard, pCardInfo->si_id, 0); + } + +- if (pCardInfo->si_flags & POST_ALL_UNDERRRUNS) ++ if (pCardInfo->si_mflags & POST_ALL_UNDERRRUNS) + CurrCard->globalFlags |= F_NO_FILTER; + + if (pCurrNvRam) { +-- +2.30.2 + diff --git a/queue-4.9/scsi-mpt3sas-fix-error-return-value-in-_scsih_expand.patch b/queue-4.9/scsi-mpt3sas-fix-error-return-value-in-_scsih_expand.patch new file mode 100644 index 00000000000..4794953dbfb --- /dev/null +++ b/queue-4.9/scsi-mpt3sas-fix-error-return-value-in-_scsih_expand.patch @@ -0,0 +1,43 @@ +From c7bc7d9311eea63aed3fa09b87ec4a38857ccd57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 May 2021 16:13:00 +0800 +Subject: scsi: mpt3sas: Fix error return value in _scsih_expander_add() + +From: Zhen Lei + +[ Upstream commit d6c2ce435ffe23ef7f395ae76ec747414589db46 ] + +When an expander does not contain any 'phys', an appropriate error code -1 +should be returned, as done elsewhere in this function. However, we +currently do not explicitly assign this error code to 'rc'. As a result, 0 +was incorrectly returned. + +Link: https://lore.kernel.org/r/20210514081300.6650-1-thunder.leizhen@huawei.com +Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +index aa2078d7e23e..58876b8a2e9f 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +@@ -5199,8 +5199,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) + handle, parent_handle, (unsigned long long) + sas_expander->sas_address, sas_expander->num_phys); + +- if (!sas_expander->num_phys) ++ if (!sas_expander->num_phys) { ++ rc = -1; + goto out_fail; ++ } + sas_expander->phy = kcalloc(sas_expander->num_phys, + sizeof(struct _sas_phy), GFP_KERNEL); + if (!sas_expander->phy) { +-- +2.30.2 + diff --git a/queue-4.9/selftests-vm-pkeys-fix-alloc_random_pkey-to-make-it-.patch b/queue-4.9/selftests-vm-pkeys-fix-alloc_random_pkey-to-make-it-.patch new file mode 100644 index 00000000000..d0b8647ed6f --- /dev/null +++ b/queue-4.9/selftests-vm-pkeys-fix-alloc_random_pkey-to-make-it-.patch @@ -0,0 +1,102 @@ +From 17187a52a04b2f40e7df73e6e2d911e8468590d4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Jun 2021 18:56:53 -0700 +Subject: selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really + random + +From: Dave Hansen + +[ Upstream commit f36ef407628835a7d7fb3d235b1f1aac7022d9a3 ] + +Patch series "selftests/vm/pkeys: Bug fixes and a new test". + +There has been a lot of activity on the x86 front around the XSAVE +architecture which is used to context-switch processor state (among other +things). In addition, AMD has recently joined the protection keys club by +adding processor support for PKU. + +The AMD implementation helped uncover a kernel bug around the PKRU "init +state", which actually applied to Intel's implementation but was just +harder to hit. This series adds a test which is expected to help find +this class of bug both on AMD and Intel. All the work around pkeys on x86 +also uncovered a few bugs in the selftest. + +This patch (of 4): + +The "random" pkey allocation code currently does the good old: + + srand((unsigned int)time(NULL)); + +*But*, it unfortunately does this on every random pkey allocation. + +There may be thousands of these a second. time() has a one second +resolution. So, each time alloc_random_pkey() is called, the PRNG is +*RESET* to time(). This is nasty. Normally, if you do: + + srand(); + foo = rand(); + bar = rand(); + +You'll be quite guaranteed that 'foo' and 'bar' are different. But, if +you do: + + srand(1); + foo = rand(); + srand(1); + bar = rand(); + +You are quite guaranteed that 'foo' and 'bar' are the *SAME*. The recent +"fix" effectively forced the test case to use the same "random" pkey for +the whole test, unless the test run crossed a second boundary. + +Only run srand() once at program startup. + +This explains some very odd and persistent test failures I've been seeing. + +Link: https://lkml.kernel.org/r/20210611164153.91B76FB8@viggo.jf.intel.com +Link: https://lkml.kernel.org/r/20210611164155.192D00FF@viggo.jf.intel.com +Fixes: 6e373263ce07 ("selftests/vm/pkeys: fix alloc_random_pkey() to make it really random") +Signed-off-by: Dave Hansen +Signed-off-by: Thomas Gleixner +Tested-by: Aneesh Kumar K.V +Cc: Ram Pai +Cc: Sandipan Das +Cc: Florian Weimer +Cc: "Desnes A. Nunes do Rosario" +Cc: Ingo Molnar +Cc: Thiago Jung Bauermann +Cc: Michael Ellerman +Cc: Michal Hocko +Cc: Michal Suchanek +Cc: Shuah Khan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/x86/protection_keys.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c +index 5338e668b5e6..d78736845b8e 100644 +--- a/tools/testing/selftests/x86/protection_keys.c ++++ b/tools/testing/selftests/x86/protection_keys.c +@@ -609,7 +609,6 @@ int alloc_random_pkey(void) + int nr_alloced = 0; + int random_index; + memset(alloced_pkeys, 0, sizeof(alloced_pkeys)); +- srand((unsigned int)time(NULL)); + + /* allocate every possible key and make a note of which ones we got */ + max_nr_pkey_allocs = NR_PKEYS; +@@ -1387,6 +1386,8 @@ int main(void) + { + int nr_iterations = 22; + ++ srand((unsigned int)time(NULL)); ++ + setup_handlers(); + + printf("has pku: %d\n", cpu_has_pku()); +-- +2.30.2 + diff --git a/queue-4.9/series b/queue-4.9/series index 4101bbb82f5..e88816f84d4 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -26,3 +26,96 @@ ath9k-fix-kernel-null-pointer-dereference-during-ath_reset_internal.patch ssb-sdio-don-t-overwrite-const-buffer-if-block_write-fails.patch seq_buf-make-trace_seq_putmem_hex-support-data-longer-than-8.patch fuse-check-connected-before-queueing-on-fpq-io.patch +spi-spi-loopback-test-fix-tx_buf-might-be-rx_buf.patch +spi-spi-topcliff-pch-fix-potential-double-free-in-pc.patch +spi-omap-100k-fix-the-length-judgment-problem.patch +crypto-nx-add-missing-module_device_table.patch +media-cpia2-fix-memory-leak-in-cpia2_usb_probe.patch +media-cobalt-fix-race-condition-in-setting-hpd.patch +media-pvrusb2-fix-warning-in-pvr2_i2c_core_done.patch +crypto-qat-check-return-code-of-qat_hal_rd_rel_reg.patch +crypto-qat-remove-unused-macro-in-fw-loader.patch +media-v4l2-core-avoid-the-dangling-pointer-in-v4l2_f.patch +media-bt8xx-fix-a-missing-check-bug-in-bt878_probe.patch +media-st-hva-fix-potential-null-pointer-dereferences.patch +mmc-via-sdmmc-add-a-check-against-null-pointer-deref.patch +crypto-shash-avoid-comparing-pointers-to-exported-fu.patch +media-dvb_net-avoid-speculation-from-net-slot.patch +media-siano-fix-device-register-error-path.patch +btrfs-abort-transaction-if-we-fail-to-update-the-del.patch +btrfs-disable-build-on-platforms-having-page-size-25.patch +regulator-da9052-ensure-enough-delay-time-for-.set_v.patch +acpi-processor-idle-fix-up-c-state-latency-if-not-or.patch +block_dump-remove-block_dump-feature-in-mark_inode_d.patch +fs-dlm-cancel-work-sync-othercon.patch +random32-fix-implicit-truncation-warning-in-prandom_.patch +fs-dlm-fix-memory-leak-when-fenced.patch +acpi-bus-call-kobject_put-in-acpi_init-error-path.patch +platform-x86-toshiba_acpi-fix-missing-error-code-in-.patch +acpi-tables-add-custom-dsdt-file-as-makefile-prerequ.patch +ia64-mca_drv-fix-incorrect-array-size-calculation.patch +media-s5p_cec-decrement-usage-count-if-disabled.patch +crypto-ixp4xx-dma_unmap-the-correct-address.patch +crypto-ux500-fix-error-return-code-in-hash_hw_final.patch +sata_highbank-fix-deferred-probing.patch +pata_rb532_cf-fix-deferred-probing.patch +media-i2c-change-rst-to-rset-to-fix-multiple-build-e.patch +pata_octeon_cf-avoid-warn_on-in-ata_host_activate.patch +pata_ep93xx-fix-deferred-probing.patch +media-tc358743-fix-error-return-code-in-tc358743_pro.patch +media-siano-fix-out-of-bounds-warnings-in-smscore_lo.patch +mmc-usdhi6rol0-fix-error-return-code-in-usdhi6_probe.patch +media-s5p-g2d-fix-a-memory-leak-on-ctx-fh.m2m_ctx.patch +hwmon-max31722-remove-non-standard-acpi-device-ids.patch +hwmon-max31790-fix-fan-speed-reporting-for-fan7.12.patch +spi-spi-sun6i-fix-chipselect-clock-bug.patch +crypto-nx-fix-rcu-warning-in-nx842_of_upd_status.patch +acpi-sysfs-fix-a-buffer-overrun-problem-with-descrip.patch +ocfs2-fix-snprintf-checking.patch +net-pch_gbe-propagate-error-from-devm_gpio_request_o.patch +ehea-fix-error-return-code-in-ehea_restart_qps.patch +rdma-rxe-fix-failure-during-driver-load.patch +drm-qxl-ensure-surf.data-is-ininitialized.patch +wireless-carl9170-fix-leds-build-errors-warnings.patch +brcmsmac-mac80211_if-fix-a-resource-leak-in-an-error.patch +ath10k-fix-an-error-code-in-ath10k_add_interface.patch +netlabel-fix-memory-leak-in-netlbl_mgmt_add_common.patch +netfilter-nft_exthdr-check-for-ipv6-packet-before-fu.patch +net-ethernet-aeroflex-fix-uaf-in-greth_of_remove.patch +net-ethernet-ezchip-fix-uaf-in-nps_enet_remove.patch +net-ethernet-ezchip-fix-error-handling.patch +vxlan-add-missing-rcu_read_lock-in-neigh_reduce.patch +i40e-fix-error-handling-in-i40e_vsi_open.patch +bluetooth-mgmt-fix-slab-out-of-bounds-in-tlv_data_is.patch +writeback-fix-obtain-a-reference-to-a-freeing-memcg-.patch +net-sched-fix-warning-in-tcindex_alloc_perfect_hash.patch +tty-nozomi-fix-a-resource-leak-in-an-error-handling-.patch +iio-adis_buffer-do-not-return-ints-in-irq-handlers.patch +iio-accel-bma180-fix-buffer-alignment-in-iio_push_to.patch +iio-accel-bma220-fix-buffer-alignment-in-iio_push_to.patch +iio-accel-kxcjk-1013-fix-buffer-alignment-in-iio_pus.patch +iio-accel-stk8312-fix-buffer-alignment-in-iio_push_t.patch +iio-accel-stk8ba50-fix-buffer-alignment-in-iio_push_.patch +iio-adc-ti-ads1015-fix-buffer-alignment-in-iio_push_.patch +iio-adc-vf610-fix-buffer-alignment-in-iio_push_to_bu.patch +iio-gyro-bmg160-fix-buffer-alignment-in-iio_push_to_.patch +iio-humidity-am2315-fix-buffer-alignment-in-iio_push.patch +iio-prox-pulsed-light-fix-buffer-alignment-in-iio_pu.patch +iio-light-isl29125-fix-buffer-alignment-in-iio_push_.patch +iio-light-tcs3414-fix-buffer-alignment-in-iio_push_t.patch +input-hil_kbd-fix-error-return-code-in-hil_dev_conne.patch +char-pcmcia-error-out-if-num_bytes_read-is-greater-t.patch +tty-nozomi-fix-the-error-handling-path-of-nozomi_car.patch +scsi-flashpoint-rename-si_flags-field.patch +s390-appldata-depends-on-proc_sysctl.patch +staging-gdm724x-check-for-buffer-overflow-in-gdm_lte.patch +staging-gdm724x-check-for-overflow-in-gdm_lte_netif_.patch +of-fix-truncation-of-memory-sizes-on-32-bit-platform.patch +scsi-mpt3sas-fix-error-return-value-in-_scsih_expand.patch +phy-ti-dm816x-fix-the-error-handling-path-in-dm816x_.patch +extcon-sm5502-drop-invalid-register-write-in-sm5502_.patch +extcon-max8997-add-missing-modalias-string.patch +configfs-fix-memleak-in-configfs_release_bin_file.patch +leds-ktd2692-fix-an-error-handling-path.patch +mm-huge_memory.c-don-t-discard-hugepage-if-other-pro.patch +selftests-vm-pkeys-fix-alloc_random_pkey-to-make-it-.patch diff --git a/queue-4.9/spi-omap-100k-fix-the-length-judgment-problem.patch b/queue-4.9/spi-omap-100k-fix-the-length-judgment-problem.patch new file mode 100644 index 00000000000..5737e1ded75 --- /dev/null +++ b/queue-4.9/spi-omap-100k-fix-the-length-judgment-problem.patch @@ -0,0 +1,36 @@ +From 751d8dd8ac65dced238568c00e4ba715f7f2f578 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Apr 2021 19:20:48 +0800 +Subject: spi: omap-100k: Fix the length judgment problem + +From: Tian Tao + +[ Upstream commit e7a1a3abea373e41ba7dfe0fbc93cb79b6a3a529 ] + +word_len should be checked in the omap1_spi100k_setup_transfer +function to see if it exceeds 32. + +Signed-off-by: Tian Tao +Link: https://lore.kernel.org/r/1619695248-39045-1-git-send-email-tiantao6@hisilicon.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-omap-100k.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c +index 1eccdc4a4581..2eeb0fe2eed2 100644 +--- a/drivers/spi/spi-omap-100k.c ++++ b/drivers/spi/spi-omap-100k.c +@@ -251,7 +251,7 @@ static int omap1_spi100k_setup_transfer(struct spi_device *spi, + else + word_len = spi->bits_per_word; + +- if (spi->bits_per_word > 32) ++ if (word_len > 32) + return -EINVAL; + cs->word_len = word_len; + +-- +2.30.2 + diff --git a/queue-4.9/spi-spi-loopback-test-fix-tx_buf-might-be-rx_buf.patch b/queue-4.9/spi-spi-loopback-test-fix-tx_buf-might-be-rx_buf.patch new file mode 100644 index 00000000000..57504e71009 --- /dev/null +++ b/queue-4.9/spi-spi-loopback-test-fix-tx_buf-might-be-rx_buf.patch @@ -0,0 +1,35 @@ +From e2887658c4943dbd9d390d03161dc5809049a4a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 May 2021 14:58:23 +0800 +Subject: spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf' + +From: Jay Fang + +[ Upstream commit 9e37a3ab0627011fb63875e9a93094b6fc8ddf48 ] + +In function 'spi_test_run_iter': Value 'tx_buf' might be 'rx_buf'. + +Signed-off-by: Jay Fang +Link: https://lore.kernel.org/r/1620629903-15493-5-git-send-email-f.fangjian@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-loopback-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-loopback-test.c b/drivers/spi/spi-loopback-test.c +index 7120083fe761..cac38753d0cd 100644 +--- a/drivers/spi/spi-loopback-test.c ++++ b/drivers/spi/spi-loopback-test.c +@@ -803,7 +803,7 @@ static int spi_test_run_iter(struct spi_device *spi, + test.transfers[i].len = len; + if (test.transfers[i].tx_buf) + test.transfers[i].tx_buf += tx_off; +- if (test.transfers[i].tx_buf) ++ if (test.transfers[i].rx_buf) + test.transfers[i].rx_buf += rx_off; + } + +-- +2.30.2 + diff --git a/queue-4.9/spi-spi-sun6i-fix-chipselect-clock-bug.patch b/queue-4.9/spi-spi-sun6i-fix-chipselect-clock-bug.patch new file mode 100644 index 00000000000..8a1d4652f9b --- /dev/null +++ b/queue-4.9/spi-spi-sun6i-fix-chipselect-clock-bug.patch @@ -0,0 +1,56 @@ +From 887d4066aef091dae2efc0aa52ec902f10659eb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Jun 2021 16:45:07 +0200 +Subject: spi: spi-sun6i: Fix chipselect/clock bug + +From: Mirko Vogt + +[ Upstream commit 0d7993b234c9fad8cb6bec6adfaa74694ba85ecb ] + +The current sun6i SPI implementation initializes the transfer too early, +resulting in SCK going high before the transfer. When using an additional +(gpio) chipselect with sun6i, the chipselect is asserted at a time when +clock is high, making the SPI transfer fail. + +This is due to SUN6I_GBL_CTL_BUS_ENABLE being written into +SUN6I_GBL_CTL_REG at an early stage. Moving that to the transfer +function, hence, right before the transfer starts, mitigates that +problem. + +Fixes: 3558fe900e8af (spi: sunxi: Add Allwinner A31 SPI controller driver) +Signed-off-by: Mirko Vogt +Signed-off-by: Ralf Schlatterbeck +Link: https://lore.kernel.org/r/20210614144507.y3udezjfbko7eavv@runtux.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-sun6i.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c +index 17068e62e792..8c3f5a00fd9e 100644 +--- a/drivers/spi/spi-sun6i.c ++++ b/drivers/spi/spi-sun6i.c +@@ -251,6 +251,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master, + } + + sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg); ++ /* Finally enable the bus - doing so before might raise SCK to HIGH */ ++ reg = sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG); ++ reg |= SUN6I_GBL_CTL_BUS_ENABLE; ++ sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, reg); + + /* Setup the transfer now... */ + if (sspi->tx_buf) +@@ -334,7 +338,7 @@ static int sun6i_spi_runtime_resume(struct device *dev) + } + + sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, +- SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); ++ SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); + + return 0; + +-- +2.30.2 + diff --git a/queue-4.9/spi-spi-topcliff-pch-fix-potential-double-free-in-pc.patch b/queue-4.9/spi-spi-topcliff-pch-fix-potential-double-free-in-pc.patch new file mode 100644 index 00000000000..5ec96ea8f10 --- /dev/null +++ b/queue-4.9/spi-spi-topcliff-pch-fix-potential-double-free-in-pc.patch @@ -0,0 +1,42 @@ +From 44fd825dea1170680fcd13f32eb8a36ab8f18016 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 May 2021 15:08:08 +0800 +Subject: spi: spi-topcliff-pch: Fix potential double free in + pch_spi_process_messages() + +From: Jay Fang + +[ Upstream commit 026a1dc1af52742c5897e64a3431445371a71871 ] + +pch_spi_set_tx() frees data->pkt_tx_buff on failure of kzalloc() for +data->pkt_rx_buff, but its caller, pch_spi_process_messages(), will +free data->pkt_tx_buff again. Set data->pkt_tx_buff to NULL after +kfree() to avoid double free. + +Signed-off-by: Jay Fang +Link: https://lore.kernel.org/r/1620284888-65215-1-git-send-email-f.fangjian@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-topcliff-pch.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c +index fe707440f8c3..9b24ebbba346 100644 +--- a/drivers/spi/spi-topcliff-pch.c ++++ b/drivers/spi/spi-topcliff-pch.c +@@ -585,8 +585,10 @@ static void pch_spi_set_tx(struct pch_spi_data *data, int *bpw) + data->pkt_tx_buff = kzalloc(size, GFP_KERNEL); + if (data->pkt_tx_buff != NULL) { + data->pkt_rx_buff = kzalloc(size, GFP_KERNEL); +- if (!data->pkt_rx_buff) ++ if (!data->pkt_rx_buff) { + kfree(data->pkt_tx_buff); ++ data->pkt_tx_buff = NULL; ++ } + } + + if (!data->pkt_rx_buff) { +-- +2.30.2 + diff --git a/queue-4.9/staging-gdm724x-check-for-buffer-overflow-in-gdm_lte.patch b/queue-4.9/staging-gdm724x-check-for-buffer-overflow-in-gdm_lte.patch new file mode 100644 index 00000000000..0a1156dc37c --- /dev/null +++ b/queue-4.9/staging-gdm724x-check-for-buffer-overflow-in-gdm_lte.patch @@ -0,0 +1,61 @@ +From 5b961c61dc32de0d998852cd162528384ddba2fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Jun 2021 12:55:35 +0300 +Subject: staging: gdm724x: check for buffer overflow in + gdm_lte_multi_sdu_pkt() + +From: Dan Carpenter + +[ Upstream commit 4a36e160856db8a8ddd6a3d2e5db5a850ab87f82 ] + +There needs to be a check to verify that we don't read beyond the end +of "buf". This function is called from do_rx(). The "buf" is the USB +transfer_buffer and "len" is "urb->actual_length". + +Fixes: 61e121047645 ("staging: gdm7240: adding LTE USB driver") +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/YMcnl4zCwGWGDVMG@mwanda +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/gdm724x/gdm_lte.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c +index e72dfa9699f3..1bc2b3365e32 100644 +--- a/drivers/staging/gdm724x/gdm_lte.c ++++ b/drivers/staging/gdm724x/gdm_lte.c +@@ -689,6 +689,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) + struct multi_sdu *multi_sdu = (struct multi_sdu *)buf; + struct sdu *sdu = NULL; + u8 *data = (u8 *)multi_sdu->data; ++ int copied; + u16 i = 0; + u16 num_packet; + u16 hci_len; +@@ -702,6 +703,12 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) + multi_sdu->num_packet); + + for (i = 0; i < num_packet; i++) { ++ copied = data - multi_sdu->data; ++ if (len < copied + sizeof(*sdu)) { ++ pr_err("rx prevent buffer overflow"); ++ return; ++ } ++ + sdu = (struct sdu *)data; + + cmd_evt = gdm_dev16_to_cpu(phy_dev-> +@@ -715,7 +722,8 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) + pr_err("rx sdu wrong hci %04x\n", cmd_evt); + return; + } +- if (hci_len < 12) { ++ if (hci_len < 12 || ++ len < copied + sizeof(*sdu) + (hci_len - 12)) { + pr_err("rx sdu invalid len %d\n", hci_len); + return; + } +-- +2.30.2 + diff --git a/queue-4.9/staging-gdm724x-check-for-overflow-in-gdm_lte_netif_.patch b/queue-4.9/staging-gdm724x-check-for-overflow-in-gdm_lte_netif_.patch new file mode 100644 index 00000000000..1c10c153005 --- /dev/null +++ b/queue-4.9/staging-gdm724x-check-for-overflow-in-gdm_lte_netif_.patch @@ -0,0 +1,45 @@ +From f86a994c9a7160cc4ddcb49d7ab58d0b5e68ec30 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Jun 2021 12:58:36 +0300 +Subject: staging: gdm724x: check for overflow in gdm_lte_netif_rx() + +From: Dan Carpenter + +[ Upstream commit 7002b526f4ff1f6da34356e67085caafa6be383a ] + +This code assumes that "len" is at least 62 bytes, but we need a check +to prevent a read overflow. + +Fixes: 61e121047645 ("staging: gdm7240: adding LTE USB driver") +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/YMcoTPsCYlhh2TQo@mwanda +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/gdm724x/gdm_lte.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c +index 1bc2b3365e32..454e47424ade 100644 +--- a/drivers/staging/gdm724x/gdm_lte.c ++++ b/drivers/staging/gdm724x/gdm_lte.c +@@ -624,10 +624,12 @@ static void gdm_lte_netif_rx(struct net_device *dev, char *buf, + * bytes (99,130,83,99 dec) + */ + } __packed; +- void *addr = buf + sizeof(struct iphdr) + +- sizeof(struct udphdr) + +- offsetof(struct dhcp_packet, chaddr); +- ether_addr_copy(nic->dest_mac_addr, addr); ++ int offset = sizeof(struct iphdr) + ++ sizeof(struct udphdr) + ++ offsetof(struct dhcp_packet, chaddr); ++ if (offset + ETH_ALEN > len) ++ return; ++ ether_addr_copy(nic->dest_mac_addr, buf + offset); + } + } + +-- +2.30.2 + diff --git a/queue-4.9/tty-nozomi-fix-a-resource-leak-in-an-error-handling-.patch b/queue-4.9/tty-nozomi-fix-a-resource-leak-in-an-error-handling-.patch new file mode 100644 index 00000000000..9fbcabb5806 --- /dev/null +++ b/queue-4.9/tty-nozomi-fix-a-resource-leak-in-an-error-handling-.patch @@ -0,0 +1,39 @@ +From c632e188cdcc5f7a4768c6bf5e2fcf590434d84d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 9 May 2021 19:22:33 +0200 +Subject: tty: nozomi: Fix a resource leak in an error handling function + +From: Christophe JAILLET + +[ Upstream commit 31a9a318255960d32ae183e95d0999daf2418608 ] + +A 'request_irq()' call is not balanced by a corresponding 'free_irq()' in +the error handling path, as already done in the remove function. + +Add it. + +Fixes: 9842c38e9176 ("kfifo: fix warn_unused_result") +Reviewed-by: Jiri Slaby +Signed-off-by: Christophe JAILLET +Link: https://lore.kernel.org/r/4f0d2b3038e82f081d370ccb0cade3ad88463fe7.1620580838.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/nozomi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c +index d6fd0e802ef5..c4c37640bda3 100644 +--- a/drivers/tty/nozomi.c ++++ b/drivers/tty/nozomi.c +@@ -1479,6 +1479,7 @@ err_free_tty: + tty_unregister_device(ntty_driver, dc->index_start + i); + tty_port_destroy(&dc->port[i].port); + } ++ free_irq(pdev->irq, dc); + err_free_kfifo: + for (i = 0; i < MAX_PORT; i++) + kfifo_free(&dc->port[i].fifo_ul); +-- +2.30.2 + diff --git a/queue-4.9/tty-nozomi-fix-the-error-handling-path-of-nozomi_car.patch b/queue-4.9/tty-nozomi-fix-the-error-handling-path-of-nozomi_car.patch new file mode 100644 index 00000000000..05b6106e6d3 --- /dev/null +++ b/queue-4.9/tty-nozomi-fix-the-error-handling-path-of-nozomi_car.patch @@ -0,0 +1,58 @@ +From 320bb3524817314c5104f856d79756d2ac669426 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 20:51:57 +0200 +Subject: tty: nozomi: Fix the error handling path of 'nozomi_card_init()' + +From: Christophe JAILLET + +[ Upstream commit 6ae7d0f5a92b9619f6e3c307ce56b2cefff3f0e9 ] + +The error handling path is broken and we may un-register things that have +never been registered. + +Update the loops index accordingly. + +Fixes: 9842c38e9176 ("kfifo: fix warn_unused_result") +Suggested-by: Dan Carpenter +Signed-off-by: Christophe JAILLET +Link: https://lore.kernel.org/r/e28c2e92c7475da25b03d022ea2d6dcf1ba807a2.1621968629.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/nozomi.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c +index c4c37640bda3..37c7cea8c34f 100644 +--- a/drivers/tty/nozomi.c ++++ b/drivers/tty/nozomi.c +@@ -1437,7 +1437,7 @@ static int nozomi_card_init(struct pci_dev *pdev, + NOZOMI_NAME, dc); + if (unlikely(ret)) { + dev_err(&pdev->dev, "can't request irq %d\n", pdev->irq); +- goto err_free_kfifo; ++ goto err_free_all_kfifo; + } + + DBG1("base_addr: %p", dc->base_addr); +@@ -1475,13 +1475,15 @@ static int nozomi_card_init(struct pci_dev *pdev, + return 0; + + err_free_tty: +- for (i = 0; i < MAX_PORT; ++i) { ++ for (i--; i >= 0; i--) { + tty_unregister_device(ntty_driver, dc->index_start + i); + tty_port_destroy(&dc->port[i].port); + } + free_irq(pdev->irq, dc); ++err_free_all_kfifo: ++ i = MAX_PORT; + err_free_kfifo: +- for (i = 0; i < MAX_PORT; i++) ++ for (i--; i >= PORT_MDM; i--) + kfifo_free(&dc->port[i].fifo_ul); + err_free_sbuf: + kfree(dc->send_buf); +-- +2.30.2 + diff --git a/queue-4.9/vxlan-add-missing-rcu_read_lock-in-neigh_reduce.patch b/queue-4.9/vxlan-add-missing-rcu_read_lock-in-neigh_reduce.patch new file mode 100644 index 00000000000..d46656f633f --- /dev/null +++ b/queue-4.9/vxlan-add-missing-rcu_read_lock-in-neigh_reduce.patch @@ -0,0 +1,84 @@ +From 9572ccfa8f127ddeb1bdd084fba298a46d17bfe0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jun 2021 07:44:17 -0700 +Subject: vxlan: add missing rcu_read_lock() in neigh_reduce() + +From: Eric Dumazet + +[ Upstream commit 85e8b032d6ebb0f698a34dd22c2f13443d905888 ] + +syzbot complained in neigh_reduce(), because rcu_read_lock_bh() +is treated differently than rcu_read_lock() + +WARNING: suspicious RCU usage +5.13.0-rc6-syzkaller #0 Not tainted +----------------------------- +include/net/addrconf.h:313 suspicious rcu_dereference_check() usage! + +other info that might help us debug this: + +rcu_scheduler_active = 2, debug_locks = 1 +3 locks held by kworker/0:0/5: + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: arch_atomic64_set arch/x86/include/asm/atomic64_64.h:34 [inline] + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: atomic64_set include/asm-generic/atomic-instrumented.h:856 [inline] + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: atomic_long_set include/asm-generic/atomic-long.h:41 [inline] + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: set_work_data kernel/workqueue.c:617 [inline] + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: set_work_pool_and_clear_pending kernel/workqueue.c:644 [inline] + #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: process_one_work+0x871/0x1600 kernel/workqueue.c:2247 + #1: ffffc90000ca7da8 ((work_completion)(&port->wq)){+.+.}-{0:0}, at: process_one_work+0x8a5/0x1600 kernel/workqueue.c:2251 + #2: ffffffff8bf795c0 (rcu_read_lock_bh){....}-{1:2}, at: __dev_queue_xmit+0x1da/0x3130 net/core/dev.c:4180 + +stack backtrace: +CPU: 0 PID: 5 Comm: kworker/0:0 Not tainted 5.13.0-rc6-syzkaller #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 +Workqueue: events ipvlan_process_multicast +Call Trace: + __dump_stack lib/dump_stack.c:79 [inline] + dump_stack+0x141/0x1d7 lib/dump_stack.c:120 + __in6_dev_get include/net/addrconf.h:313 [inline] + __in6_dev_get include/net/addrconf.h:311 [inline] + neigh_reduce drivers/net/vxlan.c:2167 [inline] + vxlan_xmit+0x34d5/0x4c30 drivers/net/vxlan.c:2919 + __netdev_start_xmit include/linux/netdevice.h:4944 [inline] + netdev_start_xmit include/linux/netdevice.h:4958 [inline] + xmit_one net/core/dev.c:3654 [inline] + dev_hard_start_xmit+0x1eb/0x920 net/core/dev.c:3670 + __dev_queue_xmit+0x2133/0x3130 net/core/dev.c:4246 + ipvlan_process_multicast+0xa99/0xd70 drivers/net/ipvlan/ipvlan_core.c:287 + process_one_work+0x98d/0x1600 kernel/workqueue.c:2276 + worker_thread+0x64c/0x1120 kernel/workqueue.c:2422 + kthread+0x3b1/0x4a0 kernel/kthread.c:313 + ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294 + +Fixes: f564f45c4518 ("vxlan: add ipv6 proxy support") +Signed-off-by: Eric Dumazet +Reported-by: syzbot +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/vxlan.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c +index 088bb5870ac5..0bfadec8b79c 100644 +--- a/drivers/net/vxlan.c ++++ b/drivers/net/vxlan.c +@@ -1594,6 +1594,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb) + struct neighbour *n; + struct inet6_dev *in6_dev; + ++ rcu_read_lock(); + in6_dev = __in6_dev_get(dev); + if (!in6_dev) + goto out; +@@ -1650,6 +1651,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb) + } + + out: ++ rcu_read_unlock(); + consume_skb(skb); + return NETDEV_TX_OK; + } +-- +2.30.2 + diff --git a/queue-4.9/wireless-carl9170-fix-leds-build-errors-warnings.patch b/queue-4.9/wireless-carl9170-fix-leds-build-errors-warnings.patch new file mode 100644 index 00000000000..0cc56bc6dd0 --- /dev/null +++ b/queue-4.9/wireless-carl9170-fix-leds-build-errors-warnings.patch @@ -0,0 +1,66 @@ +From a5ab9e5814b62e01f8e1fec075fc175b7ba9bc78 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 May 2021 17:41:28 +0300 +Subject: wireless: carl9170: fix LEDS build errors & warnings + +From: Randy Dunlap + +[ Upstream commit 272fdc0c4542fad173b44965be02a16d6db95499 ] + +kernel test robot reports over 200 build errors and warnings +that are due to this Kconfig problem when CARL9170=m, +MAC80211=y, and LEDS_CLASS=m. + +WARNING: unmet direct dependencies detected for MAC80211_LEDS + Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) + Selected by [m]: + - CARL9170_LEDS [=y] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && CARL9170 [=m] + +CARL9170_LEDS selects MAC80211_LEDS even though its kconfig +dependencies are not met. This happens because 'select' does not follow +any Kconfig dependency chains. + +Fix this by making CARL9170_LEDS depend on MAC80211_LEDS, where +the latter supplies any needed dependencies on LEDS_CLASS. + +Fixes: 1d7e1e6b1b8ed ("carl9170: Makefile, Kconfig files and MAINTAINERS") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +Cc: Kalle Valo +Cc: Christian Lamparter +Cc: linux-wireless@vger.kernel.org +Cc: Arnd Bergmann +Suggested-by: Christian Lamparter +Acked-by: Arnd Bergmann +Acked-by: Christian Lamparter +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20210530031134.23274-1-rdunlap@infradead.org +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/carl9170/Kconfig | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig +index 2e34baeaf764..2b782db20fde 100644 +--- a/drivers/net/wireless/ath/carl9170/Kconfig ++++ b/drivers/net/wireless/ath/carl9170/Kconfig +@@ -15,13 +15,11 @@ config CARL9170 + + config CARL9170_LEDS + bool "SoftLED Support" +- depends on CARL9170 +- select MAC80211_LEDS +- select LEDS_CLASS +- select NEW_LEDS + default y ++ depends on CARL9170 ++ depends on MAC80211_LEDS + help +- This option is necessary, if you want your device' LEDs to blink ++ This option is necessary, if you want your device's LEDs to blink. + + Say Y, unless you need the LEDs for firmware debugging. + +-- +2.30.2 + diff --git a/queue-4.9/writeback-fix-obtain-a-reference-to-a-freeing-memcg-.patch b/queue-4.9/writeback-fix-obtain-a-reference-to-a-freeing-memcg-.patch new file mode 100644 index 00000000000..ce65247e0de --- /dev/null +++ b/queue-4.9/writeback-fix-obtain-a-reference-to-a-freeing-memcg-.patch @@ -0,0 +1,61 @@ +From 8641d1b7b62230a1a2e5b301fa7b620798b52b24 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Apr 2021 17:11:45 +0800 +Subject: writeback: fix obtain a reference to a freeing memcg css + +From: Muchun Song + +[ Upstream commit 8b0ed8443ae6458786580d36b7d5f8125535c5d4 ] + +The caller of wb_get_create() should pin the memcg, because +wb_get_create() relies on this guarantee. The rcu read lock +only can guarantee that the memcg css returned by css_from_id() +cannot be released, but the reference of the memcg can be zero. + + rcu_read_lock() + memcg_css = css_from_id() + wb_get_create(memcg_css) + cgwb_create(memcg_css) + // css_get can change the ref counter from 0 back to 1 + css_get(memcg_css) + rcu_read_unlock() + +Fix it by holding a reference to the css before calling +wb_get_create(). This is not a problem I encountered in the +real world. Just the result of a code review. + +Fixes: 682aa8e1a6a1 ("writeback: implement unlocked_inode_to_wb transaction and use it for stat updates") +Link: https://lore.kernel.org/r/20210402091145.80635-1-songmuchun@bytedance.com +Signed-off-by: Muchun Song +Acked-by: Michal Hocko +Acked-by: Tejun Heo +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/fs-writeback.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c +index 008710314240..e7815bebaeb8 100644 +--- a/fs/fs-writeback.c ++++ b/fs/fs-writeback.c +@@ -512,9 +512,14 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id) + /* find and pin the new wb */ + rcu_read_lock(); + memcg_css = css_from_id(new_wb_id, &memory_cgrp_subsys); +- if (memcg_css) +- isw->new_wb = wb_get_create(bdi, memcg_css, GFP_ATOMIC); ++ if (memcg_css && !css_tryget(memcg_css)) ++ memcg_css = NULL; + rcu_read_unlock(); ++ if (!memcg_css) ++ goto out_free; ++ ++ isw->new_wb = wb_get_create(bdi, memcg_css, GFP_ATOMIC); ++ css_put(memcg_css); + if (!isw->new_wb) + goto out_free; + +-- +2.30.2 +