From: Greg Kroah-Hartman Date: Mon, 5 May 2025 13:12:07 +0000 (+0200) Subject: 6.14-stable patches X-Git-Tag: v5.15.182~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4161a8acb7f79eda8a926c18b1c1847abd95de9;p=thirdparty%2Fkernel%2Fstable-queue.git 6.14-stable patches added patches: asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch --- diff --git a/queue-6.14/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch b/queue-6.14/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch new file mode 100644 index 0000000000..5219300e45 --- /dev/null +++ b/queue-6.14/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch @@ -0,0 +1,95 @@ +From 6eab7034579917f207ca6d8e3f4e11e85e0ab7d5 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Wed, 22 Jan 2025 09:21:27 +0100 +Subject: ASoC: soc-core: Stop using of_property_read_bool() for non-boolean properties + +From: Geert Uytterhoeven + +commit 6eab7034579917f207ca6d8e3f4e11e85e0ab7d5 upstream. + +On R-Car: + + OF: /sound: Read of boolean property 'simple-audio-card,bitclock-master' with a value. + OF: /sound: Read of boolean property 'simple-audio-card,frame-master' with a value. + +or: + + OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'bitclock-master' with a value. + OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'frame-master' with a value. + +The use of of_property_read_bool() for non-boolean properties is +deprecated in favor of of_property_present() when testing for property +presence. + +Replace testing for presence before calling of_property_read_u32() by +testing for an -EINVAL return value from the latter, to simplify the +code. + +Signed-off-by: Geert Uytterhoeven +Link: https://patch.msgid.link/db10e96fbda121e7456d70e97a013cbfc9755f4d.1737533954.git.geert+renesas@glider.be +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/soc-core.c | 32 +++++++++++++------------------- + 1 file changed, 13 insertions(+), 19 deletions(-) + +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -3046,7 +3046,7 @@ int snd_soc_of_parse_pin_switches(struct + unsigned int i, nb_controls; + int ret; + +- if (!of_property_read_bool(dev->of_node, prop)) ++ if (!of_property_present(dev->of_node, prop)) + return 0; + + strings = devm_kcalloc(dev, nb_controls_max, +@@ -3120,23 +3120,17 @@ int snd_soc_of_parse_tdm_slot(struct dev + if (rx_mask) + snd_soc_of_get_slot_mask(np, "dai-tdm-slot-rx-mask", rx_mask); + +- if (of_property_read_bool(np, "dai-tdm-slot-num")) { +- ret = of_property_read_u32(np, "dai-tdm-slot-num", &val); +- if (ret) +- return ret; +- +- if (slots) +- *slots = val; +- } +- +- if (of_property_read_bool(np, "dai-tdm-slot-width")) { +- ret = of_property_read_u32(np, "dai-tdm-slot-width", &val); +- if (ret) +- return ret; ++ ret = of_property_read_u32(np, "dai-tdm-slot-num", &val); ++ if (ret && ret != -EINVAL) ++ return ret; ++ if (!ret && slots) ++ *slots = val; + +- if (slot_width) +- *slot_width = val; +- } ++ ret = of_property_read_u32(np, "dai-tdm-slot-width", &val); ++ if (ret && ret != -EINVAL) ++ return ret; ++ if (!ret && slot_width) ++ *slot_width = val; + + return 0; + } +@@ -3403,12 +3397,12 @@ unsigned int snd_soc_daifmt_parse_clock_ + * check "[prefix]frame-master" + */ + snprintf(prop, sizeof(prop), "%sbitclock-master", prefix); +- bit = of_property_read_bool(np, prop); ++ bit = of_property_present(np, prop); + if (bit && bitclkmaster) + *bitclkmaster = of_parse_phandle(np, prop, 0); + + snprintf(prop, sizeof(prop), "%sframe-master", prefix); +- frame = of_property_read_bool(np, prop); ++ frame = of_property_present(np, prop); + if (frame && framemaster) + *framemaster = of_parse_phandle(np, prop, 0); + diff --git a/queue-6.14/bcachefs-bch2_ioctl_subvolume_destroy-fixes.patch b/queue-6.14/bcachefs-bch2_ioctl_subvolume_destroy-fixes.patch deleted file mode 100644 index 232031508a..0000000000 --- a/queue-6.14/bcachefs-bch2_ioctl_subvolume_destroy-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 02a22be3c0003af08df510cba3d79d00c6495b74 Mon Sep 17 00:00:00 2001 -From: Kent Overstreet -Date: Sat, 29 Mar 2025 19:01:09 -0400 -Subject: bcachefs: bch2_ioctl_subvolume_destroy() fixes - -From: Kent Overstreet - -[ Upstream commit 707549600c4a012ed71c0204a7992a679880bf33 ] - -bch2_evict_subvolume_inodes() was getting stuck - due to incorrectly -pruning the dcache. - -Also, fix missing permissions checks. - -Reported-by: Alexander Viro -Signed-off-by: Kent Overstreet -Signed-off-by: Greg Kroah-Hartman ---- - fs/bcachefs/fs-ioctl.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c -index 15725b4ce393..4d6193820483 100644 ---- a/fs/bcachefs/fs-ioctl.c -+++ b/fs/bcachefs/fs-ioctl.c -@@ -515,10 +515,12 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp, - ret = -ENOENT; - goto err; - } -- ret = __bch2_unlink(dir, victim, true); -+ -+ ret = inode_permission(file_mnt_idmap(filp), d_inode(victim), MAY_WRITE) ?: -+ __bch2_unlink(dir, victim, true); - if (!ret) { - fsnotify_rmdir(dir, victim); -- d_delete(victim); -+ d_invalidate(victim); - } - err: - inode_unlock(dir); --- -2.49.0 - diff --git a/queue-6.14/series b/queue-6.14/series index 874477f1ef..cb72db838b 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -46,4 +46,4 @@ cpufreq-fix-setting-policy-limits-when-frequency-tables-are-used.patch tracing-fix-oob-write-in-trace_seq_to_buffer.patch bcachefs-remove-incorrect-__counted_by-annotation.patch drm-amd-display-default-ips-to-rcg_in_active_ips2_in_off.patch -bcachefs-bch2_ioctl_subvolume_destroy-fixes.patch +asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch