ARM: dts: imx: Fix pca9547 i2c-mux node name
Subsystems (5)
Sasha Levin
maintainerPATCH 1/6 ARM: dts: imx: Fix pca9547 i2c-mux node name
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit f78985f9f58380eec37f82c8a2c765aa7670fc29 ]
"make dtbs_check":
arch/arm/boot/dts/imx53-ppd.dtb: i2c-switch@70: $nodename:0: 'i2c-switch@70' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm/boot/dts/imx53-ppd.dtb: i2c-switch@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3', 'i2c@4', 'i2c@5', 'i2c@6', 'i2c@7' were unexpected)
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
Fix this by renaming the PCA9547 node to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification.
--- arch/arm/boot/dts/imx53-ppd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx53-ppd.dts +1 -1
@@ -461,7 +461,7 @@ &i2c1 { scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; status = "okay"; - i2c-switch@70 { + i2c-mux@70 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 2/6 bpf: Skip task with pid=1 in send_signal_common()
From: Hao Sun <[email protected]>
[ Upstream commit a3d81bc1eaef48e34dd0b9b48eefed9e02a06451 ]
The following kernel panic can be triggered when a task with pid=1 attaches a prog that attempts to send killing signal to itself, also see [1] for more details:
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b CPU: 3 PID: 1 Comm: systemd Not tainted 6.1.0-09652-g59fe41b5255f #148 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x100/0x178 lib/dump_stack.c:106 panic+0x2c4/0x60f kernel/panic.c:275 do_exit.cold+0x63/0xe4 kernel/exit.c:789 do_group_exit+0xd4/0x2a0 kernel/exit.c:950 get_signal+0x2460/0x2600 kernel/signal.c:2858 arch_do_signal_or_restart+0x78/0x5d0 arch/x86/kernel/signal.c:306 exit_to_user_mode_loop kernel/entry/common.c:168 [inline] exit_to_user_mode_prepare+0x15f/0x250 kernel/entry/common.c:203 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x1d/0x50 kernel/entry/common.c:296 do_syscall_64+0x44/0xb0 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x63/0xcd
So skip task with pid=1 in bpf_send_signal_common() to avoid the panic.
[1] https://lore.kernel.org/bpf/[email protected]
--- kernel/trace/bpf_trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/bpf_trace.c +3 -0
@@ -649,6 +649,9 @@ BPF_CALL_1(bpf_send_signal, u32, sig)return -EPERM ;if (unlikely (!nmi_uaccess_okay ()))return -EPERM ; +/* Task should not be pid=1 to avoid kernel panic. */ +if (unlikely (is_global_init (current))) +return -EPERM ;if (irqs_disabled ()) {/* Do an early check on signal validity. Otherwise,
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 3/6 init/Kconfig: fix LOCALVERSION_AUTO help text
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 0f9c608d4a1eb852d6769d2fc5906c71c02565ae ]
It was never guaranteed to be exactly eight, but since commit 548b8b5168c9 ("scripts/setlocalversion: make git describe output more reliable"), it has been exactly 12.
--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
@@ -134,7 +134,7 @@ config LOCALVERSION_AUTO appended after any matching localversion* files, and after the value set in CONFIG_LOCALVERSION. - (The actual string used here is the first eight characters produced + (The actual string used here is the first 12 characters produced by running the command: $ git rev-parse --verify HEAD
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 4/6 blk-cgroup: fix missing pd_online_fn() while activating policy
In reply to Sasha LevinFrom: Yu Kuai <[email protected]>
[ Upstream commit e3ff8887e7db757360f97634e0d6f4b8e27a8c46 ]
If the policy defines pd_online_fn(), it should be called after pd_init_fn(), like blkg_create().
--- block/blk-cgroup.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-cgroup.c +4 -0
@@ -1445,6 +1445,10 @@ int blkcg_activate_policy(struct request_queue *q,list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) pol->pd_init_fn (blkg->pd[pol->plid]); +if (pol->pd_online_fn) +list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) + pol->pd_online_fn (blkg->pd[pol->plid]); +__set_bit (pol->plid, q->blkcg_pols); ret =0 ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 5/6 dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
In reply to Sasha LevinFrom: Hui Wang <[email protected]>
[ Upstream commit 1417f59ac0b02130ee56c0c50794b9b257be3d17 ]
If the function sdma_load_context() fails, the sdma_desc will be freed, but the allocated desc->bd is forgot to be freed.
We already met the sdma_load_context() failure case and the log as below:
[ 450.699064] imx-sdma 30bd0000.dma-controller: Timeout waiting for CH0 ready
...
In this case, the desc->bd will not be freed without this change.
--- drivers/dma/imx-sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/imx-sdma.c +3 -1
@@ -1360,10 +1360,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,sdma_config_ownership (sdmac, false, true, false);if (sdma_load_context (sdmac)) - goto err_desc_out; + goto err_bd_out;return desc; +err_bd_out: +sdma_free_bd (desc); err_desc_out:kfree (desc); err_out:
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 6/6 ext4: deal with legacy signed xattr name hash values
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit f3bbac32475b27f49be201f896d98d4009de1562 ]
We potentially have old hashes of the xattr names generated on systems with signed 'char' types. Now that everybody uses '-funsigned-char', those hashes will no longer match.
This only happens if you use xattrs names that have the high bit set, which probably doesn't happen in practice, but the xfstest generic/454 shows it.
Instead of adding a new "signed xattr hash filesystem" bit and having to deal with all the possible combinations, just calculate the hash both ways if the first one fails, and always generate new hashes with the proper unsigned char version.
--- fs/ext4/xattr.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
fs/ext4/xattr.c +39 -2
@@ -81,6 +81,8 @@ ext4_xattr_block_cache_find(struct inode *, struct ext4_xattr_header *, struct mb_cache_entry **);static __le32 ext4_xattr_hash_entry (char *name,size_t name_len,__le32 *value,size_t value_count); +static __le32 ext4_xattr_hash_entry_signed (char *name,size_t name_len,__le32 *value, +size_t value_count);static void ext4_xattr_rehash (struct ext4_xattr_header *);static const struct xattr_handler *const ext4_xattr_handler_map[] = {
@@ -468,8 +470,21 @@ ext4_xattr_inode_verify_hashes(struct inode *ea_inode, tmp_data =cpu_to_le32 (hash); e_hash =ext4_xattr_hash_entry (entry->e_name, entry->e_name_len, &tmp_data,1 ); -if (e_hash != entry->e_hash) -return -EFSCORRUPTED ; +/* All good? */ +if (e_hash == entry->e_hash) +return 0 ; + +/* +* Not good. Maybe the entry hash was calculated +* using the buggy signed char version? +*/ + e_hash =ext4_xattr_hash_entry_signed (entry->e_name, entry->e_name_len, + &tmp_data,1 ); +if (e_hash == entry->e_hash) +return 0 ; + +/* Still no match - bad */ +return -EFSCORRUPTED ; }return 0 ; }
@@ -3117,6 +3132,28 @@ static __le32 ext4_xattr_hash_entry(char *name, size_t name_len, __le32 *value,return cpu_to_le32 (hash); } +/* +* ext4_xattr_hash_entry_signed() +* +* Compute the hash of an extended attribute incorrectly. +*/ +static __le32 ext4_xattr_hash_entry_signed (char *name,size_t name_len,__le32 *value,size_t value_count) +{ +__u32 hash =0 ; + +while (name_len--) { + hash = (hash <<NAME_HASH_SHIFT ) ^ + (hash >> (8 *sizeof (hash) -NAME_HASH_SHIFT )) ^ + (signed char )*name++; + } +while (value_count--) { + hash = (hash <<VALUE_HASH_SHIFT ) ^ + (hash >> (8 *sizeof (hash) -VALUE_HASH_SHIFT )) ^ +le32_to_cpu (*value++); + } +return cpu_to_le32 (hash); +} +#undef NAME_HASH_SHIFT#undef VALUE_HASH_SHIFT
Signature · 1 line
2.39.0