October 2023 - Linux-stable-mirror

[PATCH v5.10.y 1/3] driver: platform: Add helper for safer setting of driver_override

by Lee Jones

From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> commit 6c2f421174273de8f83cde4286d1c076d43a2d35 upstream. Several core drivers and buses expect that driver_override is a dynamically allocated memory thus later they can kfree() it. However such assumption is not documented, there were in the past and there are already users setting it to a string literal. This leads to kfree() of static memory during device release (e.g. in error paths or during unbind): kernel BUG at ../mm/slub.c:3960! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM ... (kfree) from [<c058da50>] (platform_device_release+0x88/0xb4) (platform_device_release) from [<c0585be0>] (device_release+0x2c/0x90) (device_release) from [<c0a69050>] (kobject_put+0xec/0x20c) (kobject_put) from [<c0f2f120>] (exynos5_clk_probe+0x154/0x18c) (exynos5_clk_probe) from [<c058de70>] (platform_drv_probe+0x6c/0xa4) (platform_drv_probe) from [<c058b7ac>] (really_probe+0x280/0x414) (really_probe) from [<c058baf4>] (driver_probe_device+0x78/0x1c4) (driver_probe_device) from [<c0589854>] (bus_for_each_drv+0x74/0xb8) (bus_for_each_drv) from [<c058b48c>] (__device_attach+0xd4/0x16c) (__device_attach) from [<c058a638>] (bus_probe_device+0x88/0x90) (bus_probe_device) from [<c05871fc>] (device_add+0x3dc/0x62c) (device_add) from [<c075ff10>] (of_platform_device_create_pdata+0x94/0xbc) (of_platform_device_create_pdata) from [<c07600ec>] (of_platform_bus_create+0x1a8/0x4fc) (of_platform_bus_create) from [<c0760150>] (of_platform_bus_create+0x20c/0x4fc) (of_platform_bus_create) from [<c07605f0>] (of_platform_populate+0x84/0x118) (of_platform_populate) from [<c0f3c964>] (of_platform_default_populate_init+0xa0/0xb8) (of_platform_default_populate_init) from [<c01031f8>] (do_one_initcall+0x8c/0x404) Provide a helper which clearly documents the usage of driver_override. This will allow later to reuse the helper and reduce the amount of duplicated code. Convert the platform driver to use a new helper and make the driver_override field const char (it is not modified by the core). Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20220419113435.246203-2-krzysztof.kozlowski@linar… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Lee Jones <lee(a)kernel.org> --- drivers/base/driver.c | 69 +++++++++++++++++++++++++++++++++ drivers/base/platform.c | 28 ++----------- include/linux/device/driver.h | 2 + include/linux/platform_device.h | 6 ++- 4 files changed, 80 insertions(+), 25 deletions(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 8c0d33e182fd5..1b9d47b10bd0a 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -30,6 +30,75 @@ static struct device *next_device(struct klist_iter *i) return dev; } +/** + * driver_set_override() - Helper to set or clear driver override. + * @dev: Device to change + * @override: Address of string to change (e.g. &device->driver_override); + * The contents will be freed and hold newly allocated override. + * @s: NUL-terminated string, new driver name to force a match, pass empty + * string to clear it ("" or "\n", where the latter is only for sysfs + * interface). + * @len: length of @s + * + * Helper to set or clear driver override in a device, intended for the cases + * when the driver_override field is allocated by driver/bus code. + * + * Returns: 0 on success or a negative error code on failure. + */ +int driver_set_override(struct device *dev, const char **override, + const char *s, size_t len) +{ + const char *new, *old; + char *cp; + + if (!override || !s) + return -EINVAL; + + /* + * The stored value will be used in sysfs show callback (sysfs_emit()), + * which has a length limit of PAGE_SIZE and adds a trailing newline. + * Thus we can store one character less to avoid truncation during sysfs + * show. + */ + if (len >= (PAGE_SIZE - 1)) + return -EINVAL; + + if (!len) { + /* Empty string passed - clear override */ + device_lock(dev); + old = *override; + *override = NULL; + device_unlock(dev); + kfree(old); + + return 0; + } + + cp = strnchr(s, len, '\n'); + if (cp) + len = cp - s; + + new = kstrndup(s, len, GFP_KERNEL); + if (!new) + return -ENOMEM; + + device_lock(dev); + old = *override; + if (cp != s) { + *override = new; + } else { + /* "\n" passed - clear override */ + kfree(new); + *override = NULL; + } + device_unlock(dev); + + kfree(old); + + return 0; +} +EXPORT_SYMBOL_GPL(driver_set_override); + /** * driver_for_each_device - Iterator for devices bound to a driver. * @drv: Driver we're iterating. diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 88aef93eb4ddf..647066229fec3 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1046,31 +1046,11 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) { struct platform_device *pdev = to_platform_device(dev); - char *driver_override, *old, *cp; - - /* We need to keep extra room for a newline */ - if (count >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, count, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - cp = strchr(driver_override, '\n'); - if (cp) - *cp = '\0'; - - device_lock(dev); - old = pdev->driver_override; - if (strlen(driver_override)) { - pdev->driver_override = driver_override; - } else { - kfree(driver_override); - pdev->driver_override = NULL; - } - device_unlock(dev); + int ret; - kfree(old); + ret = driver_set_override(dev, &pdev->driver_override, buf, count); + if (ret) + return ret; return count; } diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index ee7ba5b5417e5..a44f5adeaef5a 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -150,6 +150,8 @@ extern int __must_check driver_create_file(struct device_driver *driver, extern void driver_remove_file(struct device_driver *driver, const struct driver_attribute *attr); +int driver_set_override(struct device *dev, const char **override, + const char *s, size_t len); extern int __must_check driver_for_each_device(struct device_driver *drv, struct device *start, void *data, diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 17f9cd5626c83..e7a83b0218077 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -30,7 +30,11 @@ struct platform_device { struct resource *resource; const struct platform_device_id *id_entry; - char *driver_override; /* Driver name to force a match */ + /* + * Driver name to force a match. Do not set directly, because core + * frees it. Use driver_set_override() to set or clear it. + */ + const char *driver_override; /* MFD cell pointer */ struct mfd_cell *mfd_cell; -- 2.42.0.655.g421f12c284-goog

1 year, 3 months

1
2
0 0

[net-next RFC PATCH 1/6] wifi: mt76: fix broken precal loading from MTD for mt7915

by Christian Marangi

Commit 495184ac91bb ("mt76: mt7915: add support for applying pre-calibration data") was fundamentally broken and never worked. The idea (before NVMEM support) was to expand the MTD function and pass an additional offset. For normal EEPROM load the offset would always be 0. For the purpose of precal loading, an offset was passed that was internally the size of EEPROM, since precal data is right after the EEPROM. Problem is that the offset value passed is never handled and is actually overwrite by offset = be32_to_cpup(list); ret = mtd_read(mtd, offset, len, &retlen, eep); resulting in the passed offset value always ingnored. (and even passing garbage data as precal as the start of the EEPROM is getting read) Fix this by adding to the current offset value, the offset from DT to correctly read the piece of data at the requested location. Cc: stable(a)vger.kernel.org Fixes: 495184ac91bb ("mt76: mt7915: add support for applying pre-calibration data") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> --- drivers/net/wireless/mediatek/mt76/eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c index 36564930aef1..2558788f7ffb 100644 --- a/drivers/net/wireless/mediatek/mt76/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c @@ -67,7 +67,7 @@ static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offs goto out_put_node; } - offset = be32_to_cpup(list); + offset += be32_to_cpup(list); ret = mtd_read(mtd, offset, len, &retlen, eep); put_mtd_device(mtd); if (mtd_is_bitflip(ret)) -- 2.40.1

1 year, 3 months

2
1
0 0

[PATCH v3] KVM: x86: hyper-v: Don't auto-enable stimer on write from user-space

by Nicolas Saenz Julienne

Don't apply the stimer's counter side effects when modifying its value from user-space, as this may trigger spurious interrupts. For example: - The stimer is configured in auto-enable mode. - The stimer's count is set and the timer enabled. - The stimer expires, an interrupt is injected. - The VM is live migrated. - The stimer config and count are deserialized, auto-enable is ON, the stimer is re-enabled. - The stimer expires right away, and injects an unwarranted interrupt. Cc: stable(a)vger.kernel.org Fixes: 1f4b34f825e8 ("kvm/x86: Hyper-V SynIC timers") Signed-off-by: Nicolas Saenz Julienne <nsaenz(a)amazon.com> --- Changes since v2: - reword commit message/subject. Changes since v1: - Cover all 'stimer->config.enable' updates. arch/x86/kvm/hyperv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 7c2dac6824e2..238afd7335e4 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -727,10 +727,12 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count, stimer_cleanup(stimer); stimer->count = count; - if (stimer->count == 0) - stimer->config.enable = 0; - else if (stimer->config.auto_enable) - stimer->config.enable = 1; + if (!host) { + if (stimer->count == 0) + stimer->config.enable = 0; + else if (stimer->config.auto_enable) + stimer->config.enable = 1; + } if (stimer->config.enable) stimer_mark_pending(stimer, false); -- 2.40.1

1 year, 3 months

3
2
0 0

[PATCH] Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE

by Guan Wentao

Add PID/VID 0bda:b85b for Realtek RTL8852BE USB bluetooth part. The PID/VID was reported by the patch last year. [1] Some SBCs like rockpi 5B A8 module contains the device. And it`s founded in website. [2] [3] Here is the device tables in /sys/kernel/debug/usb/devices . T: Bus=07 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0bda ProdID=b85b Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms Link: https://lore.kernel.org/all/20220420052402.19049-1-tangmeng@uniontech.com/ [1] Link: https://forum.radxa.com/t/bluetooth-on-ubuntu/13051/4 [2] Link: https://ubuntuforums.org/showthread.php?t=2489527 [3] Cc: stable(a)vger.kernel.org Signed-off-by: Meng Tang <tangmeng(a)uniontech.com> Signed-off-by: Guan Wentao <guanwentao(a)uniontech.com> --- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 3fdad35e5..894938d2b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -544,6 +544,8 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x0bda, 0x887b), .driver_info = BTUSB_REALTEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x0bda, 0xb85b), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3570), .driver_info = BTUSB_REALTEK | BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3571), .driver_info = BTUSB_REALTEK | -- 2.20.1

1 year, 3 months

2
1
0 0

[PATCH] drm/amd/pm: Handle non-terminated overdrive commands.

by Bas Nieuwenhuizen

The incoming strings might not be terminated by a newline or a 0. (found while testing a program that just wrote the string itself, causing a crash) Cc: stable(a)vger.kernel.org Fixes: e3933f26b657 ("drm/amd/pp: Add edit/commit/show OD clock/voltage support in sysfs") Signed-off-by: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> --- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index da0da03569e8..f9c9eba1a815 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -760,7 +760,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, if (adev->in_suspend && !adev->in_runpm) return -EPERM; - if (count > 127) + if (count > 127 || count == 0) return -EINVAL; if (*buf == 's') @@ -780,7 +780,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, else return -EINVAL; - memcpy(buf_cpy, buf, count+1); + memcpy(buf_cpy, buf, count); + buf_cpy[count] = 0; tmp_str = buf_cpy; @@ -797,6 +798,9 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, return -EINVAL; parameter_size++; + if (!tmp_str) + break; + while (isspace(*tmp_str)) tmp_str++; } -- 2.42.0

1 year, 3 months

2
1
0 0

[PATCH] netfilter: ipset: fix race condition in ipset swap, destroy and test/add/del

by xiaolinkui

From: Linkui Xiao <xiaolinkui(a)kylinos.cn> There is a race condition which can be demonstrated by the following script: ipset create hash_ip1 hash:net family inet hashsize 1024 maxelem 1048576 ipset add hash_ip1 172.20.0.0/16 ipset add hash_ip1 192.168.0.0/16 iptables -A INPUT -m set --match-set hash_ip1 src -j ACCEPT while [ 1 ] do ipset create hash_ip2 hash:net family inet hashsize 1024 maxelem 1048576 ipset add hash_ip2 172.20.0.0/16 ipset swap hash_ip1 hash_ip2 ipset destroy hash_ip2 sleep 0.05 done Swap will exchange the values of ref so destroy will see ref = 0 instead of ref = 1. So after running this script for a period of time, the following race situations may occur: CPU0: CPU1: ipt_do_table ->set_match_v4 ->ip_set_test ipset swap hash_ip1 hash_ip2 ipset destroy hash_ip2 ->hash_net4_kadt CPU0 found ipset through the index, and at this time, hash_ip2 has been destroyed by CPU1 through name search. So CPU0 will crash when accessing set->data in the function hash_net4_kadt. With this fix in place swap will wait for the ongoing operations to be finished. V1->V2 changes: - replace ref_netlink with rcu synchonize_rcu() Closes: https://lore.kernel.org/all/69e7963b-e7f8-3ad0-210-7b86eebf7f78@netfilter.o… Cc: stable(a)vger.kernel.org Suggested-by: Jozsef Kadlecsik <kadlec(a)netfilter.org> Signed-off-by: Linkui Xiao <xiaolinkui(a)kylinos.cn> --- net/netfilter/ipset/ip_set_core.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 35d2f9c9ada0..62ee4de6ffee 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -712,13 +712,18 @@ ip_set_rcu_get(struct net *net, ip_set_id_t index) struct ip_set_net *inst = ip_set_pernet(net); rcu_read_lock(); - /* ip_set_list itself needs to be protected */ + /* ip_set_list and the set pointer need to be protected */ set = rcu_dereference(inst->ip_set_list)[index]; - rcu_read_unlock(); return set; } +static inline void +ip_set_rcu_put(struct ip_set *set __always_unused) +{ + rcu_read_unlock(); +} + static inline void ip_set_lock(struct ip_set *set) { @@ -744,8 +749,10 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb, pr_debug("set %s, index %u\n", set->name, index); if (opt->dim < set->type->dimension || - !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) + !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) { + ip_set_rcu_put(set); return 0; + } ret = set->variant->kadt(set, skb, par, IPSET_TEST, opt); @@ -764,6 +771,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb, ret = -ret; } + ip_set_rcu_put(set); /* Convert error codes to nomatch */ return (ret < 0 ? 0 : ret); } @@ -780,12 +788,15 @@ ip_set_add(ip_set_id_t index, const struct sk_buff *skb, pr_debug("set %s, index %u\n", set->name, index); if (opt->dim < set->type->dimension || - !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) + !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) { + ip_set_rcu_put(set); return -IPSET_ERR_TYPE_MISMATCH; + } ip_set_lock(set); ret = set->variant->kadt(set, skb, par, IPSET_ADD, opt); ip_set_unlock(set); + ip_set_rcu_put(set); return ret; } @@ -802,12 +813,15 @@ ip_set_del(ip_set_id_t index, const struct sk_buff *skb, pr_debug("set %s, index %u\n", set->name, index); if (opt->dim < set->type->dimension || - !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) + !(opt->family == set->family || set->family == NFPROTO_UNSPEC)) { + ip_set_rcu_put(set); return -IPSET_ERR_TYPE_MISMATCH; + } ip_set_lock(set); ret = set->variant->kadt(set, skb, par, IPSET_DEL, opt); ip_set_unlock(set); + ip_set_rcu_put(set); return ret; } @@ -882,6 +896,7 @@ ip_set_name_byindex(struct net *net, ip_set_id_t index, char *name) read_lock_bh(&ip_set_ref_lock); strscpy_pad(name, set->name, IPSET_MAXNAMELEN); read_unlock_bh(&ip_set_ref_lock); + ip_set_rcu_put(set); } EXPORT_SYMBOL_GPL(ip_set_name_byindex); @@ -1348,6 +1363,9 @@ static int ip_set_rename(struct sk_buff *skb, const struct nfnl_info *info, * protected by the ip_set_ref_lock. The kernel interfaces * do not hold the mutex but the pointer settings are atomic * so the ip_set_list always contains valid pointers to the sets. + * However after swapping, a userspace set destroy command could + * remove a set still processed by kernel side add/del/test. + * Therefore we need to wait for the ongoing operations to be finished. */ static int ip_set_swap(struct sk_buff *skb, const struct nfnl_info *info, @@ -1397,6 +1415,9 @@ static int ip_set_swap(struct sk_buff *skb, const struct nfnl_info *info, ip_set(inst, to_id) = from; write_unlock_bh(&ip_set_ref_lock); + /* Make sure all readers of the old set pointers are completed. */ + synchronize_rcu(); + return 0; } -- 2.17.1

1 year, 3 months

3
2
0 0

[PATCH v2] docs: add backporting and conflict resolution document

by Vegard Nossum

This is a new document based on my 2022 blog post: https://blogs.oracle.com/linux/post/backporting-patches-using-git Although this is aimed at stable contributors and distro maintainers, it does also contain useful tips and tricks for anybody who needs to resolve merge conflicts. By adding this to the kernel as documentation we can more easily point to it e.g. from stable emails about failed backports, as well as allow the community to modify it over time if necessary. I've added this under process/ since it also has process/applying-patches.rst. Another interesting document is maintainer/rebasing-and-merging.rst which maybe should eventually refer to this one, but I'm leaving that as a future cleanup. Thanks to Harshit Mogalapalli for helping with the original blog post as well as this updated document and Bagas Sanjaya for providing thoughtful feedback. v2: fixed heading style, link style, placeholder style, other comments Link: https://lore.kernel.org/linux-doc/20230303162553.17212-1-vegard.nossum@orac… Cc: Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> Cc: Bagas Sanjaya <bagasdotme(a)gmail.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Stephen Rothwell <sfr(a)canb.auug.org.au> Cc: Jason A. Donenfeld <Jason(a)zx2c4.com> Cc: Konstantin Ryabitsev <konstantin(a)linuxfoundation.org> Signed-off-by: Vegard Nossum <vegard.nossum(a)oracle.com> --- Documentation/process/backporting.rst | 514 ++++++++++++++++++++++++++ Documentation/process/index.rst | 1 + 2 files changed, 515 insertions(+) create mode 100644 Documentation/process/backporting.rst diff --git a/Documentation/process/backporting.rst b/Documentation/process/backporting.rst new file mode 100644 index 0000000000000..7593980af9659 --- /dev/null +++ b/Documentation/process/backporting.rst @@ -0,0 +1,514 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=================================== +Backporting and conflict resolution +=================================== + +:Author: Vegard Nossum <vegard.nossum(a)oracle.com> + +.. contents:: + :local: + :depth: 3 + :backlinks: none + +Introduction +============ + +Some developers may never really have to deal with backporting patches, +merging branches, or resolving conflicts in their day-to-day work, so +when a merge conflict does pop up, it can be daunting. Luckily, +resolving conflicts is a skill like any other, and there are many useful +techniques you can use to make the process smoother and increase your +confidence in the result. + +This document aims to be a comprehensive, step-by-step guide to +backporting and conflict resolution. + +Applying the patch to a tree +============================ + +Sometimes the patch you are backporting already exists as a git commit, +in which case you just cherry-pick it directly using +``git cherry-pick``. However, if the patch comes from an email, as it +often does for the Linux kernel, you will need to apply it to a tree +using ``git am``. + +If you've ever used ``git am``, you probably already know that it is +quite picky about the patch applying perfectly to your source tree. In +fact, you've probably had nightmares about ``.rej`` files and trying to +edit the patch to make it apply. + +It is strongly recommended to instead find an appropriate base version +where the patch applies cleanly and *then* cherry-pick it over to your +destination tree, as this will make git output conflict markers and let +you resolve conflicts with the help of git and any other conflict +resolution tools you might prefer to use. For example, if you want to +apply a patch that just arrived on LKML to an older stable kernel, you +can apply it to the most recent mainline kernel and then cherry-pick it +to your older stable branch. + +It's generally better to use the exact same base as the one the patch +was generated from, but it doesn't really matter that much as long as it +applies cleanly and isn't too far from the original base. The only +problem with applying the patch to the "wrong" base is that it may pull +in more unrelated changes in the context of the diff when cherry-picking +it to the older branch. + +If you are using `b4`_. and you are applying the patch directly from an +email, you can use ``b4 am`` with the options ``-g``/``--guess-base`` +and ``-3``/``--prep-3way`` to do some of this automatically (see the +`b4 presentation`_ for more information). However, the rest of this +article will assume that you are doing a plain ``git cherry-pick``. + +.. _b4: https://people.kernel.org/monsieuricon/introducing-b4-and-patch-attestation +.. _b4 presentation: https://youtu.be/mF10hgVIx9o?t=2996 + +Once you have the patch in git, you can go ahead and cherry-pick it into +your source tree. Don't forget to cherry-pick with ``-x`` if you want a +written record of where the patch came from! + +Note that if you are submiting a patch for stable, the format is +slightly different; the first line after the subject line needs tobe +either:: + + commit <upstream commit> upstream + +or:: + + [ Upstream commit <upstream commit> ] + +Resolving conflicts +=================== + +Uh-oh; the cherry-pick failed with a vaguely threatening message:: + + CONFLICT (content): Merge conflict + +What to do now? + +In general, conflicts appear when the context of the patch (i.e., the +lines being changed and/or the lines surrounding the changes) doesn't +match what's in the tree you are trying to apply the patch *to*. + +For backports, what likely happened was that the branch you are +backporting from contains patches not in the branch you are backporting +to. However, the reverse is also possible. In any case, the result is a +conflict that needs to be resolved. + +If your attempted cherry-pick fails with a conflict, git automatically +edits the files to include so-called conflict markers showing you where +the conflict is and how the two branches have diverged. Resolving the +conflict typically means editing the end result in such a way that it +takes into account these other commits. + +Resolving the conflict can be done either by hand in a regular text +editor or using a dedicated conflict resolution tool. + +Many people prefer to use their regular text editor and edit the +conflict directly, as it may be easier to understand what you're doing +and to control the final result. There are definitely pros and cons to +each method, and sometimes there's value in using both. + +We will not cover using dedicated merge tools here beyond providing some +pointers to various tools that you could use: + +- `vimdiff/gvimdiff <https://linux.die.net/man/1/vimdiff>`__ +- `KDiff3 <http://kdiff3.sourceforge.net/>`__ +- `TortoiseMerge <https://tortoisesvn.net/TortoiseMerge.html>`__ +- `Meld <https://meldmerge.org/help/>`__ +- `P4Merge <https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge>`__ +- `Beyond Compare <https://www.scootersoftware.com/>`__ +- `IntelliJ <https://www.jetbrains.com/help/idea/resolve-conflicts.html>`__ +- `VSCode <https://code.visualstudio.com/docs/editor/versioncontrol>`__ + +To configure git to work with these, see ``git mergetool --help`` or +the official `git-mergetool documentation`_. + +.. _git-mergetool documentation: https://git-scm.com/docs/git-mergetool + +Prerequisite patches +-------------------- + +Most conflicts happen because the branch you are backporting to is +missing some patches compared to the branch you are backporting *from*. +In the more general case (such as merging two independent branches), +development could have happened on either branch, or the branches have +simply diverged -- perhaps your older branch had some other backports +applied to it that themselves needed conflict resolutions, causing a +divergence. + +It's important to always identify the commit or commits that caused the +conflict, as otherwise you cannot be confident in the correctness of +your resolution. As an added bonus, especially if the patch is in an +area you're not that famliar with, the changelogs of these commits will +often give you the context to understand the code and potential problems +or pitfalls with your conflict resolution. + +git log +~~~~~~~ + +A good first step is to look at ``git log`` for the file that has the +conflict -- this is usually sufficient when there aren't a lot of +patches to the file, but may get confusing if the file is big and +frequently patched. You should run ``git log`` on the range of commits +between your currently checked-out branch (``HEAD``) and the parent of +the patch you are picking (``<commit>``), i.e.:: + + git log HEAD..<commit>^ -- <path> + +Even better, if you want to restrict this output to a single function +(because that's where the conflict appears), you can use the following +syntax:: + + git log -L:'\<function\>':<path> HEAD..<commit>^ + +.. note:: + The ``\<`` and ``\>`` around the function name ensure that the + matches are anchored on a word boundary. This is important, as this + part is actually a regex and git only follows the first match, so + if you use ``-L:thread_stack:kernel/fork.c`` it may only give you + results for the function ``try_release_thread_stack_to_cache`` even + though there are many other functions in that file containing the + string ``thread_stack`` in their names. + +Another useful option for ``git log`` is ``-G``, which allows you to +filter on certain strings appearing in the diffs of the commits you are +listing:: + + git log -G'regex' HEAD..<commit>^ -- <path> + +This can also be a handy way to quickly find when something (e.g. a +function call or a variable) was changed, added, or removed. The search +string is a regular expression, which means you can potentially search +for more specific things like assignments to a specific struct member:: + + git log -G'\->index\>.*=' + +git blame +~~~~~~~~~ + +Another way to find prerequisite commits (albeit only the most recent +one for a given conflict) is to run ``git blame``. In this case, you +need to run it against the parent commit of the patch you are +cherry-picking and the file where the conflict appared, i.e.:: + + git blame <commit>^ -- <path> + +This command also accepts the ``-L`` argument (for restricting the +output to a single function), but in this case you specify the filename +at the end of the command as usual:: + + git blame -L:'\<function\>' <commit>^ -- <path> + +Navigate to the place where the conflict occurred. The first column of +the blame output is the commit ID of the patch that added a given line +of code. + +It might be a good idea to ``git show`` these commits and see if they +look like they might be the source of the conflict. Sometimes there will +be more than one of these commits, either because multiple commits +changed different lines of the same conflict area *or* because multiple +subsequent patches changed the same line (or lines) multiple times. In +the latter case, you may have to run ``git blame`` again and specify the +older version of the file to look at in order to dig further back in +the history of the file. + +Prerequisite vs. incidental patches +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Having found the patch that caused the conflict, you need to determine +whether it is a prerequisite for the patch you are backporting or +whether it is just incidental and can be skipped. An incidental patch +would be one that touches the same code as the patch you are +backporting, but does not change the semantics of the code in any +material way. For example, a whitespace cleanup patch is completely +incidental -- likewise, a patch that simply renames a function or a +variable would be incidental as well. On the other hand, if the function +being changed does not even exist in your current branch then this would +not be incidental at all and you need to carefully consider whether the +patch adding the function should be cherry-picked first. + +If you find that there is a necessary prerequisite patch, then you need +to stop and cherry-pick that instead. If you've already resolved some +conflicts in a different file and don't want to do it again, you can +create a temporary copy of that file. + +To abort the current cherry-pick, go ahead and run +``git cherry-pick --abort``, then restart the cherry-picking process +with the commit ID of the prerequisite patch instead. + +Understanding conflict markers +------------------------------ + +Combined diffs +~~~~~~~~~~~~~~ + +Let's say you've decided against picking (or reverting) additional +patches and you just want to resolve the conflict. Git will have +inserted conflict markers into your file. Out of the box, this will look +something like:: + + <<<<<<< HEAD + this is what's in your current tree before cherry-picking + ======= + this is what the patch wants it to be after cherry-picking + >>>>>>> <commit>... title + +This is what you would see if you opened the file in your editor. +However, if you were to run run ``git diff`` without any arguments, the +output would look something like this:: + + $ git diff + [...] + ++<<<<<<<< HEAD + +this is what's in your current tree before cherry-picking + ++======== + + this is what the patch wants it to be after cherry-picking + ++>>>>>>>> <commit>... title + +When you are resolving a conflict, the behavior of ``git diff`` differs +from its normal behavior. Notice the two columns of diff markers +instead of the usual one; this is a so-called "`combined diff`_", here +showing the 3-way diff (or diff-of-diffs) between + +#. the current branch (before cherry-picking) and the current working + directory, and +#. the current branch (before cherry-picking) and the file as it looks + after the original patch has been applied. + +.. _combined diff: https://git-scm.com/docs/diff-format#_combined_diff_format + + +Better diffs +~~~~~~~~~~~~ + +3-way combined diffs include all the other changes that happened to the +file between your current branch and the branch you are cherry-picking +from. While this is useful for spotting other changes that you need to +take into account, this also makes the output of ``git diff`` somewhat +intimidating and difficult to read. You may instead prefer to run +``git diff HEAD`` (or ``git diff --ours``) which shows only the diff +between the current branch before cherry-picking and the current working +directory. It looks like this:: + + $ git diff HEAD + [...] + +<<<<<<<< HEAD + this is what's in your current tree before cherry-picking + +======== + +this is what the patch wants it to be after cherry-picking + +>>>>>>>> <commit>... title + +As you can see, this reads just like any other diff and makes it clear +which lines are in the current branch and which lines are being added +because they are part of the merge conflict or the patch being +cherry-picked. + +Merge styles and diff3 +~~~~~~~~~~~~~~~~~~~~~~ + +The default conflict marker style shown above is known as the ``merge`` +style. There is also another style available, known as the ``diff3`` +style, which looks like this:: + + <<<<<<< HEAD + this is what is in your current tree before cherry-picking + ||||||| parent of <commit> (title) + this is what the patch expected to find there + ======= + this is what the patch wants it to be after being applied + >>>>>>> <commit> (title) + +As you can see, this has 3 parts instead of 2, and includes what git +expected to find there but didn't. Some people vastly prefer this style +as it makes it much clearer what the patch actually changed; i.e., it +allows you to compare the before-and-after versions of the file for the +commit you are cherry-picking. This allows you to make better decisions +about how to resolve the conflict. + +To change conflict marker styles, you can use the following command:: + + git config merge.conflictStyle diff3 + +There is a third option, ``zdiff3``, introduced in `Git 2.35`_, +which has the same 3 sections as ``diff3``, but where common lines have +been trimmed off, making the conflict area smaller in some cases. + +.. _Git 2.35: https://github.blog/2022-01-24-highlights-from-git-2-35/ + +Iterating on conflict resolutions +--------------------------------- + +The first step in any conflict resolution process is to understand the +patch you are backporting. For the Linux kernel this is especially +important, since an incorrect change can lead to the whole system +crashing -- or worse, an undetected security vulnerability. + +Understanding the patch can be easy or difficult depending on the patch +itself, the changelog, and your familiarity with the code being changed. +However, a good question for every change (or every hunk of the patch) +might be: "Why is this hunk in the patch?" The answers to these +questions will inform your conflict resolution. + +Resolution process +~~~~~~~~~~~~~~~~~~ + +Sometimes the easiest thing to do is to just remove all but the first +part of the conflict, leaving the file essentially unchanged, and apply +the changes by hand. Perhaps the patch is changing a function call +argument from ``0`` to ``1`` while a conflicting change added an +entirely new (and insignificant) parameter to the end of the parameter +list; in that case, it's easy enough to change the argument from ``0`` +to ``1`` by hand and leave the rest of the arguments alone. This +technique of manually applying changes is mostly useful if the conflict +pulled in a lot of unrelated context that you don't really need to care +about. + +For particularly nasty conflicts with many conflict markers, you can use +``git add`` or ``git add -i`` to selectively stage your resolutions to +get them out of the way; this also lets you use ``git diff HEAD`` to +always see what remains to be resolved or ``git diff --cached`` to see +what your patch looks like so far. + +Function arguments +~~~~~~~~~~~~~~~~~~ + +Pay attention to changing function arguments! It's easy to gloss over +details and think that two lines are the same but actually they differ +in some small detail like which variable was passed as an argument +(especially if the two variables are both a single character that look +the same, like i and j). + +Error handling +~~~~~~~~~~~~~~ + +If you cherry-pick a patch that includes a ``goto`` statement (typically +for error handling), it is absolutely imperative to double check that +the target label is still correct in the branch you are backporting to. +Error handling is typically located at the bottom of the function, so it +may not be part of the conflict even though could have been changed by +other patches. + +A good way to ensure that you review the error paths is to always use +``git diff -W`` and ``git show -W`` (AKA ``--function-context``) when +inspecting your changes. For C code, this will show you the whole +function that's being changed in a patch. One of the things that often +go wrong during backports is that something else in the function changed +on either of the branches that you're backporting from or to. By +including the whole function in the diff you get more context and can +more easily spot problems that might otherwise go unnoticed. + +Dealing with file renames +~~~~~~~~~~~~~~~~~~~~~~~~~ + +One of the most annoying things that can happen while backporting a +patch is discovering that one of the files being patched has been +renamed, as that typically means git won't even put in conflict markers, +but will just throw up its hands and say (paraphrased): "Unmerged path! +You do the work..." + +There are generally a few ways to deal with this. If the patch to the +renamed file is small, like a one-line change, the easiest thing is to +just go ahead and apply the change by hand and be done with it. On the +other hand, if the change is big or complicated, you definitely don't +want to do it by hand. + +Sometimes the right thing to do will be to also backport the patch that +did the rename, but that's definitely not the most common case. Instead, +what you can do is to temporarily rename the file in the branch you're +backporting to (using ``git mv`` and committing the result), restart the +attempt to cherry-pick the patch, rename the file back (``git mv`` and +committing again), and finally squash the result using ``git rebase -i`` +(see the `rebase tutorial`_) so it appears as a single commit when you +are done. + +.. _rebase tutorial: https://medium.com/@slamflipstrom/a-beginners-guide-to-squashing-commits-wi… + +Verifying the result +==================== + +colordiff +--------- + +Having committed a conflict-free new patch, you can now compare your +patch to the original patch. It is highly recommended that you use a +tool such as `colordiff`_ that can show two files side by side and color +them according to the changes between them:: + + colordiff -yw -W 200 <(git diff -W <upstream commit>^-) <(git diff -W HEAD^-) | less -SR + +.. _colordiff: https://www.colordiff.org/ + +Here, ``-y`` means to do a side-by-side comparison; ``-w`` ignores +whitespace, and ``-W 200`` sets the width of the output (as otherwise it +will use 130 by default, which is often a bit too little). + +The ``rev^-`` syntax is a handy shorthand for ``rev^..rev``, essentially +giving you just the diff for that single commit; also see +the official `git rev-parse documentation`_. + +.. _git rev-parse documentation: https://git-scm.com/docs/git-rev-parse#_other_rev_parent_shorthand_notations + +Again, note the inclusion of ``-W`` for ``git diff``; this ensures that +you will see the full function for any function that has changed. + +One incredibly important thing that colordiff does is to highlight lines +that are different. For example, if an error-handling ``goto`` has +changed labels between the original and backported patch, colordiff will +show these side-by-side but highlighted in a different color. Thus, it +is easy to see that the two ``goto`` statements are jumping to different +labels. Likewise, lines that were not modified by either patch but +differ in the context will also be highlighted and thus stand out during +a manual inspection. + +Of course, this is just a visual inspection; the real test is building +and running the patched kernel (or program). + +Build testing +------------- + +We won't cover runtime testing here, but it can be a good idea to build +just the files touched by the patch as a quick sanity check. For the +Linux kernel you can build single files like this, assuming you have the +``.config`` and build environment set up correctly:: + + make path/to/file.o + +Note that this won't discover linker errors, so you should still do a +full build after verifying that the single file compiles. By compiling +the single file first you can avoid having to wait for a full build *in +case* there are compiler errors in any of the files you've changed. + +Runtime testing +--------------- + +Even a successful build or boot test is not necessarily enough to rule +out a missing dependency somewhere. Even though the chances are small, +there could be code changes where two independent changes to the same +file result in no conflicts, no compile-time errors, and runtime errors +only in exceptional cases. + +One concrete example of this was a pair of patches to the system call +entry code where the first patch saved/restored a register and a later +patch made use of the same register somewhere in the middle of this +sequence. Since there was no overlap between the changes, one could +cherry-pick the second patch, have no conflicts, and believe that +everything was fine, when in fact the code was now scribbling over an +unsaved register. + +Although the vast majority of errors will be caught during compilation +or by superficially exercising the code, the only way to *really* verify +a backport is to review the final patch with the same level of scrutiny +as you would (or should) give to any other patch. Having unit tests and +regression tests or other types of automatic testing can help increase +the confidence in the correctness of a backport. + +Examples +======== + +The above shows roughly the idealized process of backporting a patch. +For a more concrete example, see this video tutorial where two patches +are backported from mainline to stable: +`Backporting Linux Kernel Patches`_. + +.. _Backporting Linux Kernel Patches: https://youtu.be/sBR7R1V2FeA diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst index b501cd977053f..13e522752f880 100644 --- a/Documentation/process/index.rst +++ b/Documentation/process/index.rst @@ -66,6 +66,7 @@ lack of a better place. :maxdepth: 1 applying-patches + backporting adding-syscalls magic-number volatile-considered-harmful -- 2.25.1

1 year, 3 months

5
8
0 0

+ x86-mm-drop-4mb-restriction-on-minimal-numa-node-size.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: x86/mm: drop 4MB restriction on minimal NUMA node size has been added to the -mm mm-hotfixes-unstable branch. Its filename is x86-mm-drop-4mb-restriction-on-minimal-numa-node-size.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Mike Rapoport (IBM)" <rppt(a)kernel.org> Subject: x86/mm: drop 4MB restriction on minimal NUMA node size Date: Tue, 17 Oct 2023 09:22:15 +0300 Qi Zheng reports crashes in a production environment and provides a simplified example as a reproducer: For example, if we use qemu to start a two NUMA node kernel, one of the nodes has 2M memory (less than NODE_MIN_SIZE), and the other node has 2G, then we will encounter the following panic: [ 0.149844] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 0.150783] #PF: supervisor write access in kernel mode [ 0.151488] #PF: error_code(0x0002) - not-present page <...> [ 0.156056] RIP: 0010:_raw_spin_lock_irqsave+0x22/0x40 <...> [ 0.169781] Call Trace: [ 0.170159] <TASK> [ 0.170448] deactivate_slab+0x187/0x3c0 [ 0.171031] ? bootstrap+0x1b/0x10e [ 0.171559] ? preempt_count_sub+0x9/0xa0 [ 0.172145] ? kmem_cache_alloc+0x12c/0x440 [ 0.172735] ? bootstrap+0x1b/0x10e [ 0.173236] bootstrap+0x6b/0x10e [ 0.173720] kmem_cache_init+0x10a/0x188 [ 0.174240] start_kernel+0x415/0x6ac [ 0.174738] secondary_startup_64_no_verify+0xe0/0xeb [ 0.175417] </TASK> [ 0.175713] Modules linked in: [ 0.176117] CR2: 0000000000000000 The crashes happen because of inconsistency between nodemask that has nodes with less than 4MB as memoryless and the actual memory fed into core mm. The commit 9391a3f9c7f1 ("[PATCH] x86_64: Clear more state when ignoring empty node in SRAT parsing") that introduced minimal size of a NUMA node does not explain why a node size cannot be less than 4MB and what boot failures this restriction might fix. Since then a lot has changed and core mm won't confuse badly about small node sizes. Drop the limitation for the minimal node size. Link: https://lkml.kernel.org/r/20231017062215.171670-1-rppt@kernel.org Signed-off-by: Mike Rapoport (IBM) <rppt(a)kernel.org> Reported-by: Qi Zheng <zhengqi.arch(a)bytedance.com> Closes: https://lore.kernel.org/all/20230212110305.93670-1-zhengqi.arch@bytedance.c… Acked-by: David Hildenbrand <david(a)redhat.com> Acked-by: Michal Hocko <mhocko(a)suse.com> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Borislav Petkov (AMD) <bp(a)alien8.de> Cc: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: H. Peter Anvin <hpa(a)zytor.com> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Peter Ziljstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- arch/x86/include/asm/numa.h | 7 ------- arch/x86/mm/numa.c | 7 ------- 2 files changed, 14 deletions(-) --- a/arch/x86/include/asm/numa.h~x86-mm-drop-4mb-restriction-on-minimal-numa-node-size +++ a/arch/x86/include/asm/numa.h @@ -12,13 +12,6 @@ #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) -/* - * Too small node sizes may confuse the VM badly. Usually they - * result from BIOS bugs. So dont recognize nodes as standalone - * NUMA entities that have less than this amount of RAM listed: - */ -#define NODE_MIN_SIZE (4*1024*1024) - extern int numa_off; /* --- a/arch/x86/mm/numa.c~x86-mm-drop-4mb-restriction-on-minimal-numa-node-size +++ a/arch/x86/mm/numa.c @@ -601,13 +601,6 @@ static int __init numa_register_memblks( if (start >= end) continue; - /* - * Don't confuse VM with a node that doesn't have the - * minimum amount of memory: - */ - if (end && (end - start) < NODE_MIN_SIZE) - continue; - alloc_node_data(nid); } _ Patches currently in -mm which might be from rppt(a)kernel.org are x86-mm-drop-4mb-restriction-on-minimal-numa-node-size.patch nios2-define-virtual-address-space-for-modules.patch mm-introduce-execmem_text_alloc-and-execmem_free.patch mm-execmem-arch-convert-simple-overrides-of-module_alloc-to-execmem.patch mm-execmem-arch-convert-remaining-overrides-of-module_alloc-to-execmem.patch modules-execmem-drop-module_alloc.patch mm-execmem-introduce-execmem_data_alloc.patch arm64-execmem-extend-execmem_params-for-generated-code-allocations.patch riscv-extend-execmem_params-for-generated-code-allocations.patch powerpc-extend-execmem_params-for-kprobes-allocations.patch powerpc-extend-execmem_params-for-kprobes-allocations-fix.patch arch-make-execmem-setup-available-regardless-of-config_modules.patch x86-ftrace-enable-dynamic-ftrace-without-config_modules.patch kprobes-remove-dependency-on-config_modules.patch bpf-remove-config_bpf_jit-dependency-on-config_modules-of.patch

1 year, 3 months

1
0
0 0

[PATCH] drm/amd/pm: Handle non-terminated overdrive commands.

by Bas Nieuwenhuizen

The incoming strings might not be terminated by a newline or a 0. (found while testing a program that just wrote the string itself, causing a crash) Cc: stable(a)vger.kernel.org Fixes: e3933f26b657 ("drm/amd/pp: Add edit/commit/show OD clock/voltage support in sysfs") Signed-off-by: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> --- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index da0da03569e8..f9c9eba1a815 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -760,7 +760,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, if (adev->in_suspend && !adev->in_runpm) return -EPERM; - if (count > 127) + if (count > 127 || count == 0) return -EINVAL; if (*buf == 's') @@ -780,7 +780,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, else return -EINVAL; - memcpy(buf_cpy, buf, count+1); + memcpy(buf_cpy, buf, count); + buf_cpy[count] = 0; tmp_str = buf_cpy; @@ -797,6 +798,9 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, return -EINVAL; parameter_size++; + if (!tmp_str) + break; + while (isspace(*tmp_str)) tmp_str++; } -- 2.42.0

1 year, 3 months

1
0
0 0

[PATCH 6.5 000/190] 6.5.8-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.5.8 release. There are 190 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 18 Oct 2023 18:48:18 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.8-rc2.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.5.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.5.8-rc2 Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fixed two speaker platform Amir Goldstein <amir73il(a)gmail.com> ovl: fix regression in showing lowerdir mount option Amir Goldstein <amir73il(a)gmail.com> ovl: make use of ->layers safe in rcu pathwalk Amir Goldstein <amir73il(a)gmail.com> ovl: fix regression in parsing of mount options with escaped comma Amir Goldstein <amir73il(a)gmail.com> fs: factor out vfs_parse_monolithic_sep() helper Matthew Wilcox (Oracle) <willy(a)infradead.org> fs: Fix kernel-doc warnings Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/64e: Fix wrong test in __ptep_test_and_clear_young() Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE Duoming Zhou <duoming(a)zju.edu.cn> dmaengine: mediatek: Fix deadlock caused by synchronize_irq() Rex Zhang <rex.zhang(a)intel.com> dmaengine: idxd: use spin_lock_irqsave before wait_event_lock_irq Linus Torvalds <torvalds(a)linux-foundation.org> Revert "x86/smp: Put CPUs into INIT on shutdown if possible" Javier Carrasco <javier.carrasco(a)wolfvision.net> usb: misc: onboard_hub: add support for Microchip USB2412 USB 2.0 hub Hui Liu <quic_huliu(a)quicinc.com> usb: typec: qcom: Update the logic of regulator enable and disable Pawel Laszczak <pawell(a)cadence.com> usb: cdnsp: Fixes issue with dequeuing not queued requests Krishna Kurapati <quic_kriskura(a)quicinc.com> usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call Piyush Mehta <piyush.mehta(a)amd.com> usb: gadget: udc-xilinx: replace memcpy with memcpy_toio Prashanth K <quic_prashk(a)quicinc.com> usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails RD Babiera <rdbabiera(a)google.com> usb: typec: altmodes/displayport: Signal hpd low when exiting mode Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: typec: ucsi: Fix missing link removal Jiexun Wang <wangjiexun(a)tinylab.org> RISC-V: Fix wrong use of CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK Song Shuai <songshuaishuai(a)tinylab.org> riscv: Remove duplicate objcopy flag Linu Cherian <lcherian(a)marvell.com> coresight: Fix run time warnings while reusing ETR buffer Dharma Balasubiramani <dharma.b(a)microchip.com> counter: microchip-tcb-capture: Fix the use of internal GCLK logic Fabrice Gasnier <fabrice.gasnier(a)foss.st.com> counter: chrdev: fix getting array extensions Björn Töpel <bjorn(a)rivosinc.com> riscv: Only consider swbp/ss handlers for correct privileged mode Peter Wang <peter.wang(a)mediatek.com> scsi: ufs: core: Correct clear TM error log Dmitry Torokhov <dmitry.torokhov(a)gmail.com> pinctrl: avoid unsafe code pattern in find_pinctrl() Christian König <christian.koenig(a)amd.com> dma-buf: add dma_fence_timestamp helper Michal Koutný <mkoutny(a)suse.com> cgroup: Remove duplicates in cgroup v1 tasks file Mario Limonciello <mario.limonciello(a)amd.com> usb: typec: ucsi: Use GET_CAPABILITY attributes data to set power supply scope Johan Hovold <johan+linaro(a)kernel.org> power: supply: qcom_battmgr: fix enable request endianness Sebastian Reichel <sebastian.reichel(a)collabora.com> power: supply: qcom_battmgr: fix battery_id type Miquel Raynal <miquel.raynal(a)bootlin.com> can: sja1000: Always restart the Tx queue after an overrun Yanguo Li <yanguo.li(a)corigine.com> nfp: flower: avoid rmmod nfp crash issues Sarthak Kukreti <sarthakkukreti(a)chromium.org> block: Don't invalidate pagecache for invalid falloc modes Jeremy Kerr <jk(a)codeconstruct.com.au> mctp: perform route lookups under a RCU read-side lock Rijo Thomas <Rijo-john.Thomas(a)amd.com> tee: amdtee: fix use-after-free vulnerability in amdtee_close_session Hans de Goede <hdegoede(a)redhat.com> Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case Max Nguyen <maxwell.nguyen(a)hp.com> Input: xpad - add HyperX Clutch Gladiate Support Szilard Fabian <szfabian(a)bluemarch.art> Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table Matthias Berndt <matthias_berndt(a)gmx.de> Input: xpad - add PXN V900 support Jeffery Miller <jefferymiller(a)google.com> Input: psmouse - fix fast_reconnect function for PS/2 mode Javier Carrasco <javier.carrasco.cruz(a)gmail.com> Input: powermate - fix use-after-free in powermate_config_complete Dan Carpenter <dan.carpenter(a)linaro.org> ceph: fix type promotion bug on 32bit systems Xiubo Li <xiubli(a)redhat.com> ceph: fix incorrect revoked caps assert in ceph_fill_file_size() Jordan Rife <jrife(a)google.com> libceph: use kernel_connect() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/47x: Fix 47x syscall return crash Athira Rajeev <atrajeev(a)linux.vnet.ibm.com> powerpc/pseries: Fix STK_PARAM access in the hcall tracing code Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Restart XDomain discovery handshake after failure Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Correct TMU mode initialization from hardware Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Check that lane 1 is in CL0 before enabling lane bonding Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Workaround an IOMMU fault on certain systems with Intel Maple Ridge Jorge Sanjuan Garcia <jorge.sanjuangarcia(a)duagon.com> mcb: remove is_added flag from mcb_device struct Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/alternatives: Disable KASAN in apply_alternatives() Borislav Petkov (AMD) <bp(a)alien8.de> x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs JP Kobryn <inwardvessel(a)gmail.com> perf/x86/lbr: Filter vsyscall addresses Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: not allow to open file if delelete on close bit is set Carlos Llamas <cmllamas(a)google.com> binder: fix memory leaks of spam and pending work Tony Lindgren <tony(a)atomide.com> serial: core: Fix checks for tx runtime PM state Tony Lindgren <tony(a)atomide.com> serial: 8250_omap: Fix errors with no_console_suspend Lukas Wunner <lukas(a)wunner.de> serial: Reduce spinlocked portion of uart_rs485_config() Hans de Goede <hdegoede(a)redhat.com> ACPI: EC: Add quirk for the HP Pavilion Gaming 15-dk1xxx Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Add TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q to irq1_edge_low_force_override[] Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA Zack Rusin <zackr(a)vmware.com> drm/vmwgfx: Keep a gem reference to user bos in surfaces Daniel Miess <daniel.miess(a)amd.com> drm/amd/display: Don't set dpms_off for seamless boot Christian König <christian.koenig(a)amd.com> drm/amdgpu: add missing NULL check Simon Ser <contact(a)emersion.fr> drm/atomic-helper: relax unregistered connector check Joey Gouly <joey.gouly(a)arm.com> drm/tiny: correctly print `struct resource *` on error Matthew Wilcox (Oracle) <willy(a)infradead.org> drm: Do not overrun array in drm_gem_get_pages() Macpaul Lin <macpaul.lin(a)mediatek.com> arm64: dts: mediatek: mt8195-demo: update and reorder reserved memory regions Macpaul Lin <macpaul.lin(a)mediatek.com> arm64: dts: mediatek: mt8195-demo: fix the memory size to 8GB Hans de Goede <hdegoede(a)redhat.com> media: subdev: Don't report V4L2_SUBDEV_CAP_STREAMS when the streams API is disabled Antoniu Miclaus <antoniu.miclaus(a)analog.com> iio: addac: Kconfig: update ad74413r selections Alisa-Dariana Roman <alisa.roman(a)analog.com> iio: adc: ad7192: Correct reference voltage Alexander Zangerl <az(a)breathe-safe.com> iio: pressure: ms5611: ms5611_prom_is_valid false negative bug Lakshmi Yadlapati <lakshmiy(a)us.ibm.com> iio: pressure: dps310: Adjust Timeout Settings Antoniu Miclaus <antoniu.miclaus(a)analog.com> iio: admv1013: add mixer_vgate corner cases Marcelo Schmitt <marcelo.schmitt1(a)gmail.com> iio: dac: ad3552r: Correct device IDs Philipp Rossak <embed3d(a)gmail.com> iio: adc: imx8qxp: Fix address for command buffer registers Tzung-Bi Shih <tzungbi(a)kernel.org> iio: cros_ec: fix an use-after-free in cros_ec_sensors_push_data() Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio: imu: bno055: Fix missing Kconfig dependencies Phil Elwell <phil(a)raspberrypi.com> iio: pressure: bmp280: Fix NULL pointer exception Xingxing Luo <xingxing.luo(a)unisoc.com> usb: musb: Modify the "HWVers" register address Xingxing Luo <xingxing.luo(a)unisoc.com> usb: musb: Get the musb_qh poniter after musb_giveback Ricardo Cañuelo <ricardo.canuelo(a)collabora.com> usb: hub: Guard against accesses to uninitialized BOS descriptors Xiaolei Wang <xiaolei.wang(a)windriver.com> usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: Soft reset phy on probe for host Javier Carrasco <javier.carrasco.cruz(a)gmail.com> net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read Lukas Wunner <lukas(a)wunner.de> xhci: Preserve RsvdP bits in ERSTBA register correctly Lukas Wunner <lukas(a)wunner.de> xhci: Clear EHB bit only at end of interrupt handler Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: track port suspend state correctly in unsuccessful resume cases Wesley Cheng <quic_wcheng(a)quicinc.com> usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-mdma: set in_flight_bytes in case CRQA flag is set Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-mdma: use Link Address Register to compute residue Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-dma: fix residue in case of MDMA chaining Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-dma: fix stm32_dma_prep_slave_sg in case of MDMA chaining Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-mdma: abort resume if no ongoing transfer Amir Goldstein <amir73il(a)gmail.com> ovl: temporarily disable appending lowedirs Andy Chiu <andy.chiu(a)sifive.com> riscv: signal: fix sigaltstack frame size checking Waiman Long <longman(a)redhat.com> workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask() Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> rswitch: Fix imbalance phy_power_off() calling Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> rswitch: Fix renesas_eth_sw_remove() implementation Ratheesh Kannoth <rkannoth(a)marvell.com> octeontx2-pf: Fix page pool frag allocation warning Jeremy Cline <jeremy(a)jcline.org> nfc: nci: assert requested protocol is valid Kuniyuki Iwashima <kuniyu(a)amazon.com> af_packet: Fix fortified memcpy() without flex array. Ralph Siemsen <ralph.siemsen(a)linaro.org> pinctrl: renesas: rzn1: Enable missing PINMUX Jakub Kicinski <kuba(a)kernel.org> net: tcp: fix crashes trying to free half-baked MTU probes Nils Hoppmann <niho(a)linux.ibm.com> net/smc: Fix pos miscalculation in statistics Kory Maincent <kory.maincent(a)bootlin.com> ethtool: Fix mod state of verbose no_mask bitset Eric Dumazet <edumazet(a)google.com> net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn() Ilya Leoshkevich <iii(a)linux.ibm.com> s390/bpf: Fix unwinding past the trampoline Ilya Leoshkevich <iii(a)linux.ibm.com> s390/bpf: Fix clobbering the caller's backchain in the trampoline Will Mortensen <will(a)extrahop.com> net/mlx5e: Again mutually exclude RX-FCS and RX-port-timestamp Gerd Bayer <gbayer(a)linux.ibm.com> net/smc: Fix dependency of SMC on ISM Dan Carpenter <dan.carpenter(a)linaro.org> ixgbe: fix crash with empty VF macvlan list Ruihai Zhou <zhouruihai(a)huaqin.corp-partner.google.com> drm/panel: boe-tv101wum-nl6: Completely pull GPW to VGL before TP term Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> net/mlx5e: macsec: use update_pn flag instead of PN comparation Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: phy: mscc: macsec: reject PN update requests Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: macsec: indicate next pn update when offloading Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> octeontx2-pf: mcs: update PN only when update_pn is true Eric Dumazet <edumazet(a)google.com> net: refine debug info in skb_checksum_help() David Vernet <void(a)manifault.com> bpf: Fix verifier log for async callback return values Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> drm/vmwgfx: fix typo of sizeof argument Andrew Kanner <andrew.kanner(a)gmail.com> xdp: Fix zero-size allocation warning in xskq_create() Björn Töpel <bjorn(a)rivosinc.com> riscv, bpf: Track both a0 (RISC-V ABI) and a5 (BPF) return values Björn Töpel <bjorn(a)rivosinc.com> riscv, bpf: Sign-extend return values Roger Pau Monne <roger.pau(a)citrix.com> xen-netback: use default TX queue size for vifs Dan Carpenter <dan.carpenter(a)linaro.org> mlxsw: fix mlxsw_sp2_nve_vxlan_learning_set() return type Dinghao Liu <dinghao.liu(a)zju.edu.cn> ieee802154: ca8210: Fix a potential UAF in ca8210_probe Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix use-after-free issue in ravb_tx_timeout_work() Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix up dma_free_coherent() call in ravb_remove() Moshe Shemesh <moshe(a)nvidia.com> devlink: Hold devlink lock on health reporter dump get Nícolas F. R. A. Prado <nfraprado(a)collabora.com> arm64: dts: mediatek: mt8195: Set DSU PMU status to fail Eugen Hristev <eugen.hristev(a)collabora.com> arm64: dts: mediatek: fix t-phy unit name John Watts <contact(a)jookia.org> can: sun4i_can: Only show Kconfig if ARCH_SUNXI is set Lukas Magel <lukas.magel(a)posteo.net> can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior Marek Behún <kabel(a)kernel.org> net: dsa: qca8k: fix potential MDIO bus conflict when accessing internal PHYs via management frames Marek Behún <kabel(a)kernel.org> net: dsa: qca8k: fix regmap bulk read/write methods on big endian systems Vladimir Oltean <vladimir.oltean(a)nxp.com> phy: lynx-28g: serialize concurrent phy_set_mode_ext() calls to shared registers Vladimir Oltean <vladimir.oltean(a)nxp.com> phy: lynx-28g: lock PHY while performing CDR lock workaround Ioana Ciornei <ioana.ciornei(a)nxp.com> phy: lynx-28g: cancel the CDR check work item on the remove path Abhinav Kumar <quic_abhinavk(a)quicinc.com> drm/msm/dpu: fail dpu_plane_atomic_check() based on mdp clk limits Stephen Boyd <swboyd(a)chromium.org> drm/msm/dp: Add newlines to debug printks Abhinav Kumar <quic_abhinavk(a)quicinc.com> drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow Dan Carpenter <dan.carpenter(a)linaro.org> drm/msm/dsi: fix irq_of_parse_and_map() error checking Abhinav Kumar <quic_abhinavk(a)quicinc.com> drm/msm/dsi: skip the wait for video mode done if not applicable Kuogee Hsieh <quic_khsieh(a)quicinc.com> drm/msm/dp: do not reinitialize phy unless retry during link training Hal Feng <hal.feng(a)starfivetech.com> pinctrl: starfive: jh7110: Fix failure to set irq after CONFIG_PM is enabled Mikhail Kobuk <m.kobuk(a)ispras.ru> pinctrl: nuvoton: wpcm450: fix out of bounds write Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - ALC287 I2S speaker platform support Fabian Vogt <fabian(a)ritter-vogt.de> ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx SungHwan Jung <onenowy(a)gmail.com> ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute LED Balamurugan C <balamurugan.c(a)intel.com> ASoC: Intel: soc-acpi: Add entry for sof_es8336 in MTL match table. Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: Intel: sof_sdw: add support for SKU 0B14 Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_sai: Don't disable bitclock for i.MX8MP Balamurugan C <balamurugan.c(a)intel.com> ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in MTL match table Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: Intel: soc-acpi: fix Dell SKU 0B34 Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: simple-card-utils: fixup simple_util_startup() error handling Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> ASoC: SOF: amd: fix for firmware reload failure after playback Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek: Change model for Intel RVP board Stefan Binding <sbinding(a)opensource.cirrus.com> ALSA: hda: cs35l41: Cleanup and fix double free in firmware request Christos Skevis <xristos.thes(a)gmail.com> ALSA: usb-audio: Fix microphone sound on Nexigo webcam. WhaleChang <whalechang(a)google.com> ALSA: usb-audio: Fix microphone sound on Opencomm2 Headset Sumit Garg <sumit.garg(a)linaro.org> KEYS: trusted: Remove redundant static calls usage Biju Das <biju.das.jz(a)bp.renesas.com> irqchip: renesas-rzg2l: Fix logic to clear TINT interrupt source Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> dt-bindings: interrupt-controller: renesas,rzg2l-irqc: Update description for '#interrupt-cells' property Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: sm8150: extend the size of the PDC resource Jordan Rife <jrife(a)google.com> net: prevent address rewrite in kernel_bind() Damien Le Moal <dlemoal(a)kernel.org> ata: libata-scsi: Disable scsi device manage_system_start_stop Matthias Reichl <hias(a)horus.com> ASoC: hdmi-codec: Fix broken channel map reporting Sven Frotscher <sven.frotscher(a)gmail.com> ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM Herbert Xu <herbert(a)gondor.apana.org.au> dm crypt: Fix reqsize in crypt_iv_eboiv_gen Jan Kara <jack(a)suse.cz> quota: Fix slow quotaoff Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect Ondrej Zary <linux(a)zary.sk> ata: pata_parport: implement set_devctl Ondrej Zary <linux(a)zary.sk> ata: pata_parport: fix pata_parport_devchk Damien Le Moal <dlemoal(a)kernel.org> scsi: Do not rescan devices with a suspended queue Samson Tam <samson.tam(a)amd.com> drm/amd/display: apply edge-case DISPCLK WDIVIDER changes to master OTG pipes only Wenjing Liu <wenjing.liu(a)amd.com> drm/amd/display: implement pipe type definition and adding accessors Fabio Estevam <festevam(a)denx.de> media: dt-bindings: imx7-csi: Make power-domains not required for imx8mq Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent section mismatch warning Luben Tuikov <luben.tuikov(a)amd.com> drm/amdgpu: Fix a memory leak Oza Pawandeep <quic_poza(a)quicinc.com> cpuidle, ACPI: Evaluate LPI arch_flags for broadcast timer Mathias Krause <minipli(a)grsecurity.net> drm/i915: Register engines early to avoid type confusion Armin Wolf <W_Armin(a)gmx.de> platform/x86: think-lmi: Fix reference leak Jing Zhang <renyu.zj(a)linux.alibaba.com> perf/arm-cmn: Fix the unhandled overflow status of counter 4 to 7 Artem Chernyshev <artem.chernyshev(a)red-soft.ru> RDMA/cxgb4: Check skb value for failure to allocate Remi Pommarel <repk(a)triplefau.lt> net: stmmac: remove unneeded stmmac_poll_controller ------------- Diffstat: .../interrupt-controller/renesas,rzg2l-irqc.yaml | 5 +- .../devicetree/bindings/media/nxp,imx7-csi.yaml | 1 - Documentation/filesystems/overlayfs.rst | 12 ++ Makefile | 4 +- arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 39 +++++-- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1 + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- arch/arm64/include/asm/acpi.h | 20 ++++ arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 ++ arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/nohash/pgtable.h | 2 + arch/powerpc/kernel/entry_32.S | 8 +- arch/powerpc/platforms/pseries/hvCall.S | 4 +- arch/riscv/Makefile | 1 - arch/riscv/include/asm/kprobes.h | 11 +- arch/riscv/include/asm/uprobes.h | 13 ++- arch/riscv/kernel/irq.c | 4 +- arch/riscv/kernel/signal.c | 7 -- arch/riscv/kernel/traps.c | 28 +++-- arch/riscv/net/bpf_jit_comp64.c | 18 ++- arch/s390/net/bpf_jit_comp.c | 25 +++- arch/x86/events/utils.c | 5 +- arch/x86/include/asm/msr-index.h | 9 +- arch/x86/include/asm/smp.h | 2 - arch/x86/kernel/alternative.c | 13 +++ arch/x86/kernel/cpu/amd.c | 8 ++ arch/x86/kernel/smp.c | 39 ++----- arch/x86/kernel/smpboot.c | 27 ----- block/fops.c | 21 +++- drivers/acpi/ec.c | 11 ++ drivers/acpi/processor_idle.c | 3 +- drivers/acpi/resource.c | 26 ++++- drivers/android/binder.c | 2 + drivers/ata/libata-core.c | 90 +++++++++++++++ drivers/ata/libata-eh.c | 54 ++++++++- drivers/ata/libata-scsi.c | 16 ++- drivers/ata/libata.h | 2 + drivers/ata/pata_parport/pata_parport.c | 10 +- drivers/counter/counter-chrdev.c | 4 +- drivers/counter/microchip-tcb-capture.c | 2 +- drivers/dma-buf/dma-fence-unwrap.c | 13 +-- drivers/dma-buf/sync_file.c | 9 +- drivers/dma/idxd/device.c | 5 +- drivers/dma/mediatek/mtk-uart-apdma.c | 3 +- drivers/dma/stm32-dma.c | 11 +- drivers/dma/stm32-mdma.c | 33 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 4 +- .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 35 ++++++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 106 +++++++++++++++++ drivers/gpu/drm/drm_atomic_helper.c | 17 ++- drivers/gpu/drm/drm_gem.c | 6 +- drivers/gpu/drm/i915/i915_gem.c | 9 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 27 +++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +-- drivers/gpu/drm/msm/dp/dp_link.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 19 +++- drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +- drivers/gpu/drm/scheduler/sched_main.c | 2 +- drivers/gpu/drm/tiny/simpledrm.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 17 ++- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 18 ++- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 31 ++--- drivers/hid/hid-logitech-hidpp.c | 3 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 24 ++-- drivers/iio/adc/ad7192.c | 29 ++++- drivers/iio/adc/imx8qxp-adc.c | 4 +- drivers/iio/addac/Kconfig | 2 + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 6 +- drivers/iio/dac/ad3552r.c | 4 +- drivers/iio/frequency/admv1013.c | 4 +- drivers/iio/imu/bno055/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 2 +- drivers/iio/pressure/dps310.c | 8 +- drivers/iio/pressure/ms5611_core.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 3 + drivers/input/joystick/xpad.c | 4 + drivers/input/misc/powermate.c | 1 + drivers/input/mouse/elantech.c | 1 + drivers/input/mouse/synaptics.c | 1 + drivers/input/serio/i8042-acpipnpio.h | 8 ++ drivers/input/touchscreen/goodix.c | 19 ++++ drivers/irqchip/irq-renesas-rzg2l.c | 2 +- drivers/mcb/mcb-core.c | 10 +- drivers/mcb/mcb-parse.c | 2 - drivers/md/dm-crypt.c | 3 +- drivers/media/v4l2-core/v4l2-subdev.c | 7 ++ drivers/net/can/Kconfig | 2 +- drivers/net/can/sja1000/sja1000.c | 8 +- drivers/net/dsa/qca/qca8k-8xxx.c | 15 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +- .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 13 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 4 +- drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 10 +- .../net/ethernet/netronome/nfp/flower/conntrack.c | 19 +++- drivers/net/ethernet/netronome/nfp/flower/main.h | 2 + .../net/ethernet/netronome/nfp/flower/metadata.c | 2 + .../net/ethernet/netronome/nfp/flower/offload.c | 24 +++- .../net/ethernet/netronome/nfp/flower/qos_conf.c | 20 ++-- drivers/net/ethernet/renesas/ravb_main.c | 6 +- drivers/net/ethernet/renesas/rswitch.c | 12 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 30 ----- drivers/net/ieee802154/ca8210.c | 17 +-- drivers/net/macsec.c | 2 + drivers/net/phy/mscc/mscc_macsec.c | 6 + drivers/net/usb/dm9601.c | 7 +- drivers/net/xen-netback/interface.c | 4 - drivers/perf/arm-cmn.c | 2 +- drivers/phy/freescale/phy-fsl-lynx-28g.c | 27 ++++- drivers/pinctrl/core.c | 16 +-- drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 6 +- drivers/pinctrl/renesas/Kconfig | 1 + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 - drivers/platform/x86/hp/hp-wmi.c | 8 +- drivers/platform/x86/think-lmi.c | 24 +++- drivers/power/supply/qcom_battmgr.c | 8 +- drivers/s390/net/Kconfig | 2 +- drivers/scsi/scsi_scan.c | 11 +- drivers/tee/amdtee/core.c | 10 +- drivers/thunderbolt/icm.c | 40 +++---- drivers/thunderbolt/switch.c | 7 ++ drivers/thunderbolt/tmu.c | 2 +- drivers/thunderbolt/xdomain.c | 58 +++++++--- drivers/tty/serial/8250/8250_omap.c | 25 ++-- drivers/tty/serial/serial_core.c | 15 ++- drivers/ufs/core/ufshcd.c | 2 +- drivers/usb/cdns3/cdnsp-gadget.c | 3 + drivers/usb/cdns3/core.h | 3 +- drivers/usb/core/hub.c | 25 +++- drivers/usb/core/hub.h | 2 +- drivers/usb/dwc3/core.c | 39 ++++++- drivers/usb/gadget/function/f_ncm.c | 26 +++-- drivers/usb/gadget/udc/udc-xilinx.c | 20 ++-- drivers/usb/host/xhci-hub.c | 19 ++-- drivers/usb/host/xhci-mem.c | 4 +- drivers/usb/host/xhci-ring.c | 16 +-- drivers/usb/host/xhci.h | 2 +- drivers/usb/misc/onboard_usb_hub.c | 1 + drivers/usb/misc/onboard_usb_hub.h | 1 + drivers/usb/musb/musb_debugfs.c | 2 +- drivers/usb/musb/musb_host.c | 9 +- drivers/usb/typec/altmodes/displayport.c | 5 + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 12 +- drivers/usb/typec/ucsi/psy.c | 9 ++ drivers/usb/typec/ucsi/ucsi.c | 2 + fs/ceph/file.c | 2 +- fs/ceph/inode.c | 4 +- fs/file.c | 3 +- fs/fs_context.c | 46 ++++++-- fs/ioctl.c | 10 +- fs/kernel_read_file.c | 12 +- fs/namei.c | 3 + fs/open.c | 4 +- fs/overlayfs/ovl_entry.h | 10 +- fs/overlayfs/params.c | 126 ++++++++++----------- fs/overlayfs/super.c | 18 +-- fs/quota/dquot.c | 66 ++++++----- fs/smb/server/vfs_cache.c | 4 +- include/linux/acpi.h | 9 ++ include/linux/dma-fence.h | 19 ++++ include/linux/fs_context.h | 2 + include/linux/libata.h | 6 +- include/linux/mcb.h | 1 - include/linux/quota.h | 4 +- include/linux/quotaops.h | 2 +- include/net/macsec.h | 1 + include/uapi/linux/if_packet.h | 6 +- kernel/bpf/verifier.c | 6 +- kernel/cgroup/cgroup-v1.c | 5 +- kernel/workqueue.c | 8 +- net/can/isotp.c | 19 ++-- net/ceph/messenger.c | 4 +- net/core/dev.c | 8 +- net/devlink/health.c | 30 ++--- net/ethtool/bitset.c | 32 +++++- net/ipv4/tcp_output.c | 1 + net/mctp/route.c | 22 +++- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/nfc/llcp_core.c | 30 ++--- net/nfc/nci/core.c | 5 + net/packet/af_packet.c | 7 +- net/rds/tcp_connect.c | 2 +- net/rds/tcp_listen.c | 2 +- net/smc/Kconfig | 1 + net/smc/smc_stats.h | 14 ++- net/socket.c | 6 +- net/xdp/xsk_queue.c | 10 ++ security/keys/trusted-keys/trusted_core.c | 13 +-- sound/pci/hda/cs35l41_hda.c | 115 +++++++++++++------ sound/pci/hda/patch_realtek.c | 89 +++++++++++++-- sound/soc/amd/yc/acp6x-mach.c | 7 ++ sound/soc/codecs/hdmi-codec.c | 5 +- sound/soc/fsl/fsl_sai.c | 9 +- sound/soc/generic/simple-card-utils.c | 3 +- sound/soc/intel/boards/sof_es8336.c | 10 ++ sound/soc/intel/boards/sof_sdw.c | 10 ++ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 12 +- sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 25 ++++ sound/soc/sof/amd/pci-rmb.c | 1 - sound/usb/mixer.c | 7 ++ sound/usb/quirks.c | 8 +- 217 files changed, 1897 insertions(+), 837 deletions(-)

1 year, 3 months

7
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023