ARM: dts: imx: Fix pca9547 i2c-mux node name
Subsystems (9)
Sasha Levin
maintainerPATCH 1/14 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
@@ -488,7 +488,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/14 ARM: dts: vf610: Fix pca9548 i2c-mux node names
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 42825d1f269355d63554ab3c3762611e4d8053e9 ]
"make dtbs_check":
arch/arm/boot/dts/vf610-zii-dev-rev-b.dtb: tca9548@70: $nodename:0: 'tca9548@70' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm/boot/dts/vf610-zii-dev-rev-b.dtb: tca9548@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3', 'i2c@4' were unexpected)
From schema: /scratch/geert/linux/linux-renesas/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
...Fix this by renaming PCA9548 nodes 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/vf610-zii-dev-rev-b.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +1 -1
@@ -343,7 +343,7 @@ gpio6: io-expander@22 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +1 -1
@@ -340,7 +340,7 @@ eeprom@50 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 3/14 arm64: dts: freescale: Fix pca954x i2c-mux node names
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit b025b4f5c288e29bbea421613a5b4eacf9261fbb ]
"make dtbs_check":
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: pca9547@77: $nodename:0: 'pca9547@77' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: pca9547@77: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@4' were unexpected)
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
...
Fix this by renaming PCA954x nodes to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification.
--- arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 4 ++-- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts +1 -1
@@ -110,7 +110,7 @@ &esdhc1 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +1 -1
@@ -70,7 +70,7 @@ fpga: board-control@2,0 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts +1 -1
@@ -76,7 +76,7 @@ &duart1 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts +1 -1
@@ -53,7 +53,7 @@ flash@2 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts +1 -1
@@ -136,7 +136,7 @@ mdio2_aquantia_phy: ethernet-phy@0 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts +1 -1
@@ -245,7 +245,7 @@ rx8035: rtc@32 { &i2c3 { status = "okay"; - i2c-switch@70 { + i2c-mux@70 { compatible = "nxp,pca9540"; #address-cells = <1>; #size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi +1 -1
@@ -44,7 +44,7 @@ cpld@3,0 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi +1 -1
@@ -44,7 +44,7 @@ cpld@3,0 { &i2c0 { status = "okay"; - pca9547@75 { + i2c-mux@75 { compatible = "nxp,pca9547"; reg = <0x75>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi +1 -1
@@ -54,7 +54,7 @@ &esdhc1 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +1 -1
@@ -214,7 +214,7 @@ &i2c3 { pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; - i2cmux@70 { + i2c-mux@70 { compatible = "nxp,pca9540"; reg = <0x70>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts +2 -2
@@ -133,7 +133,7 @@ &i2c1 { pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; - i2cmux@70 { + i2c-mux@70 { compatible = "nxp,pca9546"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1_pca9546>;
@@ -216,7 +216,7 @@ &i2c4 { pinctrl-0 = <&pinctrl_i2c4>; status = "okay"; - pca9546: i2cmux@70 { + pca9546: i2c-mux@70 { compatible = "nxp,pca9546"; reg = <0x70>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1 -1
@@ -61,7 +61,7 @@ &i2c1 { pinctrl-0 = <&pinctrl_lpi2c1 &pinctrl_ioexp_rst>; status = "okay"; - i2c-switch@71 { + i2c-mux@71 { compatible = "nxp,pca9646", "nxp,pca9546"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 4/14 arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ef10d57936ead5e817ef7cea6a87531085e77773 ]
There is no "no-emmc" property, so intention for SD/SDIO only nodes was to use "no-mmc".
--- arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq-thor96.dts +2 -2
@@ -339,7 +339,7 @@ &usdhc1 { bus-width = <4>; non-removable; no-sd; - no-emmc; + no-mmc; status = "okay"; brcmf: wifi@1 {
@@ -359,7 +359,7 @@ &usdhc2 { cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; bus-width = <4>; no-sdio; - no-emmc; + no-mmc; disable-wp; status = "okay"; };
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 5/14 firmware: arm_scmi: Clear stale xfer->hdr.status
In reply to Sasha LevinFrom: Cristian Marussi <[email protected]>
[ Upstream commit f6ca5059dc0d6608dc46070f48e396d611f240d6 ]
Stale error status reported from a previous message transaction must be cleared before starting a new transaction to avoid being confusingly reported in the following SCMI message dump traces.
--- drivers/firmware/arm_scmi/driver.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/arm_scmi/driver.c +2 -0
@@ -783,6 +783,8 @@ static int do_xfer(const struct scmi_protocol_handle *ph, xfer->hdr.protocol_id, xfer->hdr.seq, xfer->hdr.poll_completion); +/* Clear any stale status */ + xfer->hdr.status =SCMI_SUCCESS ; xfer->state =SCMI_XFER_SENT_OK ;/* * Even though spinlocking is not needed here since no race is possible
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 6/14 bpf: Skip task with pid=1 in send_signal_common()
In reply to Sasha LevinFrom: 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
@@ -793,6 +793,9 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type)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 7/14 erofs/zmap.c: Fix incorrect offset calculation
In reply to Sasha LevinFrom: Siddh Raman Pant <[email protected]>
[ Upstream commit 6acd87d50998ef0afafc441613aeaf5a8f5c9eff ]
Effective offset to add to length was being incorrectly calculated, which resulted in iomap->length being set to 0, triggering a WARN_ON in iomap_iter_done().
Fix that, and describe it in comments.
This was reported as a crash by syzbot under an issue about a warning encountered in iomap_iter_done(), but unrelated to erofs.
C reproducer: https://syzkaller.appspot.com/text?tag=ReproC&x=1037a6b2880000
Kernel config: https://syzkaller.appspot.com/text?tag=KernelConfig&x=e2021a61197ebe02
Dashboard link: https://syzkaller.appspot.com/bug?extid=a8e049cd3abd342936b6
--- fs/erofs/zmap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/erofs/zmap.c +7 -3
@@ -700,12 +700,16 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset, iomap->type =IOMAP_HOLE ; iomap->addr =IOMAP_NULL_ADDR ;/* -* No strict rule how to describe extents for post EOF, yet -* we need do like below. Otherwise, iomap itself will get +* No strict rule on how to describe extents for post EOF, yet +* we need to do like below. Otherwise, iomap itself will get * into an endless loop on post EOF. +* +* Calculate the effective offset by subtracting extent start +* (map.m_la) from the requested offset, and add it to length. +* (NB: offset >= map.m_la always) */ if (iomap->offset >= inode->i_size) - iomap->length = length + map.m_la - offset; + iomap->length = length + offset - map.m_la; } iomap->flags =0 ;return 0 ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 8/14 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
@@ -190,7 +190,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 9/14 btrfs: factor out scratching of one regular super block
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 0e0078f72be81bbb2a02b229fd2cec8ad63e4fb1 ]
btrfs_scratch_superblocks open codes scratching super block of a non-zoned super block. Split the code to read, zero and write the superblock for regular devices into a separate helper.
--- fs/btrfs/volumes.c | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-)
fs/btrfs/volumes.c +26 -25
@@ -2060,42 +2060,43 @@ static u64 btrfs_num_devices(struct btrfs_fs_info *fs_info)return num_devices; } +static void btrfs_scratch_superblock (struct btrfs_fs_info *fs_info, +struct block_device *bdev,int copy_num) +{ +struct btrfs_super_block *disk_super; +struct page *page; +int ret; + + disk_super =btrfs_read_dev_one_super (bdev, copy_num, false); +if (IS_ERR (disk_super)) +return ; + +memset (&disk_super->magic,0 ,sizeof (disk_super->magic)); + page =virt_to_page (disk_super); +set_page_dirty (page); +lock_page (page); +/* write_on_page() unlocks the page */ + ret =write_one_page (page); +if (ret) +btrfs_warn (fs_info,"error clearing superblock number %d (%d)" , + copy_num, ret); +btrfs_release_disk_super (disk_super); +} +void btrfs_scratch_superblocks (struct btrfs_fs_info *fs_info,struct block_device *bdev,const char *device_path) { -struct btrfs_super_block *disk_super;int copy_num;if (!bdev)return ;for (copy_num =0 ; copy_num <BTRFS_SUPER_MIRROR_MAX ; copy_num++) { -struct page *page; -int ret; - - disk_super =btrfs_read_dev_one_super (bdev, copy_num, false); -if (IS_ERR (disk_super)) -continue ; - -if (bdev_is_zoned (bdev)) { +if (bdev_is_zoned (bdev))btrfs_reset_sb_log_zones (bdev, copy_num); -continue ; - } - -memset (&disk_super->magic,0 ,sizeof (disk_super->magic)); - - page =virt_to_page (disk_super); -set_page_dirty (page); -lock_page (page); -/* write_on_page() unlocks the page */ - ret =write_one_page (page); -if (ret) -btrfs_warn (fs_info, -"error clearing superblock number %d (%d)" , - copy_num, ret); -btrfs_release_disk_super (disk_super); - +else +btrfs_scratch_superblock (fs_info, bdev, copy_num); }/* Notify udev that device has changed */
Signature · 1 line
2.39.0
Re: [PATCH AUTOSEL 5.15 09/14] btrfs: factor out scratching of one regular super block
Quoted 7 lines · Sasha Levin
From: Christoph Hellwig <[email protected]>
[ Upstream commit
0e0078f72be81bbb2a02b229fd2cec8ad63e4fb1]
btrfs_scratch_superblocksopen codes scratching super block of a non-zoned super block. Split the code to read, zero and write the superblock for regular devices into a separate helper.
Why is this a stable candidate?
Sasha Levin
maintainerPATCH 10/14 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
@@ -1360,6 +1360,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 11/14 HID: playstation: sanity check DualSense calibration data.
In reply to Sasha LevinFrom: Roderick Colenbrander <[email protected]>
[ Upstream commit ccf1e1626d37745d0a697db67407beec9ae9d4b8 ]
Make sure calibration values are defined to prevent potential kernel crashes. This fixes a hypothetical issue for virtual or clone devices inspired by a similar fix for DS4.
--- drivers/hid/hid-playstation.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/hid/hid-playstation.c +32 -0
@@ -626,6 +626,7 @@ static const struct attribute_group ps_device_attribute_group = {static int dualsense_get_calibration_data (struct dualsense *ds) { +struct hid_device *hdev = ds->base.hdev;short gyro_pitch_bias, gyro_pitch_plus, gyro_pitch_minus;short gyro_yaw_bias, gyro_yaw_plus, gyro_yaw_minus;short gyro_roll_bias, gyro_roll_plus, gyro_roll_minus;
@@ -636,6 +637,7 @@ static int dualsense_get_calibration_data(struct dualsense *ds)int speed_2x;int range_2g;int ret =0 ; +int i;uint8_t *buf; buf =kzalloc (DS_FEATURE_REPORT_CALIBRATION_SIZE ,GFP_KERNEL );
@@ -687,6 +689,21 @@ static int dualsense_get_calibration_data(struct dualsense *ds) ds->gyro_calib_data[2 ].sens_numer = speed_2x*DS_GYRO_RES_PER_DEG_S ; ds->gyro_calib_data[2 ].sens_denom = gyro_roll_plus - gyro_roll_minus; +/* +* Sanity check gyro calibration data. This is needed to prevent crashes +* during report handling of virtual, clone or broken devices not implementing +* calibration data properly. +*/ +for (i =0 ; i <ARRAY_SIZE (ds->gyro_calib_data); i++) { +if (ds->gyro_calib_data[i].sens_denom ==0 ) { +hid_warn (hdev,"Invalid gyro calibration data for axis (%d), disabling calibration." , + ds->gyro_calib_data[i].abs_code); + ds->gyro_calib_data[i].bias =0 ; + ds->gyro_calib_data[i].sens_numer =DS_GYRO_RANGE ; + ds->gyro_calib_data[i].sens_denom =S16_MAX ; + } + } +/* * Set accelerometer calibration and normalization parameters. * Data values will be normalized to 1/DS_ACC_RES_PER_G g.
@@ -709,6 +726,21 @@ static int dualsense_get_calibration_data(struct dualsense *ds) ds->accel_calib_data[2 ].sens_numer =2 *DS_ACC_RES_PER_G ; ds->accel_calib_data[2 ].sens_denom = range_2g; +/* +* Sanity check accelerometer calibration data. This is needed to prevent crashes +* during report handling of virtual, clone or broken devices not implementing calibration +* data properly. +*/ +for (i =0 ; i <ARRAY_SIZE (ds->accel_calib_data); i++) { +if (ds->accel_calib_data[i].sens_denom ==0 ) { +hid_warn (hdev,"Invalid accelerometer calibration data for axis (%d), disabling calibration." , + ds->accel_calib_data[i].abs_code); + ds->accel_calib_data[i].bias =0 ; + ds->accel_calib_data[i].sens_numer =DS_ACC_RANGE ; + ds->accel_calib_data[i].sens_denom =S16_MAX ; + } + } + err_free:kfree (buf);return ret;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 12/14 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
@@ -1428,10 +1428,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 13/14 cifs: fix return of uninitialized rc in dfs_cache_update_tgthint()
In reply to Sasha LevinFrom: Paulo Alcantara <[email protected]>
[ Upstream commit d6a49e8c4ca4d399ed65ac219585187fc8c2e2b1 ]
Fix this by initializing rc to 0 as cache_refresh_path() would not set it in case of success.
--- fs/cifs/dfs_cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/cifs/dfs_cache.c +3 -3
@@ -1046,10 +1046,10 @@ int dfs_cache_update_tgthint(const unsigned int xid, struct cifs_ses *ses, const struct nls_table *cp, int remap, const char *path, const struct dfs_cache_tgt_iterator *it) { - int rc; -const char *npath; -struct cache_entry *ce; struct cache_dfs_tgt *t; +struct cache_entry *ce; +const char *npath; +int rc =0 ; npath =dfs_cache_canonical_path (path, cp, remap);if (IS_ERR (npath))
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 14/14 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[] = {
@@ -470,8 +472,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 ; }
@@ -3089,6 +3104,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