6.0.16-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 956/1073 media: dvbdev: adopts refcnt to avoid UAF
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 0fc044b2b5e2d05a1fa1fb0d7f270367a7855d79 ]
dvb_unregister_device() is known that prone to use-after-free. That is, the cleanup from dvb_unregister_device() releases the dvb_device even if there are pointers stored in file->private_data still refer to it.
This patch adds a reference counter into struct dvb_device and delays its deallocation until no pointer refers to the object.
--- drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- drivers/media/dvb-core/dvb_frontend.c | 2 +- drivers/media/dvb-core/dvbdev.c | 32 +++++++++++++++++++------ include/media/dvbdev.h | 31 +++++++++++++----------- 4 files changed, 44 insertions(+), 23 deletions(-)
drivers/media/dvb-core/dvb_ca_en50221.c +1 -1
@@ -157,7 +157,7 @@ static void dvb_ca_private_free(struct dvb_ca_private *ca) {unsigned int i; -dvb_free_device (ca->dvbdev); +dvb_device_put (ca->dvbdev);for (i =0 ; i < ca->slot_count; i++)vfree (ca->slot_info[i].rx_buffer.data);
drivers/media/dvb-core/dvb_frontend.c +1 -1
@@ -136,7 +136,7 @@ static void __dvb_frontend_free(struct dvb_frontend *fe)struct dvb_frontend_private *fepriv = fe->frontend_priv;if (fepriv) -dvb_free_device (fepriv->dvbdev); +dvb_device_put (fepriv->dvbdev);dvb_frontend_invoke_release (fe, fe->ops.release);
drivers/media/dvb-core/dvbdev.c +25 -7
@@ -97,7 +97,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) new_fops =fops_get (dvbdev->fops);if (!new_fops) goto fail; - file->private_data = dvbdev; + file->private_data =dvb_device_get (dvbdev);replace_fops (file, new_fops);if (file->f_op->open) err = file->f_op->open (inode, file);
@@ -161,6 +161,9 @@ int dvb_generic_release(struct inode *inode, struct file *file) } dvbdev->users++; + +dvb_device_put (dvbdev); +return 0 ; }EXPORT_SYMBOL (dvb_generic_release);
@@ -477,6 +480,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,return -ENOMEM ; } +kref_init (&dvbdev->ref);memcpy (dvbdev, template,sizeof (struct dvb_device )); dvbdev->type = type; dvbdev->id = id;
@@ -508,7 +512,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,#endif dvbdev->minor = minor; - dvb_minors[minor] = dvbdev; + dvb_minors[minor] =dvb_device_get (dvbdev);up_write (&minor_rwsem); ret =dvb_register_media_device (dvbdev, type, minor, demux_sink_pads);
@@ -553,6 +557,7 @@ void dvb_remove_device(struct dvb_device *dvbdev)down_write (&minor_rwsem); dvb_minors[dvbdev->minor] =NULL ; +dvb_device_put (dvbdev);up_write (&minor_rwsem);dvb_media_device_free (dvbdev);
@@ -564,21 +569,34 @@ void dvb_remove_device(struct dvb_device *dvbdev)EXPORT_SYMBOL (dvb_remove_device); -void dvb_free_device (struct dvb_device *dvbdev) +static void dvb_free_device (struct kref *ref) { -if (!dvbdev) -return ; + struct dvb_device *dvbdev = container_of(ref, struct dvb_device, ref);kfree (dvbdev->fops);kfree (dvbdev); } -EXPORT_SYMBOL (dvb_free_device); + + +struct dvb_device *dvb_device_get (struct dvb_device *dvbdev) +{ +kref_get (&dvbdev->ref); +return dvbdev; +} +EXPORT_SYMBOL (dvb_device_get); + + +void dvb_device_put (struct dvb_device *dvbdev) +{ +if (dvbdev) +kref_put (&dvbdev->ref, dvb_free_device); +}void dvb_unregister_device (struct dvb_device *dvbdev) {dvb_remove_device (dvbdev); -dvb_free_device (dvbdev); +dvb_device_put (dvbdev); }EXPORT_SYMBOL (dvb_unregister_device);
include/media/dvbdev.h +17 -14
@@ -156,6 +156,7 @@ struct dvb_adapter {*/ struct dvb_device {struct list_head list_head; +struct kref ref;const struct file_operations *fops;struct dvb_adapter *adapter;enum dvb_device_type type;
@@ -187,6 +188,20 @@ struct dvb_device {void *priv; }; +/** +* dvb_device_get - Increase dvb_device reference +* +* @dvbdev: pointer to struct dvb_device +*/ +struct dvb_device *dvb_device_get (struct dvb_device *dvbdev); + +/** +* dvb_device_get - Decrease dvb_device reference +* +* @dvbdev: pointer to struct dvb_device +*/ +void dvb_device_put (struct dvb_device *dvbdev); +/** * dvb_register_adapter - Registers a new DVB adapter *
@@ -231,29 +246,17 @@ int dvb_register_device(struct dvb_adapter *adap,/** * dvb_remove_device - Remove a registered DVB device * -* This does not free memory. To do that, call dvb_free_device(). +* This does not free memory. dvb_free_device() will do that when +* reference counter is empty * * @dvbdev: pointer to struct dvb_device */ void dvb_remove_device (struct dvb_device *dvbdev); -/** -* dvb_free_device - Free memory occupied by a DVB device. -* -* Call dvb_unregister_device() before calling this function. -* -* @dvbdev: pointer to struct dvb_device -*/ -void dvb_free_device (struct dvb_device *dvbdev);/** * dvb_unregister_device - Unregisters a DVB device * -* This is a combination of dvb_remove_device() and dvb_free_device(). -* Using this function is usually a mistake, and is often an indicator -* for a use-after-free bug (when a userspace process keeps a file -* handle to a detached device). -* * @dvbdev: pointer to struct dvb_device */ void dvb_unregister_device (struct dvb_device *dvbdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 957/1073 media: dvb-usb: fix memory leak in dvb_usb_adapter_init()
In reply to Greg Kroah-HartmanFrom: Mazin Al Haddad <[email protected]>
[ Upstream commit 94d90fb06b94a90c176270d38861bcba34ce377d ]
Syzbot reports a memory leak in "dvb_usb_adapter_init()". The leak is due to not accounting for and freeing current iteration's adapter->priv in case of an error. Currently if an error occurs, it will exit before incrementing "num_adapters_initalized", which is used as a reference counter to free all adap->priv in "dvb_usb_adapter_exit()". There are multiple error paths that can exit from before incrementing the counter. Including the error handling paths for "dvb_usb_adapter_stream_init()", "dvb_usb_adapter_dvb_init()" and "dvb_usb_adapter_frontend_init()" within "dvb_usb_adapter_init()".
This means that in case of an error in any of these functions the current iteration is not accounted for and the current iteration's adap->priv is not freed.
Fix this by freeing the current iteration's adap->priv in the "stream_init_err:" label in the error path. The rest of the (accounted for) adap->priv objects are freed in dvb_usb_adapter_exit() as expected using the num_adapters_initalized variable.
Syzbot report:
BUG: memory leak
unreferenced object 0xffff8881172f1a00 (size 512):
comm "kworker/0:2", pid 139, jiffies 4294994873 (age 10.960s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff844af012>] dvb_usb_adapter_init drivers/media/usb/dvb-usb/dvb-usb-init.c:75 [inline]
[<ffffffff844af012>] dvb_usb_init drivers/media/usb/dvb-usb/dvb-usb-init.c:184 [inline]
[<ffffffff844af012>] dvb_usb_device_init.cold+0x4e5/0x79e drivers/media/usb/dvb-usb/dvb-usb-init.c:308
[<ffffffff830db21d>] dib0700_probe+0x8d/0x1b0 drivers/media/usb/dvb-usb/dib0700_core.c:883
[<ffffffff82d3fdc7>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
[<ffffffff8274ab37>] call_driver_probe drivers/base/dd.c:542 [inline]
[<ffffffff8274ab37>] really_probe.part.0+0xe7/0x310 drivers/base/dd.c:621
[<ffffffff8274ae6c>] really_probe drivers/base/dd.c:583 [inline]
[<ffffffff8274ae6c>] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:752
[<ffffffff8274af6a>] driver_probe_device+0x2a/0x120 drivers/base/dd.c:782
[<ffffffff8274b786>] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:899
[<ffffffff82747c87>] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427
[<ffffffff8274b352>] __device_attach+0x122/0x260 drivers/base/dd.c:970
[<ffffffff827498f6>] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487
[<ffffffff82745cdb>] device_add+0x5fb/0xdf0 drivers/base/core.c:3405
[<ffffffff82d3d202>] usb_set_configuration+0x8f2/0xb80 drivers/usb/core/message.c:2170
[<ffffffff82d4dbfc>] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238
[<ffffffff82d3f49c>] usb_probe_device+0x5c/0x140 drivers/usb/core/driver.c:293
[<ffffffff8274ab37>] call_driver_probe drivers/base/dd.c:542 [inline]
[<ffffffff8274ab37>] really_probe.part.0+0xe7/0x310 drivers/base/dd.c:621
[<ffffffff8274ae6c>] really_probe drivers/base/dd.c:583 [inline]
[<ffffffff8274ae6c>] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:752--- drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb/dvb-usb-init.c +3 -1
@@ -81,7 +81,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) ret =dvb_usb_adapter_stream_init (adap);if (ret) -return ret; + goto stream_init_err; ret =dvb_usb_adapter_dvb_init (adap, adapter_nrs);if (ret)
@@ -114,6 +114,8 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)dvb_usb_adapter_dvb_exit (adap); dvb_init_err:dvb_usb_adapter_stream_exit (adap); +stream_init_err: +kfree (adap->priv);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 959/1073 blk-mq: fix possible memleak when register hctx failed
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit 4b7a21c57b14fbcd0e1729150189e5933f5088e9 ]
There's issue as follows when do fault injection test:
unreferenced object 0xffff888132a9f400 (size 512):
comm "insmod", pid 308021, jiffies 4324277909 (age 509.733s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 08 f4 a9 32 81 88 ff ff ...........2....
08 f4 a9 32 81 88 ff ff 00 00 00 00 00 00 00 00 ...2............
backtrace:
[<00000000e8952bb4>] kmalloc_node_trace+0x22/0xa0
[<00000000f9980e0f>] blk_mq_alloc_and_init_hctx+0x3f1/0x7e0
[<000000002e719efa>] blk_mq_realloc_hw_ctxs+0x1e6/0x230
[<000000004f1fda40>] blk_mq_init_allocated_queue+0x27e/0x910
[<00000000287123ec>] __blk_mq_alloc_disk+0x67/0xf0
[<00000000a2a34657>] 0xffffffffa2ad310f
[<00000000b173f718>] 0xffffffffa2af824a
[<0000000095a1dabb>] do_one_initcall+0x87/0x2a0
[<00000000f32fdf93>] do_init_module+0xdf/0x320
[<00000000cbe8541e>] load_module+0x3006/0x3390
[<0000000069ed1bdb>] __do_sys_finit_module+0x113/0x1b0
[<00000000a1a29ae8>] do_syscall_64+0x35/0x80
[<000000009cd878b0>] entry_SYSCALL_64_after_hwframe+0x46/0xb0Fault injection context as follows:
kobject_add
blk_mq_register_hctx
blk_mq_sysfs_register
blk_register_queue
device_add_disk
null_add_dev.part.0 [null_blk]
As 'blk_mq_register_hctx' may already add some objects when failed halfway, but there isn't do fallback, caller don't know which objects add failed. To solve above issue just do fallback when add objects failed halfway in 'blk_mq_register_hctx'.
--- block/blk-mq-sysfs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
block/blk-mq-sysfs.c +9 -2
@@ -185,7 +185,7 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) {struct request_queue *q = hctx->queue;struct blk_mq_ctx *ctx; -int i, ret; +int i, j, ret;if (!hctx->nr_ctx)return 0 ;
@@ -197,9 +197,16 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx)hctx_for_each_ctx (hctx, ctx, i) { ret =kobject_add (&ctx->kobj, &hctx->kobj,"cpu%u" , ctx->cpu);if (ret) -break ; + goto out; } +return 0 ; +out: +hctx_for_each_ctx (hctx, ctx, j) { +if (j < i) +kobject_del (&ctx->kobj); + } +kobject_del (&hctx->kobj);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 960/1073 drm/amd/display: Use the largest vready_offset in pipe group
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit 5842abd985b792a3b13a89b6dae4869b56656c92 ]
[WHY]
Corruption can occur in LB if vready_offset is not large enough. DML calculates vready_offset for each pipe, but we currently select the top pipe's vready_offset, which is not necessarily enough for all pipes in the group.
[HOW]
Wherever program_global_sync is currently called, iterate through the entire pipe group and find the highest vready_offset.
--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +++++++++++++++++-- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 29 ++++++++++++++++-- 2 files changed, 55 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +28 -2
@@ -867,6 +867,32 @@ static void false_optc_underflow_wa( tg->funcs->clear_optc_underflow (tg); } +static int calculate_vready_offset_for_group (struct pipe_ctx *pipe) +{ +struct pipe_ctx *other_pipe; +int vready_offset = pipe->pipe_dlg_param.vready_offset; + +/* Always use the largest vready_offset of all connected pipes */ +for (other_pipe = pipe->bottom_pipe; other_pipe !=NULL ; other_pipe = other_pipe->bottom_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->top_pipe; other_pipe !=NULL ; other_pipe = other_pipe->top_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->next_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->next_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->prev_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->prev_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } + +return vready_offset; +} + enum dc_status dcn10_enable_stream_timing( struct pipe_ctx *pipe_ctx, struct dc_state *context,
@@ -902,7 +928,7 @@ enum dc_status dcn10_enable_stream_timing( pipe_ctx->stream_res.tg->funcs->program_timing( pipe_ctx->stream_res.tg, &stream->timing, - pipe_ctx->pipe_dlg_param.vready_offset, + calculate_vready_offset_for_group(pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width,
@@ -2869,7 +2895,7 @@ void dcn10_program_pipe( pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +27 -2
@@ -1608,6 +1608,31 @@ static void dcn20_update_dchubp_dpp( hubp->funcs->phantom_hubp_post_enable (hubp); } +static int calculate_vready_offset_for_group (struct pipe_ctx *pipe) +{ +struct pipe_ctx *other_pipe; +int vready_offset = pipe->pipe_dlg_param.vready_offset; + +/* Always use the largest vready_offset of all connected pipes */ +for (other_pipe = pipe->bottom_pipe; other_pipe !=NULL ; other_pipe = other_pipe->bottom_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->top_pipe; other_pipe !=NULL ; other_pipe = other_pipe->top_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->next_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->next_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->prev_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->prev_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } + +return vready_offset; +} static void dcn20_program_pipe( struct dc *dc,
@@ -1626,7 +1651,7 @@ static void dcn20_program_pipe( && !pipe_ctx->prev_odm_pipe) { pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
@@ -2038,7 +2063,7 @@ bool dcn20_update_bandwidth( pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 961/1073 drm/amd/display: Fix DTBCLK disable requests and SRC_SEL programming
In reply to Greg Kroah-HartmanFrom: Alvin Lee <[email protected]>
[ Upstream commit f6015da7f2410109bd2ccd2e2828f26185aeb81d ]
[Description]
- When transitioning FRL / DP2 is not required, we will always request DTBCLK = 0Mhz, but PMFW returns the min freq
- This causes us to make DTBCLK requests every time we call optimize after transitioning from FRL to non-FRL
- If DTBCLK is not required, request the min instead (then we only need to make 1 extra request at boot time)
- Also when programming PIPE_DTO_SRC_SEL, don't programming for DP first, just programming once for the required selection (programming DP on an HDMI connection then switching back causes corruption)
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +1 -1
@@ -436,7 +436,7 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base, }if (!new_clocks->dtbclk_en) { - new_clocks->ref_dtbclk_khz =0 ; + new_clocks->ref_dtbclk_khz = clk_mgr_base->bw_params->clk_table.entries[0 ].dtbclk_mhz *1000 ; }/* clock limits are received with MHz precision, divide by 1000 to prevent setting clocks at every call */
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +1 -5
@@ -225,11 +225,7 @@ void dccg32_set_dtbclk_dto( }else {REG_UPDATE_2 (OTG_PIXEL_RATE_CNTL [params->otg_inst],DTBCLK_DTO_ENABLE [params->otg_inst],0 , -PIPE_DTO_SRC_SEL [params->otg_inst],1 ); -if (params->is_hdmi) -REG_UPDATE (OTG_PIXEL_RATE_CNTL [params->otg_inst], -PIPE_DTO_SRC_SEL [params->otg_inst],0 ); - +PIPE_DTO_SRC_SEL [params->otg_inst], params->is_hdmi ?0 :1 );REG_WRITE (DTBCLK_DTO_MODULO [params->otg_inst],0 );REG_WRITE (DTBCLK_DTO_PHASE [params->otg_inst],0 ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 962/1073 ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table
In reply to Greg Kroah-HartmanFrom: Artem Lukyanov <[email protected]>
[ Upstream commit c1dd6bf6199752890d8c59d895dd45094da51d1f ]
This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output).
--- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/amd/yc/acp6x-mach.c +7 -0
@@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), + } + }, {} };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 963/1073 libbpf: Avoid enum forward-declarations in public API in C++ mode
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit b42693415b86f608049cf1b4870adc1dc65e58b0 ]
C++ enum forward declarations are fundamentally not compatible with pure C enum definitions, and so libbpf's use of enum bpf_stats_type; forward declaration in libbpf/bpf.h public API header is causing C++ compilation issues.
More details can be found in [0], but it comes down to C++ supporting enum forward declaration only with explicitly specified backing type:
enum bpf_stats_type: int;
In C (and I believe it's a GCC extension also), such forward declaration is simply:
enum bpf_stats_type;
Further, in Linux UAPI this enum is defined in pure C way:
enum bpf_stats_type { BPF_STATS_RUN_TIME = 0; }
And even though in both cases backing type is int, which can be confirmed by looking at DWARF information, for C++ compiler actual enum definition and forward declaration are incompatible.
To eliminate this problem, for C++ mode define input argument as int, which makes enum unnecessary in libbpf public header. This solves the issue and as demonstrated by next patch doesn't cause any unwanted compiler warnings, at least with default warnings setting.
[0] https://stackoverflow.com/questions/42766839/c11-enum-forward-causes-underlying-type-mismatch
[1] Closes: https://github.com/libbpf/libbpf/issues/249
--- tools/lib/bpf/bpf.h | 7 +++++++ 1 file changed, 7 insertions(+)
tools/lib/bpf/bpf.h +7 -0
@@ -393,8 +393,15 @@ LIBBPF_API int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len, __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset, __u64 *probe_addr); +#ifdef __cplusplus +/* forward-declaring enums in C++ isn't compatible with pure C enums, so +* instead define bpf_enable_stats() as accepting int as an input +*/ +LIBBPF_API int bpf_enable_stats(int type); +#else enum bpf_stats_type ;/* defined in up-to-date linux/bpf.h */ LIBBPF_API int bpf_enable_stats(enum bpf_stats_type type); +#endif struct bpf_prog_bind_opts {size_t sz;/* size of this struct for forward/backward compatibility */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 964/1073 regulator: core: fix use_count leakage when handling boot-on
In reply to Greg Kroah-HartmanFrom: Rui Zhang <[email protected]>
[ Upstream commit 0591b14ce0398125439c759f889647369aa616a0 ]
I found a use_count leakage towards supply regulator of rdev with boot-on option.
┌───────────────────┐ ┌───────────────────┐ │ regulator_dev A │ │ regulator_dev B │ │ (boot-on) │ │ (boot-on) │ │ use_count=0 │◀──supply──│ use_count=1 │ │ │ │ │ └───────────────────┘ └───────────────────┘
In case of rdev(A) configured with `regulator-boot-on', the use_count of supplying regulator(B) will increment inside regulator_enable(rdev->supply).
Thus, B will acts like always-on, and further balanced regulator_enable/disable cannot actually disable it anymore.
However, B was also configured with `regulator-boot-on', we wish it could be disabled afterwards.
--- drivers/regulator/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/regulator/core.c +7 -1
@@ -1578,7 +1578,13 @@ static int set_machine_constraints(struct regulator_dev *rdev)if (rdev->supply_name && !rdev->supply)return -EPROBE_DEFER ; -if (rdev->supply) { +/* If supplying regulator has already been enabled, +* it's not intended to have use_count increment +* when rdev is only boot-on. +*/ +if (rdev->supply && + (rdev->constraints->always_on || + !regulator_is_enabled (rdev->supply))) { ret =regulator_enable (rdev->supply);if (ret <0 ) {_regulator_put (rdev->supply);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 965/1073 wifi: mt76: do not run mt76u_status_worker if the device is not running
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit bd5dac7ced5a7c9faa4dc468ac9560c3256df845 ]
Fix the following NULL pointer dereference avoiding to run mt76u_status_worker thread if the device is not running yet.
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 0 PID: 98 Comm: kworker/u2:2 Not tainted 5.14.0+ #78 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 Workqueue: mt76 mt76u_tx_status_data RIP: 0010:mt76x02_mac_fill_tx_status.isra.0+0x82c/0x9e0 Code: c5 48 b8 00 00 00 00 00 fc ff df 80 3c 02 00 0f 85 94 01 00 00 48 b8 00 00 00 00 00 fc ff df 4d 8b 34 24 4c 89 f2 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 03 0f 8e 89 01 00 00 41 8b 16 41 0f b7 RSP: 0018:ffffc900005af988 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: ffffc900005afae8 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff832fc661 RDI: ffffc900005afc2a RBP: ffffc900005afae0 R08: 0000000000000001 R09: fffff520000b5f3c R10: 0000000000000003 R11: fffff520000b5f3b R12: ffff88810b6132d8 R13: 000000000000ffff R14: 0000000000000000 R15: ffffc900005afc28 FS: 0000000000000000(0000) GS:ffff88811aa00000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa0eda6a000 CR3: 0000000118f17000 CR4: 0000000000750ef0
PKRU: 55555554
Call Trace: mt76x02_send_tx_status+0x1d2/0xeb0 mt76x02_tx_status_data+0x8e/0xd0 mt76u_tx_status_data+0xe1/0x240 process_one_work+0x92b/0x1460 worker_thread+0x95/0xe00 kthread+0x3a1/0x480 ret_from_fork+0x1f/0x30 Modules linked in: --[ end trace 8df5d20fc5040f65 ]-- RIP: 0010:mt76x02_mac_fill_tx_status.isra.0+0x82c/0x9e0 Code: c5 48 b8 00 00 00 00 00 fc ff df 80 3c 02 00 0f 85 94 01 00 00 48 b8 00 00 00 00 00 fc ff df 4d 8b 34 24 4c 89 f2 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 03 0f 8e 89 01 00 00 41 8b 16 41 0f b7 RSP: 0018:ffffc900005af988 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: ffffc900005afae8 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff832fc661 RDI: ffffc900005afc2a RBP: ffffc900005afae0 R08: 0000000000000001 R09: fffff520000b5f3c R10: 0000000000000003 R11: fffff520000b5f3b R12: ffff88810b6132d8 R13: 000000000000ffff R14: 0000000000000000 R15: ffffc900005afc28 FS: 0000000000000000(0000) GS:ffff88811aa00000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa0eda6a000 CR3: 0000000118f17000 CR4: 0000000000750ef0
PKRU: 55555554
Moreover move stat_work schedule out of the for loop.
--- drivers/net/wireless/mediatek/mt76/usb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/usb.c +7 -4
@@ -761,6 +761,9 @@ static void mt76u_status_worker(struct mt76_worker *w)struct mt76_queue *q;int i; +if (!test_bit (MT76_STATE_RUNNING , &dev->phy.state)) +return ; +for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { q = dev->phy.q_tx[i];if (!q)
@@ -780,11 +783,11 @@ static void mt76u_status_worker(struct mt76_worker *w)wake_up (&dev->tx_wait);mt76_worker_schedule (&dev->tx_worker); - -if (dev->drv->tx_status_data && - !test_and_set_bit (MT76_READING_STATS , &dev->phy.state)) -queue_work (dev->wq, &dev->usb.stat_work); } + +if (dev->drv->tx_status_data && + !test_and_set_bit (MT76_READING_STATS , &dev->phy.state)) +queue_work (dev->wq, &dev->usb.stat_work); }static void mt76u_tx_status_data (struct work_struct *work)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 966/1073 hwmon: (nct6775) add ASUS CROSSHAIR VIII/TUF/ProArt B550M
In reply to Greg Kroah-HartmanFrom: Denis Pauk <[email protected]>
[ Upstream commit 1864069c695d475e0ce98a335c62274b81be57b4 ]
Boards such as
* ProArt B550-CREATOR
* ProArt Z490-CREATOR 10G
* ROG CROSSHAIR VIII EXTREME
* ROG CROSSHAIR VIII HERO (WI-FI)
* TUF GAMING B550M-E
* TUF GAMING B550M-E (WI-FI)
* TUF GAMING B550M-PLUS WIFI II
have got a nct6775 chip, but by default there's no use of it because of resource conflict with WMI method.
This commit adds such boards to the WMI monitoring list.
--- drivers/hwmon/nct6775-platform.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hwmon/nct6775-platform.c +7 -0
@@ -1043,7 +1043,9 @@ static struct platform_device *pdev[2];static const char *const asus_wmi_boards[] = {"PRO H410T" , +"ProArt B550-CREATOR" ,"ProArt X570-CREATOR WIFI" , +"ProArt Z490-CREATOR 10G" ,"Pro B550M-C" ,"Pro WS X570-ACE" ,"PRIME B360-PLUS" ,
@@ -1055,8 +1057,10 @@ static const char * const asus_wmi_boards[] = {"PRIME X570-P" ,"PRIME X570-PRO" ,"ROG CROSSHAIR VIII DARK HERO" , +"ROG CROSSHAIR VIII EXTREME" ,"ROG CROSSHAIR VIII FORMULA" ,"ROG CROSSHAIR VIII HERO" , +"ROG CROSSHAIR VIII HERO (WI-FI)" ,"ROG CROSSHAIR VIII IMPACT" ,"ROG STRIX B550-A GAMING" , "ROG STRIX B550-E GAMING",
@@ -1080,8 +1084,11 @@ static const char * const asus_wmi_boards[] = {"ROG STRIX Z490-G GAMING (WI-FI)" ,"ROG STRIX Z490-H GAMING" ,"ROG STRIX Z490-I GAMING" , +"TUF GAMING B550M-E" , +"TUF GAMING B550M-E (WI-FI)" ,"TUF GAMING B550M-PLUS" ,"TUF GAMING B550M-PLUS (WI-FI)" , +"TUF GAMING B550M-PLUS WIFI II" ,"TUF GAMING B550-PLUS" ,"TUF GAMING B550-PLUS WIFI II" , "TUF GAMING B550-PRO",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 967/1073 selftests/bpf: Fix conflicts with built-in functions in bpf_iter_ksym
In reply to Greg Kroah-HartmanFrom: James Hilliard <[email protected]>
[ Upstream commit ab0350c743d5c93fd88742f02b3dff12168ab435 ]
Both tolower and toupper are built in c functions, we should not redefine them as this can result in a build error.
Fixes the following errors:progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)
| ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
4 | #include <bpf/bpf_helpers.h>
+++ |+#include <ctype.h>
5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
17 | static inline char toupper(char c)
| ^~~~~~~progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'
See background on this sort of issue:
https://stackoverflow.com/a/20582607
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213
(C99, 7.1.3p1) "All identifiers with external linkage in any of the following subclauses (including the future library directions) are always reserved for use as identifiers with external linkage."
This is documented behavior in GCC:
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#index-std-2
--- tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -3
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";unsigned long last_sym_value =0 ; -static inline char tolower (char c) +static inline char to_lower (char c) {if (c >='A' && c <='Z' ) c += ('a' -'A' );return c; } -static inline char toupper (char c) +static inline char to_upper (char c) {if (c >='a' && c <='z' ) c -= ('a' -'A' );
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx) type = iter->type;if (iter->module_name[0 ]) { - type = iter->exported ?toupper (type) :tolower (type); + type = iter->exported ?to_upper (type) :to_lower (type);BPF_SEQ_PRINTF (seq,"0x%llx %c %s [ %s ] " , value, type, iter->name, iter->module_name); }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 968/1073 nfs: fix possible null-ptr-deref when parsing param
In reply to Greg Kroah-HartmanFrom: Hawkins Jiawei <[email protected]>
[ Upstream commit 5559405df652008e56eee88872126fe4c451da67 ]
According to commit "vfs: parse: deal with zero length string value", kernel will set the param->string to null pointer in vfs_parse_fs_string() if fs string has zero length.
Yet the problem is that, nfs_fs_context_parse_param() will dereferences the param->string, without checking whether it is a null pointer, which may trigger a null-ptr-deref bug.
This patch solves it by adding sanity check on param->string in nfs_fs_context_parse_param().
--- fs/nfs/fs_context.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/nfs/fs_context.c +6 -0
@@ -684,6 +684,8 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,return ret;break ;case Opt_vers: +if (!param->string) + goto out_invalid_value;trace_nfs_mount_assign (param->key, param->string); ret =nfs_parse_version_string (fc, param->string);if (ret <0 )
@@ -696,6 +698,8 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,break ;case Opt_proto: +if (!param->string) + goto out_invalid_value;trace_nfs_mount_assign (param->key, param->string); protofamily =AF_INET ;switch (lookup_constant (nfs_xprt_protocol_tokens, param->string,-1 )) {
@@ -732,6 +736,8 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,break ;case Opt_mountproto: +if (!param->string) + goto out_invalid_value;trace_nfs_mount_assign (param->key, param->string); mountfamily =AF_INET ;switch (lookup_constant (nfs_xprt_protocol_tokens, param->string,-1 )) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 969/1073 mmc: f-sdh30: Add quirks for broken timeout clock capability
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
[ Upstream commit aae9d3a440736691b3c1cb09ae2c32c4f1ee2e67 ]
There is a case where the timeout clock is not supplied to the capability. Add a quirk for that.
--- drivers/mmc/host/sdhci_f_sdh30.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/sdhci_f_sdh30.c +3 -0
@@ -168,6 +168,9 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)if (reg &SDHCI_CAN_DO_8BIT ) priv->vendor_hs200 =F_SDH30_EMMC_HS200 ; +if (!(reg &SDHCI_TIMEOUT_CLK_MASK )) + host->quirks |=SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK ; + ret =sdhci_add_host (host);if (ret) goto err_add_host;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 970/1073 mmc: renesas_sdhi: add quirk for broken register layout
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit ec9e80ae1719de541c719116a1ca0a0c70e9240c ]
Some early Gen3 SoCs have the DTRANEND1 bit at a different location than all later SoCs. Because we need the bit soon, add a quirk so we know which bit to use.
--- drivers/mmc/host/renesas_sdhi.h | 1 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/renesas_sdhi.h +1 -0
@@ -44,6 +44,7 @@ struct renesas_sdhi_quirks {bool fixed_addr_mode;bool dma_one_rx_only;bool manual_tap_correction; +bool old_info1_layout;u32 hs400_bad_taps;const u8 (*hs400_calib_table)[SDHI_CALIB_TABLE_MAX ]; };
drivers/mmc/host/renesas_sdhi_internal_dmac.c +3 -1
@@ -49,7 +49,8 @@/* DM_CM_INFO1 and DM_CM_INFO1_MASK */ #define INFO1_CLEAR 0#define INFO1_MASK_CLEAR GENMASK_ULL(31, 0) -#define INFO1_DTRANEND1 BIT(17) +#define INFO1_DTRANEND1 BIT(20) +#define INFO1_DTRANEND1_OLD BIT(17)#define INFO1_DTRANEND0 BIT(16)/* DM_CM_INFO2 and DM_CM_INFO2_MASK */
@@ -165,6 +166,7 @@ static const struct renesas_sdhi_quirks sdhi_quirks_4tap_nohs400_one_rx = { .hs400_disabled = true, .hs400_4taps = true, .dma_one_rx_only = true, + .old_info1_layout = true, };static const struct renesas_sdhi_quirks sdhi_quirks_4tap = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 971/1073 mmc: renesas_sdhi: better reset from HS400 mode
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 0da69dd2155019ed4c444ede0e79ce7a4a6af627 ]
Up to now, HS400 adjustment mode was only disabled on soft reset when a calibration table was in use. It is safer, though, to disable it as soon as the instance has an adjustment related quirk set, i.e. bad taps or a calibration table.
--- drivers/mmc/host/renesas_sdhi_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/renesas_sdhi_core.c +1 -1
@@ -546,7 +546,7 @@ static void renesas_sdhi_reset_hs400_mode(struct tmio_mmc_host *host, SH_MOBILE_SDHI_SCC_TMPPORT2_HS400OSEL) & sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_TMPPORT2)); -if (priv->adjust_hs400_calib_table) +if (priv->quirks && (priv->quirks->hs400_calib_table || priv->quirks->hs400_bad_taps))renesas_sdhi_adjust_hs400_mode_disable (host); sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN |
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 972/1073 media: si470x: Fix use-after-free in si470x_int_in_callback()
In reply to Greg Kroah-HartmanFrom: Shigeru Yoshida <[email protected]>
[ Upstream commit 7d21e0b1b41b21d628bf2afce777727bd4479aa5 ]
syzbot reported use-after-free in si470x_int_in_callback() [1]. This indicates that urb->context, which contains struct si470x_device object, is freed when si470x_int_in_callback() is called.
The cause of this issue is that si470x_int_in_callback() is called for freed urb.
si470x_usb_driver_probe() calls si470x_start_usb(), which then calls usb_submit_urb() and si470x_start(). If si470x_start_usb() fails, si470x_usb_driver_probe() doesn't kill urb, but it just frees struct si470x_device object, as depicted below:
si470x_usb_driver_probe()
...
si470x_start_usb()
...
usb_submit_urb()
retval = si470x_start()
return retval
if (retval < 0)
free struct si470x_device object, but don't kill urbThis patch fixes this issue by killing urb when si470x_start_usb() fails and urb is submitted. If si470x_start_usb() fails and urb is not submitted, i.e. submitting usb fails, it just frees struct si470x_device object.
--- drivers/media/radio/si470x/radio-si470x-usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/radio/si470x/radio-si470x-usb.c +3 -1
@@ -727,8 +727,10 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,/* start radio */ retval =si470x_start_usb (radio); -if (retval <0 ) +if (retval <0 && !radio->int_in_running) goto err_buf; +else if (retval <0 )/* in case of radio->int_in_running == 1 */ + goto err_all;/* set initial frequency */ si470x_set_freq (radio,87.5 *FREQ_MUL );/* available in all regions */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 973/1073 clk: st: Fix memory leak in st_of_quadfs_setup()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit cfd3ffb36f0d566846163118651d868e607300ba ]
If st_clk_register_quadfs_pll() fails, @lock should be freed before goto @err_exit, otherwise will cause meory leak issue, fix it.
--- drivers/clk/st/clkgen-fsyn.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/st/clkgen-fsyn.c +3 -2
@@ -1020,9 +1020,10 @@ static void __init st_of_quadfs_setup(struct device_node *np, clk =st_clk_register_quadfs_pll (pll_name, clk_parent_name, datac->data, reg, lock); -if (IS_ERR (clk)) +if (IS_ERR (clk)) { +kfree (lock); goto err_exit; -else + }else pr_debug("%s: parent %s rate %u\n", __clk_get_name(clk), __clk_get_name(clk_get_parent(clk)),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 974/1073 regulator: core: Use different devices for resource allocation and DT lookup
In reply to Greg Kroah-HartmanFrom: ChiYuan Huang <[email protected]>
[ Upstream commit 8f3cbcd6b440032ebc7f7d48a1689dcc70a4eb98 ]
Following by the below discussion, there's the potential UAF issue between regulator and mfd.
https://lore.kernel.org/all/[email protected]/
Quoted 1 line
From the analysis of Yingliang
CPU A |CPU Bmt6370_probe() |
devm_mfd_add_devices() |
|mt6370_regulator_probe()
| regulator_register()
| //allocate init_data and add it to devres
| regulator_of_get_init_data()
i2c_unregister_device() |
device_del() |
devres_release_all() |
// init_data is freed |
release_nodes() |
| // using init_data causes UAF
| regulator_register()It's common to use mfd core to create child device for the regulator. In order to do the DT lookup for init data, the child that registered the regulator would pass its parent as the parameter. And this causes init data resource allocated to its parent, not itself. The issue happen when parent device is going to release and regulator core is still doing some operation of init data constraint for the regulator of child device.
To fix it, this patch expand 'regulator_register' API to use the different devices for init data allocation and DT lookup.
--- drivers/platform/x86/intel/int3472/clk_and_regulator.c | 3 ++- drivers/regulator/core.c | 8 ++++---- drivers/regulator/devres.c | 2 +- drivers/regulator/of_regulator.c | 2 +- drivers/regulator/stm32-vrefbuf.c | 2 +- include/linux/regulator/driver.h | 3 ++- 6 files changed, 11 insertions(+), 9 deletions(-)
drivers/platform/x86/intel/int3472/clk_and_regulator.c +2 -1
@@ -185,7 +185,8 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, cfg.init_data = &init_data; cfg.ena_gpiod = int3472->regulator.gpio; - int3472->regulator.rdev =regulator_register (&int3472->regulator.rdesc, + int3472->regulator.rdev =regulator_register (int3472->dev, + &int3472->regulator.rdesc, &cfg);if (IS_ERR (int3472->regulator.rdev)) { ret =PTR_ERR (int3472->regulator.rdev);
drivers/regulator/core.c +4 -4
@@ -5388,6 +5388,7 @@ static struct regulator_coupler generic_regulator_coupler = {/** * regulator_register - register regulator +* @dev: the device that drive the regulator * @regulator_desc: regulator to register * @cfg: runtime configuration for regulator *
@@ -5396,7 +5397,8 @@ static struct regulator_coupler generic_regulator_coupler = {* or an ERR_PTR() on error. */ struct regulator_dev * -regulator_register (const struct regulator_desc *regulator_desc, +regulator_register (struct device *dev, +const struct regulator_desc *regulator_desc,const struct regulator_config *cfg) {const struct regulator_init_data *init_data;
@@ -5405,7 +5407,6 @@ regulator_register(const struct regulator_desc *regulator_desc,struct regulator_dev *rdev;bool dangling_cfg_gpiod = false;bool dangling_of_gpiod = false; -struct device *dev;int ret, i;if (cfg ==NULL )
@@ -5417,8 +5418,7 @@ regulator_register(const struct regulator_desc *regulator_desc, goto rinse; } - dev = cfg->dev; -WARN_ON (!dev); +WARN_ON (!dev || !cfg->dev);if (regulator_desc->name ==NULL || regulator_desc->ops ==NULL ) { ret = -EINVAL ;
drivers/regulator/devres.c +1 -1
@@ -221,7 +221,7 @@ struct regulator_dev *devm_regulator_register(struct device *dev,if (!ptr)return ERR_PTR (-ENOMEM ); - rdev =regulator_register (regulator_desc, config); + rdev =regulator_register (dev, regulator_desc, config);if (!IS_ERR (rdev)) { *ptr = rdev;devres_add (dev, ptr);
drivers/regulator/of_regulator.c +1 -1
@@ -505,7 +505,7 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,struct device_node *child;struct regulator_init_data *init_data =NULL ; - child =regulator_of_get_init_node (dev, desc); + child =regulator_of_get_init_node (config->dev, desc);if (!child)return NULL ;
drivers/regulator/stm32-vrefbuf.c +1 -1
@@ -210,7 +210,7 @@ static int stm32_vrefbuf_probe(struct platform_device *pdev) pdev->dev.of_node, &stm32_vrefbuf_regu); - rdev =regulator_register (&stm32_vrefbuf_regu, &config); + rdev =regulator_register (&pdev->dev, &stm32_vrefbuf_regu, &config);if (IS_ERR (rdev)) { ret =PTR_ERR (rdev);dev_err (&pdev->dev,"register failed with error %d\n" , ret);
include/linux/regulator/driver.h +2 -1
@@ -687,7 +687,8 @@ static inline int regulator_err2notif(int err)struct regulator_dev * -regulator_register (const struct regulator_desc *regulator_desc, +regulator_register (struct device *dev, +const struct regulator_desc *regulator_desc,const struct regulator_config *config);struct regulator_dev * devm_regulator_register(struct device *dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 975/1073 Bluetooth: hci_bcm: Add CYW4373A0 support
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 02d056a3404e20245a69dcb4022a0930085fc5ec ]
CYW4373A0 is a Wi-Fi + Bluetooth combo device from Cypress. This chip is present e.g. on muRata 2AE module.
This chip has additional quirk where the HCI command 0xfc45, used on older chips to switch UART clock from 24 MHz to 48 MHz, to support baudrates over 3 Mbdps, is no longer recognized by this newer chip. This newer chip can configure the 4 Mbdps baudrate without the need to issue HCI command 0xfc45, so add flag to indicate this and do not issue the command on this chip to avoid failure to set 4 Mbdps baud rate.
It is not clear whether there is a way to determine which chip does and which chip does not support the HCI command 0xfc45, other than trial and error.
--- drivers/bluetooth/hci_bcm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_bcm.c +12 -1
@@ -53,11 +53,13 @@* struct bcm_device_data - device specific data * @no_early_set_baudrate: Disallow set baudrate before driver setup() * @drive_rts_on_open: drive RTS signal on ->open() when platform requires it +* @no_uart_clock_set: UART clock set command for >3Mbps mode is unavailable * @max_autobaud_speed: max baudrate supported by device in autobaud mode */ struct bcm_device_data {bool no_early_set_baudrate;bool drive_rts_on_open; +bool no_uart_clock_set;u32 max_autobaud_speed; };
@@ -100,6 +102,7 @@ struct bcm_device_data {* @is_suspended: whether flow control is currently disabled * @no_early_set_baudrate: don't set_baudrate before setup() * @drive_rts_on_open: drive RTS signal on ->open() when platform requires it +* @no_uart_clock_set: UART clock set command for >3Mbps mode is unavailable * @pcm_int_params: keep the initial PCM configuration * @use_autobaud_mode: start Bluetooth device in autobaud mode * @max_autobaud_speed: max baudrate supported by device in autobaud mode
@@ -140,6 +143,7 @@ struct bcm_device {#endif bool no_early_set_baudrate;bool drive_rts_on_open; +bool no_uart_clock_set;bool use_autobaud_mode;u8 pcm_int_params[5 ];u32 max_autobaud_speed;
@@ -172,10 +176,11 @@ static inline void host_set_baudrate(struct hci_uart *hu, unsigned int speed)static int bcm_set_baudrate (struct hci_uart *hu,unsigned int speed) {struct hci_dev *hdev = hu->hdev; +struct bcm_data *bcm = hu->priv;struct sk_buff *skb;struct bcm_update_uart_baud_rate param; -if (speed >3000000 ) { +if (speed >3000000 && !bcm->dev->no_uart_clock_set) {struct bcm_write_uart_clock_setting clock; clock.type =BCM_UART_CLOCK_48MHZ ;
@@ -1529,6 +1534,7 @@ static int bcm_serdev_probe(struct serdev_device *serdev) bcmdev->max_autobaud_speed = data->max_autobaud_speed; bcmdev->no_early_set_baudrate = data->no_early_set_baudrate; bcmdev->drive_rts_on_open = data->drive_rts_on_open; + bcmdev->no_uart_clock_set = data->no_uart_clock_set; }return hci_uart_register_device (&bcmdev->serdev_hu, &bcm_proto);
@@ -1550,6 +1556,10 @@ static struct bcm_device_data bcm43438_device_data = { .drive_rts_on_open = true, }; +static struct bcm_device_data cyw4373a0_device_data = { + .no_uart_clock_set = true, +}; +static struct bcm_device_data cyw55572_device_data = { .max_autobaud_speed =921600 , };
@@ -1566,6 +1576,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { { .compatible = "brcm,bcm4349-bt", .data = &bcm43438_device_data }, { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data }, { .compatible = "brcm,bcm4335a0" }, + { .compatible = "cypress,cyw4373a0-bt", .data = &cyw4373a0_device_data }, { .compatible = "infineon,cyw55572-bt", .data = &cyw55572_device_data }, { }, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 976/1073 Bluetooth: Add quirk to disable extended scanning
In reply to Greg Kroah-HartmanFrom: Sven Peter <[email protected]>
[ Upstream commit 392fca352c7a95e2828d49e7500e26d0c87ca265 ]
Broadcom 4377 controllers found in Apple x86 Macs with the T2 chip claim to support extended scanning when querying supported states,
< HCI Command: LE Read Supported St.. (0x08|0x001c) plen 0
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 12
LE Read Supported States (0x08|0x001c) ncmd 1
Status: Success (0x00)
States: 0x000003ffffffffff[...]
LE Set Extended Scan Parameters (Octet 37 - Bit 5) LE Set Extended Scan Enable (Octet 37 - Bit 6)
[...]
, but then fail to actually implement the extended scanning:
< HCI Command: LE Set Extended Sca.. (0x08|0x0041) plen 8
Own address type: Random (0x01)
Filter policy: Accept all advertisement (0x00)
PHYs: 0x01
Entry 0: LE 1M
Type: Active (0x01)
Interval: 11.250 msec (0x0012)
Window: 11.250 msec (0x0012)Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
LE Set Extended Scan Parameters (0x08|0x0041) ncmd 1
Status: Unknown HCI Command (0x01)--- include/net/bluetooth/hci.h | 10 ++++++++++ include/net/bluetooth/hci_core.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)
include/net/bluetooth/hci.h +10 -0
@@ -274,6 +274,16 @@ enum {* during the hdev->setup vendor callback. */ HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN , + +/* +* When this quirk is set, the HCI_OP_LE_SET_EXT_SCAN_ENABLE command is +* disabled. This is required for some Broadcom controllers which +* erroneously claim to support extended scanning. +* +* This quirk can be set before hci_register_dev is called or +* during the hdev->setup vendor callback. +*/ + HCI_QUIRK_BROKEN_EXT_SCAN, };/* HCI device flags */
include/net/bluetooth/hci_core.h +3 -1
@@ -1681,7 +1681,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);/* Use ext scanning if set ext scan param and ext scan enable is supported */ #define use_ext_scan (dev) (((dev)->commands[37] & 0x20) && \ - ((dev)->commands[37] & 0x40)) + ((dev)->commands[37] & 0x40) && \ + !test_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &(dev)->quirks)) +/* Use ext create connection if command is supported */ #define use_ext_conn (dev) ((dev)->commands[37] & 0x80)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 977/1073 Bluetooth: Add quirk to disable MWS Transport Configuration
In reply to Greg Kroah-HartmanFrom: Sven Peter <[email protected]>
[ Upstream commit ffcb0a445ec2d5753751437706aa0a7ea8351099 ]
Broadcom 4378/4387 controllers found in Apple Silicon Macs claim to support getting MWS Transport Layer Configuration,
< HCI Command: Read Local Supported... (0x04|0x0002) plen 0
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 68
Read Local Supported Commands (0x04|0x0002) ncmd 1
Status: Success (0x00)[...]
Get MWS Transport Layer Configuration (Octet 30 - Bit 3)]
[...]
, but then don't actually allow the required command:
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 15
Get MWS Transport Layer Configuration (0x05|0x000c) ncmd 1
Status: Command Disallowed (0x0c)
Number of transports: 0
Baud rate list: 0 entries
00 00 00 00 00 00 00 00 00 00--- include/net/bluetooth/hci.h | 10 ++++++++++ include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_sync.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-)
include/net/bluetooth/hci.h +10 -0
@@ -284,6 +284,16 @@ enum {* during the hdev->setup vendor callback. */ HCI_QUIRK_BROKEN_EXT_SCAN , + +/* +* When this quirk is set, the HCI_OP_GET_MWS_TRANSPORT_CONFIG command is +* disabled. This is required for some Broadcom controllers which +* erroneously claim to support MWS Transport Layer Configuration. +* +* This quirk can be set before hci_register_dev is called or +* during the hdev->setup vendor callback. +*/ + HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, };/* HCI device flags */
include/net/bluetooth/hci_core.h +3 -0
@@ -1711,6 +1711,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn); ((dev)->le_features[3] & HCI_LE_CIS_PERIPHERAL)#define bis_capable (dev) ((dev)->le_features[3] & HCI_LE_ISO_BROADCASTER) +#define mws_transport_config_capable (dev) (((dev)->commands[30] & 0x08) && \ + (!test_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &(dev)->quirks))) +/* ----- HCI protocols ----- */ #define HCI_PROTO_DEFER 0x01
net/bluetooth/hci_sync.c +1 -1
@@ -3940,7 +3940,7 @@ static int hci_read_local_pairing_opts_sync(struct hci_dev *hdev)/* Get MWS transport configuration if the HCI command is supported */ static int hci_get_mws_transport_config_sync (struct hci_dev *hdev) { -if (!(hdev->commands[30 ] &0x08 )) +if (!mws_transport_config_capable (hdev))return 0 ; return __hci_cmd_sync_status(hdev, HCI_OP_GET_MWS_TRANSPORT_CONFIG,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 978/1073 regulator: core: Fix resolve supply lookup issue
In reply to Greg Kroah-HartmanFrom: ChiYuan Huang <[email protected]>
[ Upstream commit 0debed5b117d11e33cba52870c4dcb64f5911891 ]
Quoted 1 line
From Marek's log, the previous change modify the parent of rdev.
https://lore.kernel.org/all/[email protected]/
In 'regulator_resolve_supply', it uses the parent DT node of rdev as the DT-lookup starting node. But the parent DT node may not exist. This will cause the NULL supply issue.
This patch modify the parent of rdev back to the device that provides from 'regulator_config' in 'regulator_register'.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -5531,7 +5531,7 @@ regulator_register(struct device *dev,/* register with sysfs */ rdev->dev.class = ®ulator_class; - rdev->dev.parent = dev; + rdev->dev.parent = config->dev;dev_set_name (&rdev->dev,"regulator.%lu" , (unsigned long )atomic_inc_return (®ulator_no));dev_set_drvdata (&rdev->dev, rdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 979/1073 crypto: hisilicon/hpre - fix resource leak in remove process
In reply to Greg Kroah-HartmanFrom: Zhiqi Song <[email protected]>
[ Upstream commit 45e6319bd5f2154d8b8c9f1eaa4ac030ba0d330c ]
In hpre_remove(), when the disable operation of qm sriov failed, the following logic should continue to be executed to release the remaining resources that have been allocated, instead of returning directly, otherwise there will be resource leakage.
--- drivers/crypto/hisilicon/hpre/hpre_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/crypto/hisilicon/hpre/hpre_main.c +2 -8
@@ -1287,18 +1287,12 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id)static void hpre_remove (struct pci_dev *pdev) {struct hisi_qm *qm =pci_get_drvdata (pdev); -int ret;hisi_qm_pm_uninit (qm);hisi_qm_wait_task_finish (qm, &hpre_devices);hisi_qm_alg_unregister (qm, &hpre_devices); -if (qm->fun_type ==QM_HW_PF && qm->vfs_num) { - ret =hisi_qm_sriov_disable (pdev, true); -if (ret) { -pci_err (pdev,"Disable SRIOV fail!\n" ); -return ; - } - } +if (qm->fun_type ==QM_HW_PF && qm->vfs_num) +hisi_qm_sriov_disable (pdev, true);hpre_debugfs_exit (qm);hisi_qm_stop (qm,QM_NORMAL );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 980/1073 scsi: lpfc: Fix hard lockup when reading the rx_monitor from debugfs
In reply to Greg Kroah-HartmanFrom: Justin Tee <[email protected]>
[ Upstream commit c44e50f4a0ec00c2298f31f91bc2c3e9bbd81c7e ]
During I/O and simultaneous cat of /sys/kernel/debug/lpfc/fnX/rx_monitor, a hard lockup similar to the call trace below may occur.
The spin_lock_bh in lpfc_rx_monitor_report is not protecting from timer interrupts as expected, so change the strength of the spin lock to _irq.
Kernel panic - not syncing: Hard LOCKUP CPU: 3 PID: 110402 Comm: cat Kdump: loaded
exception RIP: native_queued_spin_lock_slowpath+91
[IRQ stack]
native_queued_spin_lock_slowpath at ffffffffb814e30b _raw_spin_lock at ffffffffb89a667a lpfc_rx_monitor_record at ffffffffc0a73a36 [lpfc] lpfc_cmf_timer at ffffffffc0abbc67 [lpfc] __hrtimer_run_queues at ffffffffb8184250 hrtimer_interrupt at ffffffffb8184ab0 smp_apic_timer_interrupt at ffffffffb8a026ba apic_timer_interrupt at ffffffffb8a01c4f
[End of IRQ stack]
apic_timer_interrupt at ffffffffb8a01c4f lpfc_rx_monitor_report at ffffffffc0a73c80 [lpfc] lpfc_rx_monitor_read at ffffffffc0addde1 [lpfc] full_proxy_read at ffffffffb83e7fc3 vfs_read at ffffffffb833fe71
ksys_read at ffffffffb83402af do_syscall_64 at ffffffffb800430b entry_SYSCALL_64_after_hwframe at ffffffffb8a000ad
--- drivers/scsi/lpfc/lpfc_sli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +3 -3
@@ -8076,10 +8076,10 @@ u32 lpfc_rx_monitor_report(struct lpfc_hba *phba, "IO_cnt", "Info", "BWutil(ms)"); } -/* Needs to be _bh because record is called from timer interrupt +/* Needs to be _irq because record is called from timer interrupt * context */ -spin_lock_bh (ring_lock); +spin_lock_irq (ring_lock);while (*head_idx != *tail_idx) { entry = &ring[*head_idx];
@@ -8123,7 +8123,7 @@ u32 lpfc_rx_monitor_report(struct lpfc_hba *phba,if (cnt >= max_read_entries)break ; } -spin_unlock_bh (ring_lock); +spin_unlock_irq (ring_lock);return cnt; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 981/1073 scsi: ufs: Reduce the START STOP UNIT timeout
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit dcd5b7637c6d442d957f73780a03047413ed3a10 ]
Reduce the START STOP UNIT command timeout to one second since on Android devices a kernel panic is triggered if an attempt to suspend the system takes more than 20 seconds. One second should be enough for the START STOP UNIT command since this command completes in less than a millisecond for the UFS devices I have access to.
--- drivers/ufs/core/ufshcd.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/ufs/core/ufshcd.c +1 -8
@@ -8765,8 +8765,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,struct scsi_device *sdp;unsigned long flags;int ret, retries; -unsigned long deadline; -int32_t remaining;spin_lock_irqsave (hba->host->host_lock, flags); sdp = hba->ufs_device_wlun;
@@ -8799,14 +8797,9 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,* callbacks hence set the RQF_PM flag so that it doesn't resume the * already suspended childs. */ - deadline = jiffies +10 *HZ ;for (retries =3 ; retries >0 ; --retries) { - ret = -ETIMEDOUT ; - remaining = deadline - jiffies; -if (remaining <=0 ) -break ; ret =scsi_execute (sdp, cmd,DMA_NONE ,NULL ,0 ,NULL , &sshdr, - remaining /HZ ,0 ,0 ,RQF_PM ,NULL ); +HZ ,0 ,0 ,RQF_PM ,NULL );if (!scsi_status_is_check_condition (ret) || !scsi_sense_valid (&sshdr) || sshdr.sense_key !=UNIT_ATTENTION )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 982/1073 crypto: hisilicon/qm - increase the memory of local variables
In reply to Greg Kroah-HartmanFrom: Kai Ye <[email protected]>
[ Upstream commit 3efe90af4c0c46c58dba1b306de142827153d9c0 ]
Increase the buffer to prevent stack overflow by fuzz test. The maximum length of the qos configuration buffer is 256 bytes. Currently, the value of the 'val buffer' is only 32 bytes. The sscanf does not check the dest memory length. So the 'val buffer' may stack overflow.
--- drivers/crypto/hisilicon/qm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/crypto/hisilicon/qm.c +1 -2
@@ -252,7 +252,6 @@#define QM_QOS_MIN_CIR_B 100#define QM_QOS_MAX_CIR_U 6#define QM_QOS_MAX_CIR_S 11 -#define QM_QOS_VAL_MAX_LEN 32#define QM_DFX_BASE 0x0100000#define QM_DFX_STATE1 0x0104000#define QM_DFX_STATE2 0x01040C8
@@ -4626,7 +4625,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf, unsigned int *fun_index) {char tbuf_bdf[QM_DBG_READ_LEN ] = {0 }; -char val_buf[QM_QOS_VAL_MAX_LEN ] = {0 }; +char val_buf[QM_DBG_READ_LEN ] = {0 };u32 tmp1, device, function;int ret, bus;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 983/1073 Revert "PCI: Clear PCI_STATUS when setting up device"
In reply to Greg Kroah-HartmanFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit 44e985938e85503d0a69ec538e15fd33c1a4df05 ]
This reverts commit 6cd514e58f12b211d638dbf6f791fa18d854f09c.
Christophe Fergeau reported that 6cd514e58f12 ("PCI: Clear PCI_STATUS when setting up device") causes boot failures when trying to start linux guests with Apple's virtualization framework (for example using
https://developer.apple.com/documentation/virtualization/running_linux_in_a_virtual_machine?language=objc)
6cd514e58f12 only solved a cosmetic problem, so revert it to fix the boot failures.
--- drivers/pci/probe.c | 3 --- 1 file changed, 3 deletions(-)
drivers/pci/probe.c +0 -3
@@ -1890,9 +1890,6 @@ int pci_setup_device(struct pci_dev *dev) dev->broken_intx_masking =pci_intx_mask_broken (dev); -/* Clear errors left from system firmware */ -pci_write_config_word (dev,PCI_STATUS ,0xffff ); -switch (dev->hdr_type) {/* header type */ case PCI_HEADER_TYPE_NORMAL :/* standard header */ if (class ==PCI_CLASS_BRIDGE_PCI )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 984/1073 scsi: elx: libefc: Fix second parameter type in state callbacks
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 3d75e766b58a7410d4e835c534e1b4664a8f62d0 ]
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/scsi/elx/libefc/efc_node.c:811:22: error: incompatible function pointer types assigning to 'void (*)(struct efc_sm_ctx *, u32, void *)' (aka 'void (*)(struct efc_sm_ctx *, unsigned int, void *)') from 'void (*)(struct efc_sm_ctx *, enum efc_sm_event, void *)' [-Werror,-Wincompatible-function-pointer-types-strict]
ctx->current_state = state;
^ ~~~~~
drivers/scsi/elx/libefc/efc_node.c:878:21: error: incompatible function pointer types assigning to 'void (*)(struct efc_sm_ctx *, u32, void *)' (aka 'void (*)(struct efc_sm_ctx *, unsigned int, void *)') from 'void (*)(struct efc_sm_ctx *, enum efc_sm_event, void *)' [-Werror,-Wincompatible-function-pointer-types-strict]
node->nodedb_state = state;
^ ~~~~~
drivers/scsi/elx/libefc/efc_node.c:905:6: error: incompatible function pointer types assigning to 'void (*)(struct efc_sm_ctx *, enum efc_sm_event, void *)' from 'void (*)(struct efc_sm_ctx *, u32, void *)' (aka 'void (*)(struct efc_sm_ctx *, unsigned int, void *)') [-Werror,-Wincompatible-function-pointer-types-strict]
pf = node->nodedb_state;
^ ~~~~~~~~~~~~~~~~~~
drivers/scsi/elx/libefc/efc_device.c:455:22: error: incompatible function pointer types assigning to 'void (*)(struct efc_sm_ctx *, u32, void *)' (aka 'void (*)(struct efc_sm_ctx *, unsigned int, void *)') from 'void (struct efc_sm_ctx *, enum efc_sm_event, void *)' [-Werror,-Wincompatible-function-pointer-types-strict]
node->nodedb_state = __efc_d_init;
^ ~~~~~~~~~~~~
drivers/scsi/elx/libefc/efc_sm.c:41:22: error: incompatible function pointer types assigning to 'void (*)(struct efc_sm_ctx *, u32, void *)' (aka 'void (*)(struct efc_sm_ctx *, unsigned int, void *)') from 'void (*)(struct efc_sm_ctx *, enum efc_sm_event, void *)' [-Werror,-Wincompatible-function-pointer-types-strict]
ctx->current_state = state;
^ ~~~~~The type of the second parameter in the prototypes of ->current_state() and ->nodedb_state() ('u32') does not match the implementations, which have a second parameter type of 'enum efc_sm_event'. Update the prototypes to have the correct second parameter type, clearing up all the warnings and CFI failures.
--- drivers/scsi/elx/libefc/efclib.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/elx/libefc/efclib.h +4 -2
@@ -58,10 +58,12 @@ enum efc_node_send_ls_acc {#define EFC_LINK_STATUS_UP 0#define EFC_LINK_STATUS_DOWN 1 +enum efc_sm_event ; +/* State machine context header */ struct efc_sm_ctx {void (*current_state)(struct efc_sm_ctx *ctx, -u32 evt,void *arg); +enum efc_sm_event evt,void *arg);const char *description;void *app;
@@ -365,7 +367,7 @@ struct efc_node {int prev_evt;void (*nodedb_state)(struct efc_sm_ctx *ctx, -u32 evt,void *arg); +enum efc_sm_event evt,void *arg);struct timer_list gidpt_delay_timer;u64 time_last_gidpt_msec;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 985/1073 hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param()
In reply to Greg Kroah-HartmanFrom: Hawkins Jiawei <[email protected]>
[ Upstream commit 26215b7ee923b9251f7bb12c4e5f09dc465d35f2 ]
Syzkaller reports a null-ptr-deref bug as follows:
======================================================
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:hugetlbfs_parse_param+0x1dd/0x8e0 fs/hugetlbfs/inode.c:1380 [...] Call Trace: <TASK> vfs_parse_fs_param fs/fs_context.c:148 [inline] vfs_parse_fs_param+0x1f9/0x3c0 fs/fs_context.c:129 vfs_parse_fs_string+0xdb/0x170 fs/fs_context.c:191 generic_parse_monolithic+0x16f/0x1f0 fs/fs_context.c:231 do_new_mount fs/namespace.c:3036 [inline] path_mount+0x12de/0x1e20 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __x64_sys_mount+0x27f/0x300 fs/namespace.c:3568 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] </TASK> ======================================================
According to commit "vfs: parse: deal with zero length string value", kernel will set the param->string to null pointer in vfs_parse_fs_string() if fs string has zero length.
Yet the problem is that, hugetlbfs_parse_param() will dereference the param->string, without checking whether it is a null pointer. To be more specific, if hugetlbfs_parse_param() parses an illegal mount parameter, such as "size=,", kernel will constructs struct fs_parameter with null pointer in vfs_parse_fs_string(), then passes this struct fs_parameter to hugetlbfs_parse_param(), which triggers the above null-ptr-deref bug.
This patch solves it by adding sanity check on param->string in hugetlbfs_parse_param().
--- fs/hugetlbfs/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/hugetlbfs/inode.c +3 -3
@@ -1256,7 +1256,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *parcase Opt_size:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->max_size_opt =memparse (param->string, &rest); ctx->max_val_type =SIZE_STD ;
@@ -1266,7 +1266,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *parcase Opt_nr_inodes:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->nr_inodes =memparse (param->string, &rest);return 0 ;
@@ -1282,7 +1282,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *parcase Opt_min_size:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->min_size_opt =memparse (param->string, &rest); ctx->min_val_type =SIZE_STD ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 986/1073 scsi: smartpqi: Add new controller PCI IDs
In reply to Greg Kroah-HartmanFrom: Mike McGowen <[email protected]>
[ Upstream commit 0b93cf2a9097b1c3d75642ef878ba87f15f03043 ]
All PCI ID entries in Hex.
Add PCI IDs for ByteDance controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
ByteHBA JGH43024-8 9005 / 028f / 1e93 / 1000
ByteHBA JGH43034-8 9005 / 028f / 1e93 / 1001
ByteHBA JGH44014-8 9005 / 028f / 1e93 / 1002Add PCI IDs for new Inspur controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
INSPUR RT0800M7E 9005 / 028f / 1bd4 / 0086
INSPUR RT0800M7H 9005 / 028f / 1bd4 / 0087
INSPUR RT0804M7R 9005 / 028f / 1bd4 / 0088
INSPUR RT0808M7R 9005 / 028f / 1bd4 / 0089Add PCI IDs for new FAB A controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
Adaptec SmartRAID 3254-16e /e 9005 / 028f / 9005 / 1475
Adaptec HBA 1200-16e 9005 / 028f / 9005 / 14c3
Adaptec HBA 1200-8e 9005 / 028f / 9005 / 14c4Add H3C controller PCI IDs:
VID / DID / SVID / SDID
---- ---- ---- ----
H3C H4508-Mf-8i 9005 / 028f / 193d / 110b--- drivers/scsi/smartpqi/smartpqi_init.c | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +44 -0
@@ -9302,6 +9302,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x193d ,0x1109 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x193d ,0x110b ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x193d ,0x8460 )
@@ -9402,6 +9406,22 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1bd4 ,0x0072 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1bd4 ,0x0086 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1bd4 ,0x0087 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1bd4 ,0x0088 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1bd4 ,0x0089 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x19e5 ,0xd227 )
@@ -9650,6 +9670,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADAPTEC2 ,0x1474 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_ADAPTEC2 ,0x1475 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADAPTEC2 ,0x1480 )
@@ -9706,6 +9730,14 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADAPTEC2 ,0x14c2 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_ADAPTEC2 ,0x14c3 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_ADAPTEC2 ,0x14c4 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADAPTEC2 ,0x14d0 )
@@ -9942,6 +9974,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0623 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1e93 ,0x1000 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1e93 ,0x1001 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1e93 ,0x1002 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_ANY_ID ,PCI_ANY_ID )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 987/1073 scsi: smartpqi: Correct device removal for multi-actuator devices
In reply to Greg Kroah-HartmanFrom: Kumar Meiyappan <[email protected]>
[ Upstream commit cc9befcbbb5ebce77726f938508700d913530035 ]
Correct device count for multi-actuator drives which can cause kernel panics.
--- drivers/scsi/smartpqi/smartpqi.h | 2 +- drivers/scsi/smartpqi/smartpqi_init.c | 33 +++++++++++++++++++-------- 2 files changed, 25 insertions(+), 10 deletions(-)
drivers/scsi/smartpqi/smartpqi.h +1 -1
@@ -1130,7 +1130,7 @@ struct pqi_scsi_dev {u8 phy_id;u8 ncq_prio_enable;u8 ncq_prio_support; -u8 multi_lun_device_lun_count; +u8 lun_count;bool raid_bypass_configured;/* RAID bypass configured */ bool raid_bypass_enabled;/* RAID bypass enabled */ u32 next_bypass_group[RAID_MAP_MAX_DATA_DISKS_PER_ROW ];
drivers/scsi/smartpqi/smartpqi_init.c +24 -9
@@ -1610,9 +1610,7 @@ static int pqi_get_physical_device_info(struct pqi_ctrl_info *ctrl_info, &id_phys->alternate_paths_phys_connector, sizeof(device->phys_connector)); device->bay = id_phys->phys_bay_in_box; - device->multi_lun_device_lun_count = id_phys->multi_lun_device_lun_count; -if (!device->multi_lun_device_lun_count) - device->multi_lun_device_lun_count =1 ; + device->lun_count = id_phys->multi_lun_device_lun_count;if ((id_phys->even_more_flags &PQI_DEVICE_PHY_MAP_SUPPORTED ) && id_phys->phy_count) device->phy_id =
@@ -1746,7 +1744,7 @@ static bool pqi_keep_device_offline(struct pqi_ctrl_info *ctrl_info,return offline; } -static int pqi_get_device_info (struct pqi_ctrl_info *ctrl_info, +static int pqi_get_device_info_phys_logical (struct pqi_ctrl_info *ctrl_info,struct pqi_scsi_dev *device,struct bmic_identify_physical_device *id_phys) {
@@ -1763,6 +1761,20 @@ static int pqi_get_device_info(struct pqi_ctrl_info *ctrl_info,return rc; } +static int pqi_get_device_info (struct pqi_ctrl_info *ctrl_info, +struct pqi_scsi_dev *device, +struct bmic_identify_physical_device *id_phys) +{ +int rc; + + rc =pqi_get_device_info_phys_logical (ctrl_info, device, id_phys); + +if (rc ==0 && device->lun_count ==0 ) + device->lun_count =1 ; + +return rc; +} +static void pqi_show_volume_status (struct pqi_ctrl_info *ctrl_info,struct pqi_scsi_dev *device) {
@@ -1897,7 +1909,7 @@ static inline void pqi_remove_device(struct pqi_ctrl_info *ctrl_info, struct pqiint rc;int lun; -for (lun =0 ; lun < device->multi_lun_device_lun_count; lun++) { +for (lun =0 ; lun < device->lun_count; lun++) { rc =pqi_device_wait_for_pending_io (ctrl_info, device, lun,PQI_REMOVE_DEVICE_PENDING_IO_TIMEOUT_MSECS );if (rc)
@@ -2076,6 +2088,7 @@ static void pqi_scsi_update_device(struct pqi_ctrl_info *ctrl_info, existing_device->sas_address = new_device->sas_address; existing_device->queue_depth = new_device->queue_depth; existing_device->device_offline = false; + existing_device->lun_count = new_device->lun_count;if (pqi_is_logical_device (existing_device)) { existing_device->is_external_raid_device = new_device->is_external_raid_device;
@@ -2108,10 +2121,6 @@ static void pqi_scsi_update_device(struct pqi_ctrl_info *ctrl_info, existing_device->phy_connected_dev_type = new_device->phy_connected_dev_type;memcpy (existing_device->box, new_device->box,sizeof (existing_device->box));memcpy (existing_device->phys_connector, new_device->phys_connector,sizeof (existing_device->phys_connector)); - - existing_device->multi_lun_device_lun_count = new_device->multi_lun_device_lun_count; -if (existing_device->multi_lun_device_lun_count ==0 ) - existing_device->multi_lun_device_lun_count =1 ; } }
@@ -6484,6 +6493,12 @@ static void pqi_slave_destroy(struct scsi_device *sdev)return ; } + device->lun_count--; +if (device->lun_count >0 ) { +mutex_unlock (&ctrl_info->scan_mutex); +return ; + } +spin_lock_irqsave (&ctrl_info->scsi_device_list_lock, flags);list_del (&device->scsi_device_list_entry);spin_unlock_irqrestore (&ctrl_info->scsi_device_list_lock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 988/1073 drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 96d845a67b7e406cfed7880a724c8ca6121e022e ]
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c:74:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = fsl_dcu_drm_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
->mode_valid() in 'struct drm_connector_helper_funcs' expects a return type of 'enum drm_mode_status', not 'int'. Adjust the return type of fsl_dcu_drm_connector_mode_valid() to match the prototype's to resolve the warning and CFI failure.
--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +3 -2
@@ -60,8 +60,9 @@ static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector)return drm_panel_get_modes (fsl_connector->panel, connector); } -static int fsl_dcu_drm_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +fsl_dcu_drm_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {if (mode->hdisplay &0xf )return MODE_ERROR ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 989/1073 drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 0ad811cc08a937d875cbad0149c1bab17f84ba05 ]
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/gpu/drm/sti/sti_hda.c:637:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = sti_hda_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/sti/sti_dvo.c:376:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = sti_dvo_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/sti/sti_hdmi.c:1035:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = sti_hdmi_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
->mode_valid() in 'struct drm_connector_helper_funcs' expects a return type of 'enum drm_mode_status', not 'int'. Adjust the return type of sti_{dvo,hda,hdmi}_connector_mode_valid() to match the prototype's to resolve the warning and CFI failure.
--- drivers/gpu/drm/sti/sti_dvo.c | 5 +++-- drivers/gpu/drm/sti/sti_hda.c | 5 +++-- drivers/gpu/drm/sti/sti_hdmi.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/sti/sti_dvo.c +3 -2
@@ -346,8 +346,9 @@ static int sti_dvo_connector_get_modes(struct drm_connector *connector)#define CLK_TOLERANCE_HZ 50 -static int sti_dvo_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +sti_dvo_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {int target = mode->clock *1000 ;int target_min = target -CLK_TOLERANCE_HZ ;
drivers/gpu/drm/sti/sti_hda.c +3 -2
@@ -601,8 +601,9 @@ static int sti_hda_connector_get_modes(struct drm_connector *connector)#define CLK_TOLERANCE_HZ 50 -static int sti_hda_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +sti_hda_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {int target = mode->clock *1000 ;int target_min = target -CLK_TOLERANCE_HZ ;
drivers/gpu/drm/sti/sti_hdmi.c +3 -2
@@ -1004,8 +1004,9 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)#define CLK_TOLERANCE_HZ 50 -static int sti_hdmi_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +sti_hdmi_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {int target = mode->clock *1000 ;int target_min = target -CLK_TOLERANCE_HZ ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 990/1073 scsi: target: iscsi: Fix a race condition between login_work and the login thread
In reply to Greg Kroah-HartmanFrom: Maurizio Lombardi <[email protected]>
[ Upstream commit fec1b2fa62c162d03f5dcd7b03e3c89d3116d49f ]
In case a malicious initiator sends some random data immediately after a login PDU; the iscsi_target_sk_data_ready() callback will schedule the login_work and, at the same time, the negotiation may end without clearing the LOGIN_FLAGS_INITIAL_PDU flag (because no additional PDU exchanges are required to complete the login).
The login has been completed but the login_work function will find the LOGIN_FLAGS_INITIAL_PDU flag set and will never stop from rescheduling itself; at this point, if the initiator drops the connection, the iscsit_conn structure will be freed, login_work will dereference a released socket structure and the kernel crashes.
BUG: kernel NULL pointer dereference, address: 0000000000000230 PF: supervisor write access in kernel mode PF: error_code(0x0002) - not-present page Workqueue: events iscsi_target_do_login_rx [iscsi_target_mod] RIP: 0010:_raw_read_lock_bh+0x15/0x30 Call trace: iscsi_target_do_login_rx+0x75/0x3f0 [iscsi_target_mod] process_one_work+0x1e8/0x3c0
Fix this bug by forcing login_work to stop after the login has been completed and the socket callbacks have been restored.
Add a comment to clearify the return values of iscsi_target_do_login()
--- drivers/target/iscsi/iscsi_target_nego.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/target/iscsi/iscsi_target_nego.c +10 -2
@@ -1018,6 +1018,13 @@ static int iscsi_target_handle_csg_one(struct iscsit_conn *conn, struct iscsi_loreturn 0 ; } +/* +* RETURN VALUE: +* +* 1 = Login successful +* -1 = Login failed +* 0 = More PDU exchanges required +*/ static int iscsi_target_do_login (struct iscsit_conn *conn,struct iscsi_login *login) {int pdu_count =0 ;
@@ -1363,12 +1370,13 @@ int iscsi_target_start_negotiation( ret =-1 ;if (ret <0 ) { -cancel_delayed_work_sync (&conn->login_work);iscsi_target_restore_sock_callbacks (conn);iscsi_remove_failed_auth_entry (conn); } -if (ret !=0 ) +if (ret !=0 ) { +cancel_delayed_work_sync (&conn->login_work);iscsi_target_nego_release (conn); + }return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 991/1073 orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit d23417a5bf3a3afc55de5442eb46e1e60458b0a1 ]
When insert and remove the orangefs module, then debug_help_string will be leaked:
unreferenced object 0xffff8881652ba000 (size 4096):
comm "insmod", pid 1701, jiffies 4294893639 (age 13218.530s)
hex dump (first 32 bytes):
43 6c 69 65 6e 74 20 44 65 62 75 67 20 4b 65 79 Client Debug Key
77 6f 72 64 73 20 61 72 65 20 75 6e 6b 6e 6f 77 words are unknow
backtrace:
[<0000000004e6f8e3>] kmalloc_trace+0x27/0xa0
[<0000000006f75d85>] orangefs_prepare_debugfs_help_string+0x5e/0x480 [orangefs]
[<0000000091270a2a>] _sub_I_65535_1+0x57/0xf70 [crc_itu_t]
[<000000004b1ee1a3>] do_one_initcall+0x87/0x2a0
[<000000001d0614ae>] do_init_module+0xdf/0x320
[<00000000efef068c>] load_module+0x2f98/0x3330
[<000000006533b44d>] __do_sys_finit_module+0x113/0x1b0
[<00000000a0da6f99>] do_syscall_64+0x35/0x80
[<000000007790b19b>] entry_SYSCALL_64_after_hwframe+0x46/0xb0When remove the module, should always free debug_help_string. Should always free the allocated buffer when change the free_debug_help_string.
--- fs/orangefs/orangefs-debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
fs/orangefs/orangefs-debugfs.c +3 -0
@@ -222,6 +222,8 @@ static void orangefs_kernel_debug_init(void)void orangefs_debugfs_cleanup (void ) {debugfs_remove_recursive (debug_dir); +kfree (debug_help_string); + debug_help_string =NULL ; }/* open ORANGEFS_KMOD_DEBUG_HELP_FILE */
@@ -671,6 +673,7 @@ int orangefs_prepare_debugfs_help_string(int at_boot)memset (debug_help_string,0 ,DEBUG_HELP_STRING_SIZE );strlcat (debug_help_string, new, string_size);mutex_unlock (&orangefs_help_file_lock); +kfree (new); } rc =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 992/1073 orangefs: Fix kmemleak in orangefs_sysfs_init()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 1f2c0e8a587bcafad85019a2d80f158d8d41a868 ]
When insert and remove the orangefs module, there are kobjects memory leaked as below:
unreferenced object 0xffff88810f95af00 (size 64):
comm "insmod", pid 783, jiffies 4294813439 (age 65.512s) hex dump (first 32 bytes):
a0 83 af 01 81 88 ff ff 08 af 95 0f 81 88 ff ff ................
08 af 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000005a6e4dfe>] orangefs_sysfs_init+0x42/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0unreferenced object 0xffff88810f95ae80 (size 64):
comm "insmod", pid 783, jiffies 4294813439 (age 65.512s) hex dump (first 32 bytes):
c8 90 0f 02 81 88 ff ff 88 ae 95 0f 81 88 ff ff ................
88 ae 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000001a4841fa>] orangefs_sysfs_init+0xc7/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0unreferenced object 0xffff88810f95ae00 (size 64):
comm "insmod", pid 783, jiffies 4294813440 (age 65.511s) hex dump (first 32 bytes):
60 87 a1 00 81 88 ff ff 08 ae 95 0f 81 88 ff ff `...............
08 ae 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000005915e797>] orangefs_sysfs_init+0x12b/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0unreferenced object 0xffff88810f95ad80 (size 64):
comm "insmod", pid 783, jiffies 4294813440 (age 65.511s) hex dump (first 32 bytes):
78 90 0f 02 81 88 ff ff 88 ad 95 0f 81 88 ff ff x...............
88 ad 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000007a14eb35>] orangefs_sysfs_init+0x1ac/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0unreferenced object 0xffff88810f95ac00 (size 64):
comm "insmod", pid 783, jiffies 4294813440 (age 65.531s) hex dump (first 32 bytes):
e0 ff 67 02 81 88 ff ff 08 ac 95 0f 81 88 ff ff ..g.............
08 ac 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000001f38adcb>] orangefs_sysfs_init+0x291/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0unreferenced object 0xffff88810f95ab80 (size 64):
comm "insmod", pid 783, jiffies 4294813441 (age 65.530s) hex dump (first 32 bytes):
50 bf 2f 02 81 88 ff ff 88 ab 95 0f 81 88 ff ff P./.............
88 ab 95 0f 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000009cc7d95b>] orangefs_sysfs_init+0x2f5/0x3a0
[<00000000722645ca>] 0xffffffffa02780fe
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0Should add release function for each kobject_type to free the memory.
--- fs/orangefs/orangefs-sysfs.c | 71 ++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 8 deletions(-)
fs/orangefs/orangefs-sysfs.c +63 -8
@@ -896,9 +896,18 @@ static struct attribute *orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (orangefs_default); +static struct kobject *orangefs_obj; + +static void orangefs_obj_release (struct kobject *kobj) +{ +kfree (orangefs_obj); + orangefs_obj =NULL ; +} +static struct kobj_type orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = orangefs_default_groups, + .release = orangefs_obj_release, }; static struct orangefs_attribute acache_hard_limit_attribute =
@@ -934,9 +943,18 @@ static struct attribute *acache_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (acache_orangefs_default); +static struct kobject *acache_orangefs_obj; + +static void acache_orangefs_obj_release (struct kobject *kobj) +{ +kfree (acache_orangefs_obj); + acache_orangefs_obj =NULL ; +} +static struct kobj_type acache_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = acache_orangefs_default_groups, + .release = acache_orangefs_obj_release, }; static struct orangefs_attribute capcache_hard_limit_attribute =
@@ -972,9 +990,18 @@ static struct attribute *capcache_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (capcache_orangefs_default); +static struct kobject *capcache_orangefs_obj; + +static void capcache_orangefs_obj_release (struct kobject *kobj) +{ +kfree (capcache_orangefs_obj); + capcache_orangefs_obj =NULL ; +} +static struct kobj_type capcache_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = capcache_orangefs_default_groups, + .release = capcache_orangefs_obj_release, }; static struct orangefs_attribute ccache_hard_limit_attribute =
@@ -1010,9 +1037,18 @@ static struct attribute *ccache_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (ccache_orangefs_default); +static struct kobject *ccache_orangefs_obj; + +static void ccache_orangefs_obj_release (struct kobject *kobj) +{ +kfree (ccache_orangefs_obj); + ccache_orangefs_obj =NULL ; +} +static struct kobj_type ccache_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = ccache_orangefs_default_groups, + .release = ccache_orangefs_obj_release, }; static struct orangefs_attribute ncache_hard_limit_attribute =
@@ -1048,9 +1084,18 @@ static struct attribute *ncache_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (ncache_orangefs_default); +static struct kobject *ncache_orangefs_obj; + +static void ncache_orangefs_obj_release (struct kobject *kobj) +{ +kfree (ncache_orangefs_obj); + ncache_orangefs_obj =NULL ; +} +static struct kobj_type ncache_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = ncache_orangefs_default_groups, + .release = ncache_orangefs_obj_release, }; static struct orangefs_attribute pc_acache_attribute =
@@ -1079,9 +1124,18 @@ static struct attribute *pc_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (pc_orangefs_default); +static struct kobject *pc_orangefs_obj; + +static void pc_orangefs_obj_release (struct kobject *kobj) +{ +kfree (pc_orangefs_obj); + pc_orangefs_obj =NULL ; +} +static struct kobj_type pc_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = pc_orangefs_default_groups, + .release = pc_orangefs_obj_release, }; static struct orangefs_attribute stats_reads_attribute =
@@ -1103,19 +1157,20 @@ static struct attribute *stats_orangefs_default_attrs[] = { };ATTRIBUTE_GROUPS (stats_orangefs_default); +static struct kobject *stats_orangefs_obj; + +static void stats_orangefs_obj_release (struct kobject *kobj) +{ +kfree (stats_orangefs_obj); + stats_orangefs_obj =NULL ; +} +static struct kobj_type stats_orangefs_ktype = { .sysfs_ops = &orangefs_sysfs_ops, .default_groups = stats_orangefs_default_groups, + .release = stats_orangefs_obj_release, }; -static struct kobject *orangefs_obj; -static struct kobject *acache_orangefs_obj; -static struct kobject *capcache_orangefs_obj; -static struct kobject *ccache_orangefs_obj; -static struct kobject *ncache_orangefs_obj; -static struct kobject *pc_orangefs_obj; -static struct kobject *stats_orangefs_obj; -int orangefs_sysfs_init (void ) {int rc = -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 993/1073 orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 31720a2b109b3080eb77e97b8f6f50a27b4ae599 ]
When insert and remove the orangefs module, there are memory leaked as below:
unreferenced object 0xffff88816b0cc000 (size 2048):
comm "insmod", pid 783, jiffies 4294813439 (age 65.512s) hex dump (first 32 bytes):
6e 6f 6e 65 0a 00 00 00 00 00 00 00 00 00 00 00 none............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000031ab7788>] kmalloc_trace+0x27/0xa0
[<000000005b405fee>] orangefs_debugfs_init.cold+0xaf/0x17f
[<00000000e5a0085b>] 0xffffffffa02780f9
[<000000004232d9f7>] do_one_initcall+0x87/0x2a0
[<0000000054f22384>] do_init_module+0xdf/0x320
[<000000003263bdea>] load_module+0x2f98/0x3330
[<0000000052cd4153>] __do_sys_finit_module+0x113/0x1b0
[<00000000250ae02b>] do_syscall_64+0x35/0x80
[<00000000f11c03c7>] entry_SYSCALL_64_after_hwframe+0x46/0xb0Use the golbal variable as the buffer rather than dynamic allocate to slove the problem.
--- fs/orangefs/orangefs-debugfs.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
fs/orangefs/orangefs-debugfs.c +3 -23
@@ -194,15 +194,10 @@ void orangefs_debugfs_init(int debug_mask)*/ static void orangefs_kernel_debug_init (void ) { -int rc = -ENOMEM ; -char *k_buffer =NULL ; +static char k_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN ] = { };gossip_debug (GOSSIP_DEBUGFS_DEBUG ,"%s: start\n" , __func__); - k_buffer =kzalloc (ORANGEFS_MAX_DEBUG_STRING_LEN ,GFP_KERNEL ); -if (!k_buffer) - goto out; -if (strlen (kernel_debug_string) +1 <ORANGEFS_MAX_DEBUG_STRING_LEN ) {strcpy (k_buffer, kernel_debug_string);strcat (k_buffer,"\n" );
@@ -213,9 +208,6 @@ static void orangefs_kernel_debug_init(void)debugfs_create_file (ORANGEFS_KMOD_DEBUG_FILE ,0444 , debug_dir, k_buffer, &kernel_debug_fops); - -out: -gossip_debug (GOSSIP_DEBUGFS_DEBUG ,"%s: rc:%d:\n" , __func__, rc); }
@@ -299,18 +291,13 @@ static int help_show(struct seq_file *m, void *v)/* * initialize the client-debug file. */ -static int orangefs_client_debug_init (void ) +static void orangefs_client_debug_init (void ) { -int rc = -ENOMEM ; -char *c_buffer =NULL ; +static char c_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN ] = { };gossip_debug (GOSSIP_DEBUGFS_DEBUG ,"%s: start\n" , __func__); - c_buffer =kzalloc (ORANGEFS_MAX_DEBUG_STRING_LEN ,GFP_KERNEL ); -if (!c_buffer) - goto out; -if (strlen (client_debug_string) +1 <ORANGEFS_MAX_DEBUG_STRING_LEN ) {strcpy (c_buffer, client_debug_string);strcat (c_buffer,"\n" );
@@ -324,13 +311,6 @@ static int orangefs_client_debug_init(void) debug_dir, c_buffer, &kernel_debug_fops); - - rc =0 ; - -out: - -gossip_debug (GOSSIP_DEBUGFS_DEBUG ,"%s: rc:%d:\n" , __func__, rc); -return rc; }/* open ORANGEFS_KMOD_DEBUG_FILE or ORANGEFS_CLIENT_DEBUG_FILE.*/
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 994/1073 clk: renesas: r8a779f0: Add SDH0 clock
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 9b5dd1ff705c68549f7a2a91dd8beee14bc543e1 ]
Stable-dep-of: 1e56ebc9872f ("clk: renesas: r8a779f0: Add TMU and parent SASYNC clocks")
--- drivers/clk/renesas/r8a779f0-cpg-mssr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/renesas/r8a779f0-cpg-mssr.c +2 -1
@@ -108,7 +108,8 @@ static const struct cpg_core_clk r8a779f0_core_clks[] __initconst = {DEF_FIXED ("cbfusa" ,R8A779F0_CLK_CBFUSA ,CLK_EXTAL ,2 ,1 ),DEF_FIXED ("cpex" ,R8A779F0_CLK_CPEX ,CLK_EXTAL ,2 ,1 ), -DEF_GEN4_SD ("sd0" ,R8A779F0_CLK_SD0 ,CLK_SDSRC ,0x870 ), +DEF_GEN4_SDH ("sdh0" ,R8A779F0_CLK_SD0H ,CLK_SDSRC ,0x870 ), +DEF_GEN4_SD ("sd0" ,R8A779F0_CLK_SD0 ,R8A779F0_CLK_SD0H ,0x870 ),DEF_BASE ("rpc" ,R8A779F0_CLK_RPC ,CLK_TYPE_GEN4_RPC ,CLK_RPCSRC ), DEF_BASE("rpcd2", R8A779F0_CLK_RPCD2, CLK_TYPE_GEN4_RPCD2, R8A779F0_CLK_RPC),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 995/1073 clk: renesas: r8a779f0: Add TMU and parent SASYNC clocks
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1e56ebc9872feb2cf9a002c0a23d79a68f6493cb ]
--- drivers/clk/renesas/r8a779f0-cpg-mssr.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/clk/renesas/r8a779f0-cpg-mssr.c +10 -0
@@ -108,6 +108,11 @@ static const struct cpg_core_clk r8a779f0_core_clks[] __initconst = {DEF_FIXED ("cbfusa" ,R8A779F0_CLK_CBFUSA ,CLK_EXTAL ,2 ,1 ),DEF_FIXED ("cpex" ,R8A779F0_CLK_CPEX ,CLK_EXTAL ,2 ,1 ), +DEF_FIXED ("sasyncrt" ,R8A779F0_CLK_SASYNCRT ,CLK_PLL5_DIV4 ,48 ,1 ), +DEF_FIXED ("sasyncperd1" ,R8A779F0_CLK_SASYNCPERD1 ,CLK_PLL5_DIV4 ,3 ,1 ), +DEF_FIXED ("sasyncperd2" ,R8A779F0_CLK_SASYNCPERD2 ,R8A779F0_CLK_SASYNCPERD1 ,2 ,1 ), +DEF_FIXED ("sasyncperd4" ,R8A779F0_CLK_SASYNCPERD4 ,R8A779F0_CLK_SASYNCPERD1 ,4 ,1 ), +DEF_GEN4_SDH ("sdh0" ,R8A779F0_CLK_SD0H ,CLK_SDSRC ,0x870 ), DEF_GEN4_SD("sd0", R8A779F0_CLK_SD0, R8A779F0_CLK_SD0H, 0x870),
@@ -140,6 +145,11 @@ static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {DEF_MOD ("sdhi0" ,706 ,R8A779F0_CLK_SD0 ),DEF_MOD ("sys-dmac0" ,709 ,R8A779F0_CLK_S0D3_PER ),DEF_MOD ("sys-dmac1" ,710 ,R8A779F0_CLK_S0D3_PER ), +DEF_MOD ("tmu0" ,713 ,R8A779F0_CLK_SASYNCRT ), +DEF_MOD ("tmu1" ,714 ,R8A779F0_CLK_SASYNCPERD2 ), +DEF_MOD ("tmu2" ,715 ,R8A779F0_CLK_SASYNCPERD2 ), +DEF_MOD ("tmu3" ,716 ,R8A779F0_CLK_SASYNCPERD2 ), +DEF_MOD ("tmu4" ,717 ,R8A779F0_CLK_SASYNCPERD2 ),DEF_MOD ("wdt" ,907 ,R8A779F0_CLK_R ),DEF_MOD ("pfc0" ,915 ,R8A779F0_CLK_CL16M ), DEF_MOD("tsc", 919, R8A779F0_CLK_CL16M),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 996/1073 hwmon: (jc42) Fix missing unlock on error in jc42_write()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b744db17abf6a2efc2bfa80870cc88e9799a8ccc ]
Add the missing unlock before return from function jc42_write() in the error handling case.
--- drivers/hwmon/jc42.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/jc42.c +1 -1
@@ -350,7 +350,7 @@ static int jc42_write(struct device *dev, enum hwmon_sensor_types type, ret =regmap_read (data->regmap,JC42_REG_TEMP_CRITICAL , ®val);if (ret) -return ret; +break ;/* * JC42.4 compliant chips only support four hysteresis values.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 997/1073 ASoC: sof_es8336: fix possible use-after-free in sof_es8336_remove()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 1b41beaa7a58467505ec3023af8aad74f878b888 ]
sof_es8336_remove() calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This means that the callback function may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling cancel_delayed_work_sync(), which ensures that the work is properly cancelled, no longer running, and unable to re-schedule itself.
--- sound/soc/intel/boards/sof_es8336.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/sof_es8336.c +1 -1
@@ -782,7 +782,7 @@ static int sof_es8336_remove(struct platform_device *pdev)struct snd_soc_card *card =platform_get_drvdata (pdev);struct sof_es8336_private *priv =snd_soc_card_get_drvdata (card); -cancel_delayed_work (&priv->pcm_pop_work); +cancel_delayed_work_sync (&priv->pcm_pop_work);gpiod_put (priv->gpio_speakers);device_remove_software_node (priv->codec_dev);put_device (priv->codec_dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 998/1073 ALSA: hda: add snd_hdac_stop_streams() helper
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 24ad3835a6db4f8857975effa6bf47730371a5ff ]
Minor code reuse, no functionality change.
Stable-dep-of: 171107237246 ("ASoC: Intel: Skylake: Fix driver hang during shutdown")
--- include/sound/hdaudio.h | 1 + sound/hda/hdac_stream.c | 17 ++++++++++++++--- sound/pci/hda/hda_controller.c | 4 +--- 3 files changed, 16 insertions(+), 6 deletions(-)
include/sound/hdaudio.h +1 -0
@@ -562,6 +562,7 @@ int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,void snd_hdac_stream_start (struct hdac_stream *azx_dev,bool fresh_start);void snd_hdac_stream_clear (struct hdac_stream *azx_dev);void snd_hdac_stream_stop (struct hdac_stream *azx_dev); +void snd_hdac_stop_streams (struct hdac_bus *bus);void snd_hdac_stop_streams_and_chip (struct hdac_bus *bus);void snd_hdac_stream_reset (struct hdac_stream *azx_dev); void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,
sound/hda/hdac_stream.c +14 -3
@@ -142,17 +142,28 @@ void snd_hdac_stream_stop(struct hdac_stream *azx_dev) }EXPORT_SYMBOL_GPL (snd_hdac_stream_stop); +/** +* snd_hdac_stop_streams - stop all streams +* @bus: HD-audio core bus +*/ +void snd_hdac_stop_streams (struct hdac_bus *bus) +{ +struct hdac_stream *stream; + +list_for_each_entry (stream, &bus->stream_list, list) +snd_hdac_stream_stop (stream); +} +EXPORT_SYMBOL_GPL (snd_hdac_stop_streams); +/** * snd_hdac_stop_streams_and_chip - stop all streams and chip if running * @bus: HD-audio core bus */ void snd_hdac_stop_streams_and_chip (struct hdac_bus *bus) { -struct hdac_stream *stream;if (bus->chip_init) { -list_for_each_entry (stream, &bus->stream_list, list) -snd_hdac_stream_stop (stream); +snd_hdac_stop_streams (bus);snd_hdac_bus_stop_chip (bus); } }
sound/pci/hda/hda_controller.c +1 -3
@@ -1033,10 +1033,8 @@ EXPORT_SYMBOL_GPL(azx_init_chip);void azx_stop_all_streams (struct azx *chip) {struct hdac_bus *bus =azx_bus (chip); -struct hdac_stream *s; -list_for_each_entry (s, &bus->stream_list, list) -snd_hdac_stream_stop (s); +snd_hdac_stop_streams (bus); }EXPORT_SYMBOL_GPL (azx_stop_all_streams);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 999/1073 ASoC: Intel: Skylake: Fix driver hang during shutdown
In reply to Greg Kroah-HartmanFrom: Cezary Rojewski <[email protected]>
[ Upstream commit 171107237246d66bce04f3769d33648f896b4ce3 ]
AudioDSP cores and HDAudio links need to be turned off on shutdown to ensure no communication or data transfer occurs during the procedure.
--- sound/soc/intel/skylake/skl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl.c +4 -1
@@ -1097,7 +1097,10 @@ static void skl_shutdown(struct pci_dev *pci)if (!skl->init_done)return ; -snd_hdac_stop_streams_and_chip (bus); +snd_hdac_stop_streams (bus); +snd_hdac_ext_bus_link_power_down_all (bus); +skl_dsp_sleep (skl->dsp); +list_for_each_entry (s, &bus->stream_list, list) { stream =stream_to_hdac_ext_stream (s);snd_hdac_ext_stream_decouple (bus, stream, false);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1000/1073 ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 3327d721114c109ba0575f86f8fda3b525404054 ]
The node returned by of_parse_phandle() with refcount incremented, of_node_put() needs be called when finish using it. So add it in the error path in mt8173_rt5650_rt5514_dev_probe().
--- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +5 -2
@@ -200,14 +200,16 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev)if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S ].codecs[0 ].of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto out; } mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node =of_parse_phandle (pdev->dev.of_node,"mediatek,audio-codec" ,1 );if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto out; } mt8173_rt5650_rt5514_codec_conf[0 ].dlc.of_node = mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node;
@@ -216,6 +218,7 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) ret =devm_snd_soc_register_card (&pdev->dev, card); +out:of_node_put (platform_node);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1001/1073 ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 8ab2d12c726f0fde0692fa5d81d8019b3dcd62d0 ]
The of_get_next_child() returns a node with refcount incremented, and decrements the refcount of prev. So in the error path of the while loop, of_node_put() needs be called for cpu_ep.
--- sound/soc/generic/audio-graph-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/generic/audio-graph-card.c +3 -1
@@ -485,8 +485,10 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv,of_node_put (codec_ep);of_node_put (codec_port); -if (ret <0 ) +if (ret <0 ) { +of_node_put (cpu_ep);return ret; + } codec_port_old = codec_port; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1002/1073 ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume()
In reply to Greg Kroah-HartmanFrom: Wang Jingjin <[email protected]>
[ Upstream commit ef0a098efb36660326c133af9b5a04a96a00e3ca ]
The clk_disable_unprepare() should be called in the error handling of rockchip_pdm_runtime_resume().
--- sound/soc/rockchip/rockchip_pdm.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/rockchip/rockchip_pdm.c +1 -0
@@ -431,6 +431,7 @@ static int rockchip_pdm_runtime_resume(struct device *dev) ret =clk_prepare_enable (pdm->hclk);if (ret) { +clk_disable_unprepare (pdm->clk);dev_err (pdm->dev,"hclock enable failed %d\n" , ret);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1003/1073 ASoC: mediatek: mt8183: fix refcount leak in mt8183_mt6358_ts3a227_max98357_dev_probe()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 38eef3be38ab895959c442702864212cc3beb96c ]
The node returned by of_parse_phandle() with refcount incremented, of_node_put() needs be called when finish using it. So add it in the error path in mt8183_mt6358_ts3a227_max98357_dev_probe().
--- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +10 -4
@@ -644,8 +644,10 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) } card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); -if (!card) +if (!card) { +of_node_put (platform_node);return -EINVAL ; + } card->dev = &pdev->dev; ec_codec =of_parse_phandle (pdev->dev.of_node,"mediatek,ec-codec" ,0 );
@@ -734,8 +736,10 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) } priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; +if (!priv) { + ret = -ENOMEM ; + goto out; + }snd_soc_card_set_drvdata (card, priv);
@@ -743,7 +747,8 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)if (IS_ERR (priv->pinctrl)) {dev_err (&pdev->dev,"%s devm_pinctrl_get failed\n" , __func__); -return PTR_ERR (priv->pinctrl); + ret =PTR_ERR (priv->pinctrl); + goto out; }for (i =0 ; i <PIN_STATE_MAX ; i++) {
@@ -776,6 +781,7 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) ret =devm_snd_soc_register_card (&pdev->dev, card); +out:of_node_put (platform_node);of_node_put (ec_codec);of_node_put (hdmi_codec);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1004/1073 ALSA: hda/hdmi: fix i915 silent stream programming flow
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit ada261b690ecd5c2f55f0c51bdf11d852a4561a6 ]
The i915 display codec may not successfully transition to normal audio streaming mode, if the stream id is programmed while codec is actively transmitting data. This can happen when silent stream is enabled in KAE mode.
Fix the issue by implementing a i915 specific programming flow, where the silent streaming is temporarily stopped, a small delay is applied to ensure display codec becomes idle, and then proceed with reprogramming the stream ID.
--- sound/pci/hda/patch_hdmi.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
sound/pci/hda/patch_hdmi.c +26 -2
@@ -2963,9 +2963,33 @@ static int i915_hsw_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid, hda_nid_t pin_nid, int dev_id, u32 stream_tag, int format) { + struct hdmi_spec *spec = codec->spec; +int pin_idx =pin_id_to_pin_index (codec, pin_nid, dev_id); +struct hdmi_spec_per_pin *per_pin; +int res; + +if (pin_idx <0 ) + per_pin =NULL ; +else + per_pin =get_pin (spec, pin_idx); +haswell_verify_D0 (codec, cvt_nid, pin_nid); -return hdmi_setup_stream (codec, cvt_nid, pin_nid, dev_id, - stream_tag, format); + +if (spec->silent_stream_type ==SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) { +silent_stream_set_kae (codec, per_pin, false); +/* wait for pending transfers in codec to clear */ +usleep_range (100 ,200 ); + } + + res =hdmi_setup_stream (codec, cvt_nid, pin_nid, dev_id, + stream_tag, format); + +if (spec->silent_stream_type ==SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) { +usleep_range (100 ,200 ); +silent_stream_set_kae (codec, per_pin, true); + } + +return res; }/* pin_cvt_fixup ops override for HSW+ and VLV+ */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1005/1073 ALSA: hda/hdmi: set default audio parameters for KAE silent-stream
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit b17e7ea041d8b565063632501ca4597afd105102 ]
If the stream-id is zero, the keep-alive (KAE) will only ensure clock is generated, but no audio samples are sent over display link. This happens before first real audio stream is played out to a newly connected receiver.
Reuse the code in silent_stream_enable() to set up stream parameters to sane defaults values, also when using the newer keep-alive flow.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1788,6 +1788,7 @@ static void silent_stream_enable(struct hda_codec *codec,switch (spec->silent_stream_type) {case SILENT_STREAM_KAE : +silent_stream_enable_i915 (codec, per_pin);silent_stream_set_kae (codec, per_pin, true);break ;case SILENT_STREAM_I915 :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1006/1073 ALSA: hda/hdmi: Use only dynamic PCM device allocation
In reply to Greg Kroah-HartmanFrom: Jaroslav Kysela <[email protected]>
[ Upstream commit ef6f5494faf6a37c74990689a3bb3cee76d2544c ]
Per discussion on the alsa-devel mailing list [1], the legacy PIN to PCM device mapping is obsolete nowadays. The maximum number of the simultaneously usable PCM devices is equal to the HDMI codec converters.
Remove the extra PCM devices (beyond the detected converters) and force the use of the dynamic PCM device allocation. The legacy code is removed.
I believe that all HDMI codecs have the jack sensing feature. Move the check to the codec probe function and print a warning, if a codec without this feature is detected.
[1] https://lore.kernel.org/alsa-devel/[email protected]/
Stable-dep-of: ee0b089d6600 ("ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend")
--- include/sound/hda_codec.h | 1 - sound/pci/hda/patch_hdmi.c | 153 +++++++----------------------------- sound/soc/codecs/hda.c | 3 - sound/soc/codecs/hdac_hda.c | 3 - 4 files changed, 28 insertions(+), 132 deletions(-)
include/sound/hda_codec.h +0 -1
@@ -258,7 +258,6 @@ struct hda_codec { unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ unsigned int forced_resume:1; /* forced resume for jack */ - unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/patch_hdmi.c +28 -125
272 lines not on this page · raw message
sound/soc/codecs/hda.c +0 -3
@@ -224,9 +224,6 @@ static int hda_codec_probe(struct snd_soc_component *component) goto err; } -/* configure codec for 1:1 PCM:DAI mapping */ - codec->mst_no_extra_pcms =1 ; - ret =snd_hda_codec_parse_pcms (codec);if (ret <0 ) {dev_err (&hdev->dev,"unable to map pcms to dai %d\n" , ret);
sound/soc/codecs/hdac_hda.c +0 -3
@@ -461,9 +461,6 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)dev_dbg (&hdev->dev,"no patch file found\n" ); } -/* configure codec for 1:1 PCM:DAI mapping */ - hcodec->mst_no_extra_pcms =1 ; - ret =snd_hda_codec_parse_pcms (hcodec);if (ret <0 ) {dev_err (&hdev->dev,"unable to map pcms to dai %d\n" , ret);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1007/1073 ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit ee0b089d660021792e4ab4dda191b097ce1e964f ]
When the new style KAE keep-alive implementation is used on compatible Intel hardware, the clocks are maintained when codec is in D3. The generic code in hda_cleanup_all_streams() can however interfere with generation of audio samples in this mode, by setting the stream and channel ids to zero.
To get full benefit of the keepalive, set the new no_stream_clean_at_suspend quirk bit on affected Intel hardware. When this bit is set, stream cleanup is skipped in hda_call_codec_suspend().
Special handling is needed for the case when system goes to suspend. The stream id programming can be lost in this case. This will also cause codec->cvt_setups to be out of sync. Handle this by implementing custom suspend/resume handlers. If keep-alive is active for any converter, set the quirk flags no_stream_clean_at_suspend and forced_resume. Upon resume, keepalive programming is restored if needed.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_codec.c | 3 +- sound/pci/hda/patch_hdmi.c | 90 +++++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 2 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -258,6 +258,7 @@ struct hda_codec { unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ unsigned int forced_resume:1; /* forced resume for jack */ + unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/hda_codec.c +2 -1
@@ -2893,7 +2893,8 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec)snd_hdac_enter_pm (&codec->core);if (codec->patch_ops.suspend) codec->patch_ops.suspend (codec); -hda_cleanup_all_streams (codec); +if (!codec->no_stream_clean_at_suspend) +hda_cleanup_all_streams (codec); state =hda_set_power_state (codec,AC_PWRST_D3 );update_power_acct (codec, true);snd_hdac_leave_pm (&codec->core);
sound/pci/hda/patch_hdmi.c +89 -1
103 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1008/1073 ASoC: wm8994: Fix potential deadlock
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 9529dc167ffcdfd201b9f0eda71015f174095f7e ]
Fix this by dropping wm8994->accdet_lock while calling cancel_delayed_work_sync(&wm8994->mic_work) in wm1811_jackdet_irq().
--- sound/soc/codecs/wm8994.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/wm8994.c +5 -0
@@ -3853,7 +3853,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) }else {dev_dbg (component->dev,"Jack not detected\n" ); +/* Release wm8994->accdet_lock to avoid deadlock: +* cancel_delayed_work_sync() takes wm8994->mic_work internal +* lock and wm1811_mic_work takes wm8994->accdet_lock */ +mutex_unlock (&wm8994->accdet_lock);cancel_delayed_work_sync (&wm8994->mic_work); +mutex_lock (&wm8994->accdet_lock);snd_soc_component_update_bits (component,WM8958_MICBIAS2 ,WM8958_MICB2_DISCH ,WM8958_MICB2_DISCH );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1009/1073 ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume()
In reply to Greg Kroah-HartmanFrom: Wang Jingjin <[email protected]>
[ Upstream commit 6d94d0090527b1763872275a7ccd44df7219b31e ]
rk_spdif_runtime_resume() may have called clk_prepare_enable() before return from failed branches, add missing clk_disable_unprepare() in this case.
--- sound/soc/rockchip/rockchip_spdif.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/rockchip/rockchip_spdif.c +1 -0
@@ -88,6 +88,7 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev) ret =clk_prepare_enable (spdif->hclk);if (ret) { +clk_disable_unprepare (spdif->mclk);dev_err (spdif->dev,"hclk clock enable failed %d\n" , ret);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1010/1073 ASoC: rt5670: Remove unbalanced pm_runtime_put()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 6c900dcc3f7331a67ed29739d74524e428d137fb ]
For some reason rt5670_i2c_probe() does a pm_runtime_put() at the end of a successful probe. But it has never done a pm_runtime_get() leading to the following error being logged into dmesg:
rt5670 i2c-10EC5640:00: Runtime PM usage count underflow!
Fix this by removing the unnecessary pm_runtime_put().
--- sound/soc/codecs/rt5670.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/rt5670.c +0 -2
@@ -3311,8 +3311,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c)if (ret <0 ) goto err; -pm_runtime_put (&i2c->dev); -return 0 ; err:pm_runtime_disable (&i2c->dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1011/1073 drm/i915/display: Dont disable DDI/Transcoder when setting phy test pattern
In reply to Greg Kroah-HartmanFrom: Khaled Almahallawy <[email protected]>
[ Upstream commit 3153eebb7a76e663ac76d6670dc113296de96622 ]
Bspecs has updated recently to remove the restriction to disable DDI/Transcoder before setting PHY test pattern. This update is to address PHY compliance test failures observed on a port with LTTPR. The issue is that when Transc. is disabled, the main link signals fed to LTTPR will be dropped invalidating link training, which will affect the quality of the phy test pattern when the transcoder is enabled again.
v2: Update commit message (Clint)
v3: Add missing Signed-off in v2
v4: Update Bspec and commit message for pre-gen12 (Jani)
Bspec: 50482, 7555
--- drivers/gpu/drm/i915/display/intel_dp.c | 59 ------------------------- 1 file changed, 59 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +0 -59
@@ -3641,61 +3641,6 @@ static void intel_dp_phy_pattern_update(struct intel_dp *intel_dp, } } -static void -intel_dp_autotest_phy_ddi_disable (struct intel_dp *intel_dp, -const struct intel_crtc_state *crtc_state) -{ -struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); -enum pipe pipe = crtc->pipe; -u32 trans_ddi_func_ctl_value, trans_conf_value, dp_tp_ctl_value; - - trans_ddi_func_ctl_value =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (pipe)); - trans_conf_value =intel_de_read (dev_priv,PIPECONF (pipe)); - dp_tp_ctl_value =intel_de_read (dev_priv,TGL_DP_TP_CTL (pipe)); - - trans_ddi_func_ctl_value &= ~(TRANS_DDI_FUNC_ENABLE | -TGL_TRANS_DDI_PORT_MASK ); - trans_conf_value &= ~PIPECONF_ENABLE ; - dp_tp_ctl_value &= ~DP_TP_CTL_ENABLE ; - -intel_de_write (dev_priv,PIPECONF (pipe), trans_conf_value); -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (pipe), - trans_ddi_func_ctl_value); -intel_de_write (dev_priv,TGL_DP_TP_CTL (pipe), dp_tp_ctl_value); -} - -static void -intel_dp_autotest_phy_ddi_enable (struct intel_dp *intel_dp, -const struct intel_crtc_state *crtc_state) -{ -struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = dig_port->base.port; -struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); -enum pipe pipe = crtc->pipe; -u32 trans_ddi_func_ctl_value, trans_conf_value, dp_tp_ctl_value; - - trans_ddi_func_ctl_value =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (pipe)); - trans_conf_value =intel_de_read (dev_priv,PIPECONF (pipe)); - dp_tp_ctl_value =intel_de_read (dev_priv,TGL_DP_TP_CTL (pipe)); - - trans_ddi_func_ctl_value |=TRANS_DDI_FUNC_ENABLE | -TGL_TRANS_DDI_SELECT_PORT (port); - trans_conf_value |=PIPECONF_ENABLE ; - dp_tp_ctl_value |=DP_TP_CTL_ENABLE ; - -intel_de_write (dev_priv,PIPECONF (pipe), trans_conf_value); -intel_de_write (dev_priv,TGL_DP_TP_CTL (pipe), dp_tp_ctl_value); -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (pipe), - trans_ddi_func_ctl_value); -} -static void intel_dp_process_phy_request (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) {
@@ -3714,14 +3659,10 @@ static void intel_dp_process_phy_request(struct intel_dp *intel_dp,intel_dp_get_adjust_train (intel_dp, crtc_state,DP_PHY_DPRX , link_status); -intel_dp_autotest_phy_ddi_disable (intel_dp, crtc_state); -intel_dp_set_signal_levels (intel_dp, crtc_state,DP_PHY_DPRX );intel_dp_phy_pattern_update (intel_dp, crtc_state); -intel_dp_autotest_phy_ddi_enable (intel_dp, crtc_state); -drm_dp_dpcd_write (&intel_dp->aux,DP_TRAINING_LANE0_SET , intel_dp->train_set, crtc_state->lane_count);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1012/1073 LoadPin: Ignore the "contents" argument of the LSM hooks
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 1a17e5b513ceebf21100027745b8731b4728edf7 ]
LoadPin only enforces the read-only origin of kernel file reads. Whether or not it was a partial read isn't important. Remove the overly conservative checks so that things like partial firmware reads will succeed (i.e. reading a firmware header).
--- security/loadpin/loadpin.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
security/loadpin/loadpin.c +18 -12
@@ -120,21 +120,11 @@ static void loadpin_sb_free_security(struct super_block *mnt_sb) } } -static int loadpin_read_file (struct file *file,enum kernel_read_file_id id, -bool contents) +static int loadpin_check (struct file *file,enum kernel_read_file_id id) {struct super_block *load_root;const char *origin =kernel_read_file_id_str (id); -/* -* If we will not know that we'll be seeing the full contents -* then we cannot trust a load will be complete and unchanged -* off disk. Treat all contents=false hooks as if there were -* no associated file struct. -*/ -if (!contents) - file =NULL ; -/* If the file id is excluded, ignore the pinning. */ if ((unsigned int )id <ARRAY_SIZE (ignore_read_file_id) && ignore_read_file_id[id]) {
@@ -190,9 +180,25 @@ static int loadpin_read_file(struct file *file, enum kernel_read_file_id id,return 0 ; } +static int loadpin_read_file (struct file *file,enum kernel_read_file_id id, +bool contents) +{ +/* +* LoadPin only cares about the _origin_ of a file, not its +* contents, so we can ignore the "are full contents available" +* argument here. +*/ +return loadpin_check (file, id); +} +static int loadpin_load_data (enum kernel_load_data_id id,bool contents) { -return loadpin_read_file (NULL , (enum kernel_read_file_id ) id, contents); +/* +* LoadPin only cares about the _origin_ of a file, not its +* contents, so a NULL file is passed, and we can ignore the +* state of "contents". +*/ +return loadpin_check (NULL , (enum kernel_read_file_id ) id); } static struct security_hook_list loadpin_hooks[] __lsm_ro_after_init = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1013/1073 lkdtm: cfi: Make PAC test work with GCC 7 and 8
In reply to Greg Kroah-HartmanFrom: Kristina Martsenko <[email protected]>
[ Upstream commit f68022ae0aeb0803450e05abc0e984027c33ef1b ]
The CFI test uses the branch-protection=none compiler attribute to disable PAC return address protection on a function. While newer GCC versions support this attribute, older versions (GCC 7 and 8) instead supported the sign-return-address=none attribute, leading to a build failure when the test is built with older compilers. Fix it by checking which attribute is supported and using the correct one.
--- drivers/misc/lkdtm/cfi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/lkdtm/cfi.c +5 -1
@@ -51,7 +51,11 @@ static void lkdtm_CFI_FORWARD_PROTO(void)# ifdef CONFIG_ARM64_BTI_KERNEL # define __no_pac "branch-protection=bti"# else -# define __no_pac "branch-protection=none" +# ifdef CONFIG_CC_HAS_BRANCH_PROT_PAC_RET +# define __no_pac "branch-protection=none" +# else +# define __no_pac "sign-return-address=none" +# endif # endif # define __no_ret_protection __noscs __attribute__((__target__(__no_pac)))#else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1014/1073 pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
[ Upstream commit 76d62f24db07f22ccf9bc18ca793c27d4ebef721 ]
Wei Wang reported seeing priority inversion caused latencies caused by contention on pmsg_lock, and suggested it be switched to a rt_mutex.
I was initially hesitant this would help, as the tasks in that trace all seemed to be SCHED_NORMAL, so the benefit would be limited to only nice boosting.
However, another similar issue was raised where the priority inversion was seen did involve a blocked RT task so it is clear this would be helpful in that case.
--- fs/pstore/pmsg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/pstore/pmsg.c +4 -3
@@ -7,9 +7,10 @@#include <linux/device.h> #include <linux/fs.h> #include <linux/uaccess.h> +#include <linux/rtmutex.h> #include "internal.h" -static DEFINE_MUTEX (pmsg_lock); +static DEFINE_RT_MUTEX (pmsg_lock);static ssize_t write_pmsg (struct file *file,const char __user *buf,size_t count,loff_t *ppos)
@@ -28,9 +29,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,if (!access_ok (buf, count))return -EFAULT ; -mutex_lock (&pmsg_lock); +rt_mutex_lock (&pmsg_lock); ret = psinfo->write_user (&record, buf); -mutex_unlock (&pmsg_lock); +rt_mutex_unlock (&pmsg_lock);return ret ? ret : count; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1015/1073 drm/amd/pm: avoid large variable on kernel stack
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit d118b18fb1da02b41df2da78cb2794b3638d89cd ]
The activity_monitor_external[] array is too big to fit on the kernel stack, resulting in this warning with clang:
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1438:12: error: stack frame size (1040) exceeds limit (1024) in 'smu_v13_0_7_get_power_profile_mode' [-Werror,-Wframe-larger-than]
Use dynamic allocation instead. It should also be possible to have single element here instead of the array, but this seems easier.
v2: fix up argument to sizeof() (Alex)
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +16 -5
@@ -1436,7 +1436,7 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu,static int smu_v13_0_7_get_power_profile_mode (struct smu_context *smu,char *buf) { -DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT ]; +DpmActivityMonitorCoeffIntExternal_t *activity_monitor_external;uint32_t i, j, size =0 ;int16_t workload_type =0 ;int result =0 ;
@@ -1444,6 +1444,12 @@ static int smu_v13_0_7_get_power_profile_mode(struct smu_context *smu, char *bufif (!buf)return -EINVAL ; + activity_monitor_external =kcalloc (PP_SMC_POWER_PROFILE_COUNT , +sizeof (*activity_monitor_external), +GFP_KERNEL ); +if (!activity_monitor_external) +return -ENOMEM ; + size +=sysfs_emit_at (buf, size," " );for (i =0 ; i <=PP_SMC_POWER_PROFILE_WINDOW3D ; i++) size += sysfs_emit_at(buf, size, "%-14s%s", amdgpu_pp_profile_name[i],
@@ -1456,15 +1462,17 @@ static int smu_v13_0_7_get_power_profile_mode(struct smu_context *smu, char *buf workload_type =smu_cmn_to_asic_specific_index (smu,CMN2ASIC_MAPPING_WORKLOAD , i); -if (workload_type <0 ) -return -EINVAL ; +if (workload_type <0 ) { + result = -EINVAL ; + goto out; + } result =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF , workload_type, (void *)(&activity_monitor_external[i]), false);if (result) {dev_err (smu->adev->dev,"[%s] Failed to get activity monitor!" , __func__); -return result; + goto out; } }
@@ -1492,7 +1500,10 @@ do { \PRINT_DPM_MONITOR (Fclk_BoosterFreq);#undef PRINT_DPM_MONITOR -return size; + result = size; +out: +kfree (activity_monitor_external); +return result; }static int smu_v13_0_7_set_power_profile_mode (struct smu_context *smu,long *input,uint32_t size)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1016/1073 perf debug: Set debug_peo_args and redirect_to_stderr variable to correct values in perf_quiet_option()
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit 188ac720d364035008a54d249cf47b4cc100f819 ]
When perf uses quiet mode, perf_quiet_option() sets the 'debug_peo_args' variable to -1, and display_attr() incorrectly determines the value of 'debug_peo_args'. As a result, unexpected information is displayed.
Before:
# perf record --quiet -- ls > /dev/null
------------------------------------------------------------
perf_event_attr:
size 128
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|PERIOD
read_format ID|LOST
disabled 1
inherit 1
mmap 1
comm 1
freq 1
enable_on_exec 1
task 1
precise_ip 3
sample_id_all 1
exclude_guest 1
mmap2 1
comm_exec 1
ksymbol 1
bpf_event 1
------------------------------------------------------------
...After:
# perf record --quiet -- ls > /dev/null #
redirect_to_stderr is a similar problem.
--- tools/perf/util/debug.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/util/debug.c +4 -0
@@ -241,6 +241,10 @@ int perf_quiet_option(void) opt++; } +/* For debug variables that are used as bool types, set to 0. */ + redirect_to_stderr =0 ; + debug_peo_args =0 ; +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1017/1073 MIPS: ralink: mt7621: avoid to init common ralink reset controller
In reply to Greg Kroah-HartmanFrom: Sergio Paracuellos <[email protected]>
[ Upstream commit 76ce51798cb16738a4a28a6662e7344aaf7ef769 ]
Commit 38a8553b0a22 ("clk: ralink: make system controller node a reset provider") make system controller a reset provider for mt7621 ralink SoCs. Ralink init code also tries to start previous common reset controller which at the end tries to find device tree node 'ralink,rt2880-reset'. mt7621 device tree file is not using at all this node anymore. Hence avoid to init this common reset controller for mt7621 ralink SoCs to avoid 'Failed to find reset controller node' boot error trace error.
--- arch/mips/ralink/of.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/mips/ralink/of.c +3 -1
@@ -21,6 +21,7 @@#include <asm/bootinfo.h> #include <asm/addrspace.h> #include <asm/prom.h> +#include <asm/mach-ralink/ralink_regs.h> #include "common.h"
@@ -81,7 +82,8 @@ static int __init plat_of_setup(void)__dt_register_buses (soc_info.compatible,"palmbus" );/* make sure that the reset controller is setup early */ -ralink_rst_init (); +if (ralink_soc !=MT762X_SOC_MT7621AT ) +ralink_rst_init ();return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1018/1073 perf test: Fix "all PMU test" to skip parametrized events
In reply to Greg Kroah-HartmanFrom: Michael Petlan <[email protected]>
[ Upstream commit b50d691e50e600fab82b423be871860537d75dc9 ]
Parametrized events are not only a powerpc domain. They occur on other platforms too (e.g. aarch64). They should be ignored in this testcase, since proper setup of the parameters is out of scope of this script.
Let's not filter them out by PMU name, but rather based on the fact that they expect a parameter.
--- tools/perf/tests/shell/stat_all_pmu.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
tools/perf/tests/shell/stat_all_pmu.sh +2 -11
@@ -4,17 +4,8 @@ set -e -for p in $(perf list --raw-dump pmu); do - # In powerpc, skip the events for hv_24x7 and hv_gpci. - # These events needs input values to be filled in for - # core, chip, partition id based on system. - # Example: hv_24x7/CPM_ADJUNCT_INST,domain=?,core=?/ - # hv_gpci/event,partition_id=?/ - # Hence skip these events for ppc. - if echo "$p" |grep -Eq 'hv_24x7|hv_gpci' ; then - echo "Skipping: Event '$p' in powerpc" - continue - fi +# Test all PMU events; however exclude parametrized ones (name contains '?') +for p in $(perf list --raw-dump pmu | sed 's/[[:graph:]]\+?[[:graph:]]\+[[:space:]]//g'); do echo "Testing $p" result=$(perf stat -e "$p" true 2>&1) if ! echo "$result" | grep -q "$p" && ! echo "$result" | grep -q "<not supported>" ; then
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1019/1073 afs: Fix lost servers_outstanding count
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 36f82c93ee0bd88f1c95a52537906b8178b537f1 ]
The afs_fs_probe_dispatcher() work function is passed a count on net->servers_outstanding when it is scheduled (which may come via its timer). This is passed back to the work_item, passed to the timer or dropped at the end of the dispatcher function.
But, at the top of the dispatcher function, there are two checks which skip the rest of the function: if the network namespace is being destroyed or if there are no fileservers to probe. These two return paths, however, do not drop the count passed to the dispatcher, and so, sometimes, the destruction of a network namespace, such as induced by rmmod of the kafs module, may get stuck in afs_purge_servers(), waiting for net->servers_outstanding to become zero.
Fix this by adding the missing decrements in afs_fs_probe_dispatcher().
--- fs/afs/fs_probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/afs/fs_probe.c +4 -1
@@ -366,12 +366,15 @@ void afs_fs_probe_dispatcher(struct work_struct *work)unsigned long nowj, timer_at, poll_at;bool first_pass = true, set_timer = false; -if (!net->live) +if (!net->live) { +afs_dec_servers_outstanding (net);return ; + }_enter ("" );if (list_empty (&net->fs_probe_fast) &&list_empty (&net->fs_probe_slow)) { +afs_dec_servers_outstanding (net);_leave (" [none]" );return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1020/1073 pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXES
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
[ Upstream commit 2f4fec5943407318b9523f01ce1f5d668c028332 ]
In commit 76d62f24db07 ("pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion") I changed a lock to an rt_mutex.
However, its possible that CONFIG_RT_MUTEXES is not enabled, which then results in a build failure, as the 0day bot detected:
https://lore.kernel.org/linux-mm/[email protected]/
Thus this patch changes CONFIG_PSTORE_PMSG to select CONFIG_RT_MUTEXES, which ensures the build will not fail.
--- fs/pstore/Kconfig | 1 + 1 file changed, 1 insertion(+)
fs/pstore/Kconfig +1 -0
@@ -126,6 +126,7 @@ config PSTORE_CONSOLE config PSTORE_PMSG bool "Log user space messages" depends on PSTORE + select RT_MUTEXES help When the option is enabled, pstore will export a character interface /dev/pmsg0 to log user space messages. On reboot
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1021/1073 ima: Simplify ima_lsm_copy_rule
In reply to Greg Kroah-HartmanFrom: GUO Zihua <[email protected]>
[ Upstream commit d57378d3aa4d864d9e590482602068af1b20c0c5 ]
Currently ima_lsm_copy_rule() set the arg_p field of the source rule to NULL, so that the source rule could be freed afterward. It does not make sense for this behavior to be inside a "copy" function. So move it outside and let the caller handle this field.
ima_lsm_copy_rule() now produce a shallow copy of the original entry including args_p field. Meaning only the lsm.rule and the rule itself should be freed for the original rule. Thus, instead of calling ima_lsm_free_rule() which frees lsm.rule as well as args_p field, free the lsm.rule directly.
--- security/integrity/ima/ima_policy.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
security/integrity/ima/ima_policy.c +3 -7
@@ -398,12 +398,6 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry) nentry->lsm[i].type = entry->lsm[i].type; nentry->lsm[i].args_p = entry->lsm[i].args_p; -/* -* Remove the reference from entry so that the associated -* memory will not be freed during a later call to -* ima_lsm_free_rule(entry). -*/ - entry->lsm[i].args_p =NULL ; ima_filter_rule_init(nentry->lsm[i].type, Audit_equal, nentry->lsm[i].args_p,
@@ -417,6 +411,7 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry)static int ima_lsm_update_rule (struct ima_rule_entry *entry) { +int i;struct ima_rule_entry *nentry; nentry =ima_lsm_copy_rule (entry);
@@ -431,7 +426,8 @@ static int ima_lsm_update_rule(struct ima_rule_entry *entry)* references and the entry itself. All other memory references will now * be owned by nentry. */ -ima_lsm_free_rule (entry); +for (i =0 ; i <MAX_LSM_RULES ; i++) +ima_filter_rule_free (entry->lsm[i].rule);kfree (entry);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1022/1073 Input: iqs7222 - avoid sending empty SYN_REPORT events
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 514c13b1faed74e9bc19061b6d7c78d53a3402ba ]
Add a check to prevent sending undefined events, which ultimately map to SYN_REPORT.
--- drivers/input/misc/iqs7222.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/input/misc/iqs7222.c +3 -0
@@ -2314,6 +2314,9 @@ static int iqs7222_report(struct iqs7222_private *iqs7222)int k =2 + j * (num_chan >16 ?2 :1 );u16 state =le16_to_cpu (status[k + i /16 ]); +if (!iqs7222->kp_type[i][j]) +continue ; + input_event(iqs7222->keypad, iqs7222->kp_type[i][j], iqs7222->kp_code[i][j],
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1023/1073 dt-bindings: input: iqs7222: Reduce linux,code to optional
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit ccad486525c49df2fe2e7090990522547dfd2785 ]
Following a recent refactor of the driver to properly drop unused device nodes, the 'linux,code' property is now optional. This can be useful for applications that define GPIO-mapped events that do not correspond to any keycode.
--- Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml | 6 ------ 1 file changed, 6 deletions(-)
Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml +0 -6
@@ -473,9 +473,6 @@ patternProperties: Specifies whether the event is to be interpreted as a key (1) or a switch (5). - required: - - linux,code - additionalProperties: false dependencies:
@@ -620,9 +617,6 @@ patternProperties: GPIO, they must all be of the same type (proximity, touch or slider gesture). - required: - - linux,code - additionalProperties: false required:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1024/1073 dt-bindings: input: iqs7222: Correct minimum slider size
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 99d03b54ef8506771c15deb714396665592f6adf ]
The minimum slider size enforced by the driver is 1 or 16 for the IQS7222C or IQS7222A, respectively.
--- Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml +2 -1
@@ -498,7 +498,7 @@ patternProperties: azoteq,slider-size: $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 0 + minimum: 1 maximum: 65535 description: Specifies the slider's one-dimensional resolution, equal to the
@@ -687,6 +687,7 @@ allOf: properties: azoteq,slider-size: multipleOf: 16 + minimum: 16 maximum: 4080 azoteq,top-speed:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1025/1073 dt-bindings: input: iqs7222: Add support for IQS7222A v1.13+
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 97384a65c5e304ccab0477751546f5519d9371c3 ]
IQS7222A revisions 1.13 and later widen the gesture multiplier from x4 ms to x16 ms; update the binding accordingly.
As part of this change, refresh the corresponding properties in the example as well.
--- .../bindings/input/azoteq,iqs7222.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml +8 -8
@@ -572,9 +572,9 @@ patternProperties: linux,code: true azoteq,gesture-max-ms: - multipleOf: 4 + multipleOf: 16 minimum: 0 - maximum: 1020 + maximum: 4080 description: Specifies the length of time (in ms) within which a tap, swipe or flick gesture must be completed in order to be acknowledged
@@ -582,9 +582,9 @@ patternProperties: gesture applies to all remaining swipe or flick gestures. azoteq,gesture-min-ms: - multipleOf: 4 + multipleOf: 16 minimum: 0 - maximum: 124 + maximum: 496 description: Specifies the length of time (in ms) for which a tap gesture must be held in order to be acknowledged by the device.
@@ -930,14 +930,14 @@ examples: event-tap { linux,code = <KEY_PLAYPAUSE>; - azoteq,gesture-max-ms = <600>; - azoteq,gesture-min-ms = <24>; + azoteq,gesture-max-ms = <400>; + azoteq,gesture-min-ms = <32>; }; event-flick-pos { linux,code = <KEY_NEXTSONG>; - azoteq,gesture-max-ms = <600>; - azoteq,gesture-dist = <816>; + azoteq,gesture-max-ms = <800>; + azoteq,gesture-dist = <800>; }; event-flick-neg {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1026/1073 Input: iqs7222 - trim force communication command
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 10e629d31aacb2348a1e9110c31a29e98b31ce38 ]
According to the datasheets, writing only 0xFF is sufficient to elicit a communication window. Remove the superfluous 0x00 from the force communication command.
--- drivers/input/misc/iqs7222.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/misc/iqs7222.c +1 -1
@@ -1077,7 +1077,7 @@ static int iqs7222_hard_reset(struct iqs7222_private *iqs7222)static int iqs7222_force_comms (struct iqs7222_private *iqs7222) { -u8 msg_buf[] = {0xFF ,0x00 , }; +u8 msg_buf[] = {0xFF , };int ret;/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1027/1073 Input: iqs7222 - add support for IQS7222A v1.13+
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 8d4c313c03f104c69e25ab03058d8955be9dc387 ]
IQS7222A revisions 1.13 and later widen the gesture multiplier from x4 ms to x16 ms. Add a means to scale the gesture timings specified in the device tree based on the revision of the device.
--- drivers/input/misc/iqs7222.c | 111 +++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+)
drivers/input/misc/iqs7222.c +111 -0
@@ -86,7 +86,9 @@ enum iqs7222_reg_key_id {IQS7222_REG_KEY_TOUCH ,IQS7222_REG_KEY_DEBOUNCE ,IQS7222_REG_KEY_TAP , +IQS7222_REG_KEY_TAP_LEGACY ,IQS7222_REG_KEY_AXIAL , +IQS7222_REG_KEY_AXIAL_LEGACY ,IQS7222_REG_KEY_WHEEL ,IQS7222_REG_KEY_NO_WHEEL ,IQS7222_REG_KEY_RESERVED
@@ -202,10 +204,68 @@ struct iqs7222_dev_desc {int allow_offset;int event_offset;int comms_offset; +bool legacy_gesture;struct iqs7222_reg_grp_desc reg_grps[IQS7222_NUM_REG_GRPS ]; };static const struct iqs7222_dev_desc iqs7222_devs[] = { + { + .prod_num =IQS7222_PROD_NUM_A , + .fw_major =1 , + .fw_minor =13 , + .sldr_res =U8_MAX *16 , + .touch_link =1768 , + .allow_offset =9 , + .event_offset =10 , + .comms_offset =12 , + .reg_grps = { + [IQS7222_REG_GRP_STAT ] = { + .base =IQS7222_SYS_STATUS , + .num_row =1 , + .num_col =8 , + }, + [IQS7222_REG_GRP_CYCLE ] = { + .base =0x8000 , + .num_row =7 , + .num_col =3 , + }, + [IQS7222_REG_GRP_GLBL ] = { + .base =0x8700 , + .num_row =1 , + .num_col =3 , + }, + [IQS7222_REG_GRP_BTN ] = { + .base =0x9000 , + .num_row =12 , + .num_col =3 , + }, + [IQS7222_REG_GRP_CHAN ] = { + .base =0xA000 , + .num_row =12 , + .num_col =6 , + }, + [IQS7222_REG_GRP_FILT ] = { + .base =0xAC00 , + .num_row =1 , + .num_col =2 , + }, + [IQS7222_REG_GRP_SLDR ] = { + .base =0xB000 , + .num_row =2 , + .num_col =11 , + }, + [IQS7222_REG_GRP_GPIO ] = { + .base =0xC000 , + .num_row =1 , + .num_col =3 , + }, + [IQS7222_REG_GRP_SYS ] = { + .base =IQS7222_SYS_SETUP , + .num_row =1 , + .num_col =13 , + }, + }, + }, { .prod_num =IQS7222_PROD_NUM_A , .fw_major =1 ,
@@ -215,6 +275,7 @@ static const struct iqs7222_dev_desc iqs7222_devs[] = { .allow_offset = 9, .event_offset = 10, .comms_offset = 12, + .legacy_gesture = true, .reg_grps = { [IQS7222_REG_GRP_STAT] = { .base = IQS7222_SYS_STATUS,
@@ -874,6 +935,16 @@ static const struct iqs7222_prop_desc iqs7222_props[] = { .reg_offset = 9, .reg_shift = 8, .reg_width = 8, + .val_pitch = 16, + .label = "maximum gesture time", + }, + { + .name = "azoteq,gesture-max-ms", + .reg_grp = IQS7222_REG_GRP_SLDR, + .reg_key = IQS7222_REG_KEY_TAP_LEGACY, + .reg_offset = 9, + .reg_shift = 8, + .reg_width = 8, .val_pitch = 4, .label = "maximum gesture time", },
@@ -884,6 +955,16 @@ static const struct iqs7222_prop_desc iqs7222_props[] = { .reg_offset = 9, .reg_shift = 3, .reg_width = 5, + .val_pitch = 16, + .label = "minimum gesture time", + }, + { + .name = "azoteq,gesture-min-ms", + .reg_grp = IQS7222_REG_GRP_SLDR, + .reg_key = IQS7222_REG_KEY_TAP_LEGACY, + .reg_offset = 9, + .reg_shift = 3, + .reg_width = 5, .val_pitch = 4, .label = "minimum gesture time", },
@@ -897,6 +978,16 @@ static const struct iqs7222_prop_desc iqs7222_props[] = { .val_pitch = 16, .label = "gesture distance", }, + { + .name = "azoteq,gesture-dist", + .reg_grp = IQS7222_REG_GRP_SLDR, + .reg_key = IQS7222_REG_KEY_AXIAL_LEGACY, + .reg_offset = 10, + .reg_shift = 8, + .reg_width = 8, + .val_pitch = 16, + .label = "gesture distance", + }, { .name = "azoteq,gesture-max-ms", .reg_grp = IQS7222_REG_GRP_SLDR,
@@ -904,6 +995,16 @@ static const struct iqs7222_prop_desc iqs7222_props[] = { .reg_offset = 10, .reg_shift = 0, .reg_width = 8, + .val_pitch = 16, + .label = "maximum gesture time", + }, + { + .name = "azoteq,gesture-max-ms", + .reg_grp = IQS7222_REG_GRP_SLDR, + .reg_key = IQS7222_REG_KEY_AXIAL_LEGACY, + .reg_offset = 10, + .reg_shift = 0, + .reg_width = 8, .val_pitch = 4, .label = "maximum gesture time", },
@@ -2115,8 +2216,18 @@ static int iqs7222_parse_sldr(struct iqs7222_private *iqs7222,if (!event_node)continue ; +/* +* Depending on the device, gestures are either offered using +* one of two timing resolutions, or are not supported at all. +*/ if (reg_offset) reg_key =IQS7222_REG_KEY_RESERVED ; +else if (dev_desc->legacy_gesture && + iqs7222_sl_events[i].reg_key ==IQS7222_REG_KEY_TAP ) + reg_key =IQS7222_REG_KEY_TAP_LEGACY ; +else if (dev_desc->legacy_gesture && + iqs7222_sl_events[i].reg_key ==IQS7222_REG_KEY_AXIAL ) + reg_key =IQS7222_REG_KEY_AXIAL_LEGACY ;else reg_key = iqs7222_sl_events[i].reg_key;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1028/1073 ALSA: usb-audio: add the quirk for KT0206 device
In reply to Greg Kroah-HartmanFrom: wangdicheng <[email protected]>
commit 696b66ac26ef953aed5783ef26a252ec8f207013 upstream.
Add relevant information to the quirks-table.h file. The test passes and the sound source file plays normally.
--- sound/usb/quirks-table.h | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks-table.h +2 -0
@@ -76,6 +76,8 @@ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f0a) },/* E-Mu 0204 USB */ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f19) }, +/* Ktmicro Usb_audio device */ +{ USB_DEVICE_VENDOR_SPEC(0x31b2, 0x0011) },/* * Creative Technology, Ltd Live! Cam Sync HD [VF0770]
Greg Kroah-Hartman
maintainerPATCH 1029/1073 ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB
In reply to Greg Kroah-HartmanFrom: Edward Pacman <[email protected]>
commit 4bf5bf54476dffe60e6b6d8d539f67309ff599e2 upstream.
Lenovo TianYi510Pro-14IOB (17aa:3742)
require quirk for enabling headset-mic
--- sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
sound/pci/hda/patch_realtek.c +27 -0
@@ -10984,6 +10984,17 @@ static void alc897_fixup_lenovo_headset_ } } +static void alc897_fixup_lenovo_headset_mode (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + spec->parse_flags |=HDA_PINCFG_HEADSET_MIC ; + spec->gen.hp_automute_hook = alc897_hp_automute_hook; + } +} +static const struct coef_fw alc668_coefs[] = {WRITE_COEF (0x01 ,0xbebe ),WRITE_COEF (0x02 ,0xaaaa ),WRITE_COEF (0x03 ,0x0 ),WRITE_COEF (0x04 ,0x0180 ),WRITE_COEF (0x06 ,0x0 ),WRITE_COEF (0x07 ,0x0f80 ),
@@ -11067,6 +11078,8 @@ enum {ALC897_FIXUP_LENOVO_HEADSET_MIC ,ALC897_FIXUP_HEADSET_MIC_PIN ,ALC897_FIXUP_HP_HSMIC_VERB , +ALC897_FIXUP_LENOVO_HEADSET_MODE , + ALC897_FIXUP_HEADSET_MIC_PIN2, }; static const struct hda_fixup alc662_fixups[] = {
@@ -11493,6 +11506,19 @@ static const struct hda_fixup alc662_fix { } }, }, + [ALC897_FIXUP_LENOVO_HEADSET_MODE ] = { + .type =HDA_FIXUP_FUNC , + .v.func = alc897_fixup_lenovo_headset_mode, + }, + [ALC897_FIXUP_HEADSET_MIC_PIN2 ] = { + .type =HDA_FIXUP_PINS , + .v.pins = (const struct hda_pintbl []) { + {0x1a ,0x01a11140 },/* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id =ALC897_FIXUP_LENOVO_HEADSET_MODE + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -11545,6 +11571,7 @@ static const struct snd_pci_quirk alc662SND_PCI_QUIRK (0x17aa ,0x32cb ,"Lenovo ThinkCentre M70" ,ALC897_FIXUP_HEADSET_MIC_PIN ),SND_PCI_QUIRK (0x17aa ,0x32cf ,"Lenovo ThinkCentre M950" ,ALC897_FIXUP_HEADSET_MIC_PIN ),SND_PCI_QUIRK (0x17aa ,0x32f7 ,"Lenovo ThinkCentre M90" ,ALC897_FIXUP_HEADSET_MIC_PIN ), +SND_PCI_QUIRK (0x17aa ,0x3742 ,"Lenovo TianYi510Pro-14IOB" ,ALC897_FIXUP_HEADSET_MIC_PIN2 ),SND_PCI_QUIRK (0x17aa ,0x38af ,"Lenovo Ideapad Y550P" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x3a0d ,"Lenovo Ideapad Y550" ,ALC662_FIXUP_IDEAPAD ), SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),
Greg Kroah-Hartman
maintainerPATCH 1030/1073 ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list
In reply to Greg Kroah-HartmanFrom: Jiao Zhou <[email protected]>
commit 31b573946ea55e1ea0e08ae8e83bcf879b30f83a upstream.
HDMI audio is not working on the HP EliteDesk 800 G6 because the pin is unconnected. This issue can be resolved by using the 'hdajackretask' tool to override the unconnected pin to force it to connect.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1976,6 +1976,7 @@ static int hdmi_add_cvt(struct hda_codecstatic const struct snd_pci_quirk force_connect_list[] = {SND_PCI_QUIRK (0x103c ,0x870f ,"HP" ,1 ),SND_PCI_QUIRK (0x103c ,0x871a ,"HP" ,1 ), +SND_PCI_QUIRK (0x103c ,0x8711 ,"HP" ,1 ),SND_PCI_QUIRK (0x1462 ,0xec94 ,"MS-7C94" ,1 ),SND_PCI_QUIRK (0x8086 ,0x2081 ,"Intel NUC 10" ,1 ), {}
Greg Kroah-Hartman
maintainerPATCH 1031/1073 HID: logitech-hidpp: Guard FF init code against non-USB devices
In reply to Greg Kroah-HartmanFrom: Bastien Nocera <[email protected]>
commit 0e13e7b448005612972eae36c0f698c21d1e2f8a upstream.
The Force Feedback code assumes that all the devices passed to it will be USB devices, but that might not be the case for emulated devices. Guard against a crash by checking the device type before poking at USB properties.
--- drivers/hid/hid-logitech-hidpp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/hid/hid-logitech-hidpp.c +9 -2
@@ -2545,12 +2545,17 @@ static int hidpp_ff_init(struct hidpp_destruct hid_device *hid = hidpp->hid_dev;struct hid_input *hidinput;struct input_dev *dev; -const struct usb_device_descriptor *udesc = &(hid_to_usb_dev (hid)->descriptor); -const u16 bcdDevice =le16_to_cpu (udesc->bcdDevice); +struct usb_device_descriptor *udesc; +u16 bcdDevice;struct ff_device *ff;int error, j, num_slots = data->num_effects;u8 version; +if (!hid_is_usb (hid)) { +hid_err (hid,"device is not USB\n" ); +return -ENODEV ; + } +if (list_empty (&hid->inputs)) {hid_err (hid,"no inputs found\n" );return -ENODEV ;
@@ -2564,6 +2569,8 @@ static int hidpp_ff_init(struct hidpp_de }/* Get firmware release */ + udesc = &(hid_to_usb_dev (hid)->descriptor); + bcdDevice =le16_to_cpu (udesc->bcdDevice); version = bcdDevice &255 ;/* Set supported force feedback capabilities */
Greg Kroah-Hartman
maintainerPATCH 1032/1073 usb: cdnsp: fix lack of ZLP for ep0
In reply to Greg Kroah-HartmanFrom: Pawel Laszczak <[email protected]>
commit ae423ef5d095e09970f52c08020fdbf7f9d87c22 upstream.
Patch implements the handling of ZLP for control transfer. To send the ZLP driver must prepare the extra TRB in TD with length set to zero and TRB type to TRB_NORMAL.
The first TRB must have set TRB_CHAIN flag, TD_SIZE = 1 and TRB type to TRB_DATA.
--- drivers/usb/cdns3/cdnsp-ring.c | 42 +++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)
drivers/usb/cdns3/cdnsp-ring.c +32 -10
@@ -2006,10 +2006,11 @@ int cdnsp_queue_bulk_tx(struct cdnsp_devint cdnsp_queue_ctrl_tx (struct cdnsp_device *pdev,struct cdnsp_request *preq) { -u32 field, length_field, remainder; +u32 field, length_field, zlp =0 ;struct cdnsp_ep *pep = preq->pep;struct cdnsp_ring *ep_ring;int num_trbs; +u32 maxp;int ret; ep_ring =cdnsp_request_to_transfer_ring (pdev, preq);
@@ -2019,26 +2020,33 @@ int cdnsp_queue_ctrl_tx(struct cdnsp_dev/* 1 TRB for data, 1 for status */ num_trbs = (pdev->three_stage_setup) ?2 :1 ; + maxp =usb_endpoint_maxp (pep->endpoint.desc); + +if (preq->request.zero && preq->request.length && + (preq->request.length % maxp ==0 )) { + num_trbs++; + zlp =1 ; + } + ret =cdnsp_prepare_transfer (pdev, preq, num_trbs);if (ret)return ret;/* If there's data, queue data TRBs */ -if (pdev->ep0_expect_in) - field =TRB_TYPE (TRB_DATA ) |TRB_IOC ; -else - field =TRB_ISP |TRB_TYPE (TRB_DATA ) |TRB_IOC ; -if (preq->request.length >0 ) { - remainder =cdnsp_td_remainder (pdev,0 , preq->request.length, - preq->request.length, preq,1 ,0 ); + field =TRB_TYPE (TRB_DATA ); - length_field =TRB_LEN (preq->request.length) | -TRB_TD_SIZE (remainder) |TRB_INTR_TARGET (0 ); +if (zlp) + field |=TRB_CHAIN ; +else + field |=TRB_IOC | (pdev->ep0_expect_in ?0 :TRB_ISP );if (pdev->ep0_expect_in) field |=TRB_DIR_IN ; + length_field =TRB_LEN (preq->request.length) | +TRB_TD_SIZE (zlp) |TRB_INTR_TARGET (0 ); + cdnsp_queue_trb(pdev, ep_ring, true, lower_32_bits(preq->request.dma), upper_32_bits(preq->request.dma), length_field,
@@ -2046,6 +2054,20 @@ int cdnsp_queue_ctrl_tx(struct cdnsp_devTRB_SETUPID (pdev->setup_id) | pdev->setup_speed); +if (zlp) { + field =TRB_TYPE (TRB_NORMAL ) |TRB_IOC ; + +if (!pdev->ep0_expect_in) + field =TRB_ISP ; + +cdnsp_queue_trb (pdev, ep_ring, true, +lower_32_bits (preq->request.dma), +upper_32_bits (preq->request.dma),0 , + field | ep_ring->cycle_state | +TRB_SETUPID (pdev->setup_id) | + pdev->setup_speed); + } + pdev->ep0_stage =CDNSP_DATA_STAGE ; }
Greg Kroah-Hartman
maintainerPATCH 1033/1073 usb: xhci-mtk: fix leakage of shared hcd when fail to set wakeup irq
In reply to Greg Kroah-HartmanFrom: Chunfeng Yun <[email protected]>
commit 03a88b0bafbe3f548729d970d8366f48718c9b19 upstream.
Can not set the @shared_hcd to NULL before decrease the usage count by usb_put_hcd(), this will cause the shared hcd not released.
--- drivers/usb/host/xhci-mtk.c | 1 - 1 file changed, 1 deletion(-)
drivers/usb/host/xhci-mtk.c +0 -1
@@ -639,7 +639,6 @@ static int xhci_mtk_probe(struct platfor dealloc_usb3_hcd:usb_remove_hcd (xhci->shared_hcd); - xhci->shared_hcd =NULL ; dealloc_usb2_hcd:usb_remove_hcd (hcd);
Greg Kroah-Hartman
maintainerPATCH 1034/1073 arm64: dts: qcom: sm6350: fix USB-DP PHY registers
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 347b9491c595d5091bfabe65cad2fd6eee786153 upstream.
When adding support for the DisplayPort part of the QMP PHY the binding (and devicetree parser) for the (USB) child node was simply reused and this has lead to some confusion.
The third DP register region is really the DP_PHY region, not "PCS" as the binding claims, and lie at offset 0x2a00 (not 0x2c00).
Similarly, there likely are no "RX", "RX2" or "PCS_MISC" regions as there are for the USB part of the PHY (and in any case the Linux driver does not use them).
Note that the sixth "PCS_MISC" region is not even in the binding.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm6350.dtsi +2 -3
@@ -1007,10 +1007,9 @@ dp_phy: dp-phy@88ea200 { reg = <0 0x088ea200 0 0x200>, <0 0x088ea400 0 0x200>, - <0 0x088eac00 0 0x400>, + <0 0x088eaa00 0 0x200>, <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>, - <0 0x088eaa00 0 0x100>; + <0 0x088ea800 0 0x200>; #phy-cells = <0>; #clock-cells = <1>; };
Greg Kroah-Hartman
maintainerPATCH 1035/1073 arm64: dts: qcom: sm8250: fix USB-DP PHY registers
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit f8d8840c72b3df61b5252052b79020dabec01ab5 upstream.
When adding support for the DisplayPort part of the QMP PHY the binding (and devicetree parser) for the (USB) child node was simply reused and this has lead to some confusion.
The third DP register region is really the DP_PHY region, not "PCS" as the binding claims, and lie at offset 0x2a00 (not 0x2c00).
Similarly, there likely are no "RX", "RX2" or "PCS_MISC" regions as there are for the USB part of the PHY (and in any case the Linux driver does not use them).
Note that the sixth "PCS_MISC" region is not even in the binding.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +2 -3
@@ -2884,10 +2884,9 @@ dp_phy: dp-phy@88ea200 { reg = <0 0x088ea200 0 0x200>, <0 0x088ea400 0 0x200>, - <0 0x088eac00 0 0x400>, + <0 0x088eaa00 0 0x200>, <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>, - <0 0x088eaa00 0 0x100>; + <0 0x088ea800 0 0x200>; #phy-cells = <0>; #clock-cells = <1>; };
Greg Kroah-Hartman
maintainerPATCH 1036/1073 dt-bindings: clocks: imx8mp: Add ID for usb suspend clock
In reply to Greg Kroah-HartmanFrom: Li Jun <[email protected]>
commit 5c1f7f1090947d494c30042123e0ec846f696336 upstream.
usb suspend clock has a gate shared with usb_root_clk.
--- include/dt-bindings/clock/imx8mp-clock.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/dt-bindings/clock/imx8mp-clock.h +2 -1
@@ -324,8 +324,9 @@#define IMX8MP_CLK_CLKOUT2_SEL 317#define IMX8MP_CLK_CLKOUT2_DIV 318#define IMX8MP_CLK_CLKOUT2 319 +#define IMX8MP_CLK_USB_SUSP 320 -#define IMX8MP_CLK_END 320 +#define IMX8MP_CLK_END 321#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1
Greg Kroah-Hartman
maintainerPATCH 1037/1073 clk: imx: imx8mp: add shared clk gate for usb suspend clk
In reply to Greg Kroah-HartmanFrom: Li Jun <[email protected]>
commit ed1f4ccfe947a3e1018a3bd7325134574c7ff9b3 upstream.
32K usb suspend clock gate is shared with usb_root_clk, this shared clock gate was initially defined only for usb suspend clock, usb suspend clk is kept on while system is active or system sleep with usb wakeup enabled, so usb root clock is fine with this situation; with the commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), this clock gate is changed to be for usb root clock, but usb root clock will be off while usb is suspended, so usb suspend clock will be gated too, this cause some usb functionalities will not work, so define this clock to be a shared clock gate to conform with the real HW status.
--- drivers/clk/imx/clk-imx8mp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mp.c +3 -1
@@ -17,6 +17,7 @@static u32 share_count_nand;static u32 share_count_media; +static u32 share_count_usb;static const char *const pll_ref_sels[] = {"osc_24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *const audio_pll1_bypass_sels[] = {"audio_pll1" ,"audio_pll1_ref_sel" , };
@@ -673,7 +674,8 @@ static int imx8mp_clocks_probe(struct pl hws[IMX8MP_CLK_UART2_ROOT ] =imx_clk_hw_gate4 ("uart2_root_clk" ,"uart2" , ccm_base +0x44a0 ,0 ); hws[IMX8MP_CLK_UART3_ROOT ] =imx_clk_hw_gate4 ("uart3_root_clk" ,"uart3" , ccm_base +0x44b0 ,0 ); hws[IMX8MP_CLK_UART4_ROOT ] =imx_clk_hw_gate4 ("uart4_root_clk" ,"uart4" , ccm_base +0x44c0 ,0 ); - hws[IMX8MP_CLK_USB_ROOT ] =imx_clk_hw_gate4 ("usb_root_clk" ,"hsio_axi" , ccm_base +0x44d0 ,0 ); + hws[IMX8MP_CLK_USB_ROOT ] =imx_clk_hw_gate2_shared2 ("usb_root_clk" ,"hsio_axi" , ccm_base +0x44d0 ,0 , &share_count_usb); + hws[IMX8MP_CLK_USB_SUSP ] =imx_clk_hw_gate2_shared2 ("usb_suspend_clk" ,"osc_32k" , ccm_base +0x44d0 ,0 , &share_count_usb); hws[IMX8MP_CLK_USB_PHY_ROOT ] =imx_clk_hw_gate4 ("usb_phy_root_clk" ,"usb_phy_ref" , ccm_base +0x44f0 ,0 ); hws[IMX8MP_CLK_USDHC1_ROOT ] =imx_clk_hw_gate4 ("usdhc1_root_clk" ,"usdhc1" , ccm_base +0x4510 ,0 ); hws[IMX8MP_CLK_USDHC2_ROOT ] =imx_clk_hw_gate4 ("usdhc2_root_clk" ,"usdhc2" , ccm_base +0x4520 ,0 );
Greg Kroah-Hartman
maintainerPATCH 1038/1073 usb: dwc3: Fix race between dwc3_set_mode and __dwc3_set_mode
In reply to Greg Kroah-HartmanFrom: Sven Peter <[email protected]>
commit 62c73bfea048e66168df09da6d3e4510ecda40bb upstream.
dwc->desired_dr_role is changed by dwc3_set_mode inside a spinlock but then read by __dwc3_set_mode outside of that lock. This can lead to a race condition when very quick successive role switch events happen:
CPU A
dwc3_set_mode(DWC3_GCTL_PRTCAP_HOST) // first role switch event spin_lock_irqsave(&dwc->lock, flags); dwc->desired_dr_role = mode; // DWC3_GCTL_PRTCAP_HOST spin_unlock_irqrestore(&dwc->lock, flags); queue_work(system_freezable_wq, &dwc->drd_work);
CPU B
__dwc3_set_mode // .... spin_lock_irqsave(&dwc->lock, flags); // desired_dr_role is DWC3_GCTL_PRTCAP_HOST dwc3_set_prtcap(dwc, dwc->desired_dr_role); spin_unlock_irqrestore(&dwc->lock, flags);
CPU A
dwc3_set_mode(DWC3_GCTL_PRTCAP_DEVICE) // second event spin_lock_irqsave(&dwc->lock, flags); dwc->desired_dr_role = mode; // DWC3_GCTL_PRTCAP_DEVICE spin_unlock_irqrestore(&dwc->lock, flags);
CPU B (continues running __dwc3_set_mode)
switch (dwc->desired_dr_role) { // DWC3_GCTL_PRTCAP_DEVICE
// ....
case DWC3_GCTL_PRTCAP_DEVICE:
// ....
ret = dwc3_gadget_init(dwc);We then have DWC3_GCTL.DWC3_GCTL_PRTCAPDIR = DWC3_GCTL_PRTCAP_HOST and dwc->current_dr_role = DWC3_GCTL_PRTCAP_HOST but initialized the controller in device mode. It's also possible to get into a state where both host and device are intialized at the same time. Fix this race by creating a local copy of desired_dr_role inside __dwc3_set_mode while holding dwc->lock.
--- drivers/usb/dwc3/core.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/usb/dwc3/core.c +10 -6
@@ -122,21 +122,25 @@ static void __dwc3_set_mode(struct work_unsigned long flags;int ret;u32 reg; +u32 desired_dr_role;mutex_lock (&dwc->mutex); +spin_lock_irqsave (&dwc->lock, flags); + desired_dr_role = dwc->desired_dr_role; +spin_unlock_irqrestore (&dwc->lock, flags);pm_runtime_get_sync (dwc->dev);if (dwc->current_dr_role ==DWC3_GCTL_PRTCAP_OTG )dwc3_otg_update (dwc,0 ); -if (!dwc->desired_dr_role) +if (!desired_dr_role) goto out; -if (dwc->desired_dr_role == dwc->current_dr_role) +if (desired_dr_role == dwc->current_dr_role) goto out; -if (dwc->desired_dr_role ==DWC3_GCTL_PRTCAP_OTG && dwc->edev) +if (desired_dr_role ==DWC3_GCTL_PRTCAP_OTG && dwc->edev) goto out;switch (dwc->current_dr_role) {
@@ -164,7 +168,7 @@ static void __dwc3_set_mode(struct work_*/ if (dwc->current_dr_role && ((DWC3_IP_IS (DWC3 ) || DWC3_VER_IS_PRIOR(DWC31, 190A)) && - dwc->desired_dr_role !=DWC3_GCTL_PRTCAP_OTG )) { + desired_dr_role !=DWC3_GCTL_PRTCAP_OTG )) { reg =dwc3_readl (dwc->regs,DWC3_GCTL ); reg |=DWC3_GCTL_CORESOFTRESET ;dwc3_writel (dwc->regs,DWC3_GCTL , reg);
@@ -184,11 +188,11 @@ static void __dwc3_set_mode(struct work_spin_lock_irqsave (&dwc->lock, flags); -dwc3_set_prtcap (dwc, dwc->desired_dr_role); +dwc3_set_prtcap (dwc, desired_dr_role);spin_unlock_irqrestore (&dwc->lock, flags); -switch (dwc->desired_dr_role) { +switch (desired_dr_role) {case DWC3_GCTL_PRTCAP_HOST : ret =dwc3_host_init (dwc);if (ret) {
Greg Kroah-Hartman
maintainerPATCH 1039/1073 usb: dwc3: core: defer probe on ulpi_read_id timeout
In reply to Greg Kroah-HartmanFrom: Ferry Toth <[email protected]>
commit 63130462c919ece0ad0d9bb5a1f795ef8d79687e upstream.
Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present"), Dual Role support on Intel Merrifield platform broke due to rearranging the call to dwc3_get_extcon().
It appears to be caused by ulpi_read_id() masking the timeout on the first test write. In the past dwc3 probe continued by calling dwc3_core_soft_reset() followed by dwc3_get_extcon() which happend to return -EPROBE_DEFER. On deferred probe ulpi_read_id() finally succeeded. Due to above mentioned rearranging -EPROBE_DEFER is not returned and probe completes without phy.
On Intel Merrifield the timeout on the first test write issue is reproducible but it is difficult to find the root cause. Using a mainline kernel and rootfs with buildroot ulpi_read_id() succeeds. As soon as adding ftrace / bootconfig to find out why, ulpi_read_id() fails and we can't analyze the flow. Using another rootfs ulpi_read_id() fails even without adding ftrace. We suspect the issue is some kind of timing / race, but merely retrying ulpi_read_id() does not resolve the issue.
As we now changed ulpi_read_id() to return -ETIMEDOUT in this case, we need to handle the error by calling dwc3_core_soft_reset() and request -EPROBE_DEFER. On deferred probe ulpi_read_id() is retried and succeeds.
--- drivers/usb/dwc3/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.c +6 -1
@@ -1100,8 +1100,13 @@ static int dwc3_core_init(struct dwc3 *dif (!dwc->ulpi_ready) { ret =dwc3_core_ulpi_init (dwc); -if (ret) +if (ret) { +if (ret == -ETIMEDOUT ) { +dwc3_core_soft_reset (dwc); + ret = -EPROBE_DEFER ; + } goto err0; + } dwc->ulpi_ready = true; }
Greg Kroah-Hartman
maintainerPATCH 1040/1073 xhci: Prevent infinite loop in transaction errors recovery for streams
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit a1575120972ecd7baa6af6a69e4e7ea9213bde7c upstream.
Make sure to also limit the amount of soft reset retries for transaction errors on streams in cases where the transaction error event doesn't point to any specific TRB.
In these cases we don't know the TRB or stream ring, but we do know which endpoint had the error.
To keep error counting simple and functional, move the current err_count from ring structure to endpoint structure.
--- drivers/usb/host/xhci-ring.c | 14 ++++++++++---- drivers/usb/host/xhci.h | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-ring.c +10 -4
@@ -2458,7 +2458,7 @@ static int process_bulk_intr_td(struct xswitch (trb_comp_code) {case COMP_SUCCESS : - ep_ring->err_count =0 ; + ep->err_count =0 ;/* handle success with untransferred data as short packet */ if (ep_trb != td->last_trb || remaining) {xhci_warn (xhci,"WARN Successful completion on short TX\n" );
@@ -2484,7 +2484,7 @@ static int process_bulk_intr_td(struct xbreak ;case COMP_USB_TRANSACTION_ERROR :if (xhci->quirks &XHCI_NO_SOFT_RETRY || - (ep_ring->err_count++ >MAX_SOFT_RETRY ) || + (ep->err_count++ >MAX_SOFT_RETRY ) ||le32_to_cpu (slot_ctx->tt_info) &TT_SLOT )break ;
@@ -2565,8 +2565,14 @@ static int handle_tx_event(struct xhci_hcase COMP_USB_TRANSACTION_ERROR :case COMP_INVALID_STREAM_TYPE_ERROR :case COMP_INVALID_STREAM_ID_ERROR : -xhci_handle_halted_endpoint (xhci, ep,0 ,NULL , -EP_SOFT_RESET ); +xhci_dbg (xhci,"Stream transaction error ep %u no id\n" , + ep_index); +if (ep->err_count++ >MAX_SOFT_RETRY ) +xhci_handle_halted_endpoint (xhci, ep,0 ,NULL , +EP_HARD_RESET ); +else +xhci_handle_halted_endpoint (xhci, ep,0 ,NULL , +EP_SOFT_RESET ); goto cleanup;case COMP_RING_UNDERRUN :case COMP_RING_OVERRUN :
drivers/usb/host/xhci.h +1 -1
@@ -933,6 +933,7 @@ struct xhci_virt_ep {* have to restore the device state to the previous state */ struct xhci_ring *new_ring; +unsigned int err_count;unsigned int ep_state;#define SET_DEQ_PENDING (1 << 0)#define EP_HALTED (1 << 1)/* For stall handling */
@@ -1627,7 +1628,6 @@ struct xhci_ring {* if we own the TRB (if we are the consumer). See section 4.9.1. */ u32 cycle_state; -unsigned int err_count;unsigned int stream_id;unsigned int num_segs;unsigned int num_trbs_free;
Greg Kroah-Hartman
maintainerPATCH 1041/1073 HID: wacom: Ensure bootloader PID is usable in hidraw mode
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit 1db1f392591aff13fd643f0ec7c1d5e27391d700 upstream.
Some Wacom devices have a special "bootloader" mode that is used for firmware flashing. When operating in this mode, the device cannot be used for input, and the HID descriptor is not able to be processed by the driver. The driver generates an "Unknown device_type" warning and then returns an error code from wacom_probe(). This is a problem because userspace still needs to be able to interact with the device via hidraw to perform the firmware flash.
This commit adds a non-generic device definition for 056a:0094 which is used when devices are in "bootloader" mode. It marks the devices with a special BOOTLOADER type that is recognized by wacom_probe() and wacom_raw_event(). When we see this type we ensure a hidraw device is created and otherwise keep our hands off so that userspace is in full control.
--- drivers/hid/wacom_sys.c | 8 ++++++++ drivers/hid/wacom_wac.c | 4 ++++ drivers/hid/wacom_wac.h | 1 + 3 files changed, 13 insertions(+)
drivers/hid/wacom_sys.c +8 -0
@@ -160,6 +160,9 @@ static int wacom_raw_event(struct hid_de {struct wacom *wacom =hid_get_drvdata (hdev); +if (wacom->wacom_wac.features.type ==BOOTLOADER ) +return 0 ; +if (size >WACOM_PKGLEN_MAX )return 1 ;
@@ -2790,6 +2793,11 @@ static int wacom_probe(struct hid_devicereturn error; } +if (features->type ==BOOTLOADER ) { +hid_warn (hdev,"Using device in hidraw-only mode" ); +return hid_hw_start (hdev,HID_CONNECT_HIDRAW ); + } + error =wacom_parse_and_register (wacom, false);if (error)return error;
drivers/hid/wacom_wac.c +4 -0
@@ -4880,6 +4880,9 @@ static const struct wacom_features wacomstatic const struct wacom_features wacom_features_HID_ANY_ID = {"Wacom HID" , .type =HID_GENERIC , .oVid =HID_ANY_ID , .oPid =HID_ANY_ID }; +static const struct wacom_features wacom_features_0x94 = + {"Wacom Bootloader" , .type =BOOTLOADER }; +#define USB_DEVICE_WACOM (prod) \ HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ .driver_data = (kernel_ulong_t)&wacom_features_##prod
@@ -4953,6 +4956,7 @@ const struct hid_device_id wacom_ids[] = { USB_DEVICE_WACOM(0x84) }, { USB_DEVICE_WACOM(0x90) }, { USB_DEVICE_WACOM(0x93) }, + { USB_DEVICE_WACOM(0x94) }, { USB_DEVICE_WACOM(0x97) }, { USB_DEVICE_WACOM(0x9A) }, { USB_DEVICE_WACOM(0x9F) },
drivers/hid/wacom_wac.h +1 -0
@@ -245,6 +245,7 @@ enum {MTTPC ,MTTPC_B ,HID_GENERIC , +BOOTLOADER , MAX_TYPE };
Greg Kroah-Hartman
maintainerPATCH 1042/1073 HID: mcp2221: dont connect hidraw
In reply to Greg Kroah-HartmanFrom: Enrik Berkhan <[email protected]>
commit 67c90d14018775556d5420382ace86521421f9ff upstream.
The MCP2221 driver should not connect to the hidraw userspace interface, as it needs exclusive access to the chip.
If you want to use /dev/hidrawX with the MCP2221, you need to avoid binding this driver to the device and use the hid generic driver instead (e.g. using udev rules).
--- drivers/hid/hid-mcp2221.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/hid/hid-mcp2221.c +9 -3
@@ -840,12 +840,19 @@ static int mcp2221_probe(struct hid_devireturn ret; } - ret =hid_hw_start (hdev,HID_CONNECT_HIDRAW ); +/* +* This driver uses the .raw_event callback and therefore does not need any +* HID_CONNECT_xxx flags. +*/ + ret =hid_hw_start (hdev,0 );if (ret) {hid_err (hdev,"can't start hardware\n" );return ret; } +hid_info (hdev,"USB HID v%x.%02x Device [%s] on %s\n" , hdev->version >>8 , + hdev->version &0xff , hdev->name, hdev->phys); + ret =hid_hw_open (hdev);if (ret) {hid_err (hdev,"can't open device\n" );
@@ -870,8 +877,7 @@ static int mcp2221_probe(struct hid_devi mcp->adapter.retries =1 ; mcp->adapter.dev.parent = &hdev->dev;snprintf (mcp->adapter.name,sizeof (mcp->adapter.name), -"MCP2221 usb-i2c bridge on hidraw%d" , - ((struct hidraw *)hdev->hidraw)->minor); +"MCP2221 usb-i2c bridge" ); ret =i2c_add_adapter (&mcp->adapter);if (ret) {
Greg Kroah-Hartman
maintainerPATCH 1043/1073 loop: Fix the max_loop commandline argument treatment when it is set to 0
In reply to Greg Kroah-HartmanFrom: Isaac J. Manjarres <[email protected]>
commit 85c50197716c60fe57f411339c579462e563ac57 upstream.
Currently, the max_loop commandline argument can be used to specify how many loop block devices are created at init time. If it is not specified on the commandline, CONFIG_BLK_DEV_LOOP_MIN_COUNT loop block devices will be created.
The max_loop commandline argument can be used to override the value of CONFIG_BLK_DEV_LOOP_MIN_COUNT. However, when max_loop is set to 0 through the commandline, the current logic treats it as if it had not been set, and creates CONFIG_BLK_DEV_LOOP_MIN_COUNT devices anyway.
Fix this by starting max_loop off as set to CONFIG_BLK_DEV_LOOP_MIN_COUNT. This preserves the intended behavior of creating CONFIG_BLK_DEV_LOOP_MIN_COUNT loop block devices if the max_loop commandline parameter is not specified, and allowing max_loop to be respected for all values, including 0.
This allows environments that can create all of their required loop block devices on demand to not have to unnecessarily preallocate loop block devices.
--- drivers/block/loop.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/block/loop.c +12 -16
@@ -1773,7 +1773,16 @@ static const struct block_device_operati/* * And now the modules code and kernel interface. */ -static int max_loop; + +/* +* If max_loop is specified, create that many devices upfront. +* This also becomes a hard limit. If max_loop is not specified, +* create CONFIG_BLK_DEV_LOOP_MIN_COUNT loop devices at module +* init time. Loop devices can be requested on-demand with the +* /dev/loop-control interface, or be instantiated by accessing +* a 'dead' device node. +*/ +static int max_loop =CONFIG_BLK_DEV_LOOP_MIN_COUNT ;module_param (max_loop, int,0444 );MODULE_PARM_DESC (max_loop,"Maximum number of loop devices" );module_param (max_part, int,0444 );
@@ -2181,7 +2190,7 @@ MODULE_ALIAS("devname:loop-control");static int __init loop_init (void ) { -int i, nr; +int i;int err; part_shift =0 ;
@@ -2209,19 +2218,6 @@ static int __init loop_init(void) goto err_out; } -/* -* If max_loop is specified, create that many devices upfront. -* This also becomes a hard limit. If max_loop is not specified, -* create CONFIG_BLK_DEV_LOOP_MIN_COUNT loop devices at module -* init time. Loop devices can be requested on-demand with the -* /dev/loop-control interface, or be instantiated by accessing -* a 'dead' device node. -*/ -if (max_loop) - nr = max_loop; -else - nr =CONFIG_BLK_DEV_LOOP_MIN_COUNT ; - err =misc_register (&loop_misc);if (err <0 ) goto err_out;
@@ -2233,7 +2229,7 @@ static int __init loop_init(void) }/* pre-create number of devices given by config or max_loop */ -for (i =0 ; i < nr; i++) +for (i =0 ; i < max_loop; i++)loop_add (i);printk (KERN_INFO "loop: module loaded\n" );
Greg Kroah-Hartman
maintainerPATCH 1044/1073 9p: set req refcount to zero to avoid uninitialized usage
In reply to Greg Kroah-HartmanFrom: Schspa Shi <[email protected]>
commit 26273ade77f54716e30dfd40ac6e85ceb54ac0f9 upstream.
When a new request is allocated, the refcount will be zero if it is reused, but if the request is newly allocated from slab, it is not fully initialized before being added to idr.
If the p9_read_work got a response before the refcount initiated. It will use a uninitialized req, which will result in a bad request data struct.
Here is the logs from syzbot.
Corrupted memory at 0xffff88807eade00b [ 0xff 0x07 0x00 0x00 0x00 0x00 0x00 0x00 . . . . . . . . ] (in kfence-#110):
p9_fcall_fini net/9p/client.c:248 [inline] p9_req_put net/9p/client.c:396 [inline] p9_req_put+0x208/0x250 net/9p/client.c:390 p9_client_walk+0x247/0x540 net/9p/client.c:1165 clone_fid fs/9p/fid.h:21 [inline] v9fs_fid_xattr_set+0xe4/0x2b0 fs/9p/xattr.c:118 v9fs_xattr_set fs/9p/xattr.c:100 [inline] v9fs_xattr_handler_set+0x6f/0x120 fs/9p/xattr.c:159 __vfs_setxattr+0x119/0x180 fs/xattr.c:182 __vfs_setxattr_noperm+0x129/0x5f0 fs/xattr.c:216 __vfs_setxattr_locked+0x1d3/0x260 fs/xattr.c:277 vfs_setxattr+0x143/0x340 fs/xattr.c:309 setxattr+0x146/0x160 fs/xattr.c:617 path_setxattr+0x197/0x1c0 fs/xattr.c:636 __do_sys_setxattr fs/xattr.c:652 [inline] __se_sys_setxattr fs/xattr.c:648 [inline] __ia32_sys_setxattr+0xc0/0x160 fs/xattr.c:648 do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] __do_fast_syscall_32+0x65/0xf0 arch/x86/entry/common.c:178 do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203 entry_SYSENTER_compat_after_hwframe+0x70/0x82
Below is a similar scenario, the scenario in the syzbot log looks more complicated than this one, but this patch can fix it.
T21124 p9_read_work
======================== second trans ================================= p9_client_walk
p9_client_rpc
p9_client_prepare_req
p9_tag_alloc
req = kmem_cache_alloc(p9_req_cache, GFP_NOFS);
tag = idr_alloc
<< preempted >>
req->tc.tag = tag;
/* req->[refcount/tag] == uninitialized */
m->rreq = p9_tag_lookup(m->client, m->rc.tag);
/* increments uninitalized refcount */
refcount_set(&req->refcount, 2);
/* cb drops one ref */
p9_client_cb(req)
/* reader thread drops its ref:
request is incorrectly freed */
p9_req_put(req)
/* use after free and ref underflow */
p9_req_put(req)To fix it, we can initialize the refcount to zero before add to idr.
--- net/9p/client.c | 5 +++++ 1 file changed, 5 insertions(+)
net/9p/client.c +5 -0
@@ -279,6 +279,11 @@ p9_tag_alloc(struct p9_client *c, int8_tp9pdu_reset (&req->rc); req->t_err =0 ; req->status =REQ_STATUS_ALLOC ; +/* refcount needs to be set to 0 before inserting into the idr +* so p9_tag_lookup does not accept a request that is not fully +* initialized. refcount_set to 2 below will mark request ready. +*/ +refcount_set (&req->refcount,0 );init_waitqueue_head (&req->wq);INIT_LIST_HEAD (&req->req_list);
Greg Kroah-Hartman
maintainerPATCH 1045/1073 security: Restrict CONFIG_ZERO_CALL_USED_REGS to gcc or clang > 15.0.6
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit d6a9fb87e9d18f3394a9845546bbe868efdccfd2 upstream.
A bad bug in clang's implementation of -fzero-call-used-regs can result in NULL pointer dereferences (see the links above the check for more information). Restrict CONFIG_CC_HAS_ZERO_CALL_USED_REGS to either a supported GCC version or a clang newer than 15.0.6, which will catch both a theoretical 15.0.7 and the upcoming 16.0.0, which will both have the bug fixed.
--- security/Kconfig.hardening | 3 +++ 1 file changed, 3 insertions(+)
security/Kconfig.hardening +3 -0
@@ -253,6 +253,9 @@ config INIT_ON_FREE_DEFAULT_ON config CC_HAS_ZERO_CALL_USED_REGS def_bool $(cc-option,-fzero-call-used-regs=used-gpr) + # https://github.com/ClangBuiltLinux/linux/issues/1766 + # https://github.com/llvm/llvm-project/issues/59242 + depends on !CC_IS_CLANG || CLANG_VERSION > 150006 config ZERO_CALL_USED_REGS bool "Enable register zeroing on function exit"
Greg Kroah-Hartman
maintainerPATCH 1046/1073 reiserfs: Add missing calls to reiserfs_security_free()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
commit 572302af1258459e124437b8f3369357447afac7 upstream.
Commit 57fe60df6241 ("reiserfs: add atomic addition of selinux attributes during inode creation") defined reiserfs_security_free() to free the name and value of a security xattr allocated by the active LSM through security_old_inode_init_security(). However, this function is not called in the reiserfs code.
Thus, add a call to reiserfs_security_free() whenever reiserfs_security_init() is called, and initialize value to NULL, to avoid to call kfree() on an uninitialized pointer.
Finally, remove the kfree() for the xattr name, as it is not allocated anymore.
--- fs/reiserfs/namei.c | 4 ++++ fs/reiserfs/xattr_security.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
fs/reiserfs/namei.c +4 -0
@@ -696,6 +696,7 @@ static int reiserfs_create(struct user_n out_failed:reiserfs_write_unlock (dir->i_sb); +reiserfs_security_free (&security);return retval; }
@@ -779,6 +780,7 @@ static int reiserfs_mknod(struct user_na out_failed:reiserfs_write_unlock (dir->i_sb); +reiserfs_security_free (&security);return retval; }
@@ -878,6 +880,7 @@ static int reiserfs_mkdir(struct user_na retval =journal_end (&th); out_failed:reiserfs_write_unlock (dir->i_sb); +reiserfs_security_free (&security);return retval; }
@@ -1194,6 +1197,7 @@ static int reiserfs_symlink(struct user_ retval =journal_end (&th); out_failed:reiserfs_write_unlock (parent_dir->i_sb); +reiserfs_security_free (&security);return retval; }
fs/reiserfs/xattr_security.c +1 -1
@@ -50,6 +50,7 @@ int reiserfs_security_init(struct inodeint error; sec->name =NULL ; + sec->value =NULL ;/* Don't add selinux attributes on xattrs - they'll never get used */ if (IS_PRIVATE (dir))
@@ -95,7 +96,6 @@ int reiserfs_security_write(struct reisevoid reiserfs_security_free (struct reiserfs_security_handle *sec) { -kfree (sec->name);kfree (sec->value); sec->name =NULL ; sec->value =NULL ;
Greg Kroah-Hartman
maintainerPATCH 1047/1073 iio: fix memory leak in iio_device_register_eventset()
In reply to Greg Kroah-HartmanFrom: Zeng Heng <[email protected]>
commit 86fdd15e10e404e70ecb2a3bff24d70356d42b36 upstream.
When iio_device_register_sysfs_group() returns failed, iio_device_register_eventset() needs to free attrs array.
Otherwise, kmemleak would scan & report memory leak as below:
unreferenced object 0xffff88810a1cc3c0 (size 32):
comm "100-i2c-vcnl302", pid 728, jiffies 4295052307 (age 156.027s) backtrace:
__kmalloc+0x46/0x1b0
iio_device_register_eventset at drivers/iio/industrialio-event.c:541
__iio_device_register at drivers/iio/industrialio-core.c:1959
__devm_iio_device_register at drivers/iio/industrialio-core.c:2040--- drivers/iio/industrialio-event.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/industrialio-event.c +3 -1
@@ -550,7 +550,7 @@ int iio_device_register_eventset(struct ret =iio_device_register_sysfs_group (indio_dev, &ev_int->group);if (ret) - goto error_free_setup_event_lines; + goto error_free_group_attrs; ev_int->ioctl_handler.ioctl = iio_event_ioctl; iio_device_ioctl_handler_register(&iio_dev_opaque->indio_dev,
@@ -558,6 +558,8 @@ int iio_device_register_eventset(structreturn 0 ; +error_free_group_attrs: +kfree (ev_int->group.attrs); error_free_setup_event_lines:iio_free_chan_devattr_list (&ev_int->dev_attr_list);kfree (ev_int);
Greg Kroah-Hartman
maintainerPATCH 1048/1073 iio: adc: ad_sigma_delta: do not use internal iio_dev lock
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
commit 20228a1d5a55e7db0c6720840f2c7d2b48c55f69 upstream.
Drop 'mlock' usage by making use of iio_device_claim_direct_mode(). This change actually makes sure we cannot do a single conversion while buffering is enable. Note there was a potential race in the previous code since we were only acquiring the lock after checking if the bus is enabled.
--- drivers/iio/adc/ad_sigma_delta.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/ad_sigma_delta.c +4 -4
@@ -281,10 +281,10 @@ int ad_sigma_delta_single_conversion(strunsigned int data_reg;int ret =0 ; -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; -mutex_lock (&indio_dev->mlock);ad_sigma_delta_set_channel (sigma_delta, chan->address);spi_bus_lock (sigma_delta->spi->master);
@@ -323,7 +323,7 @@ out:ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); sigma_delta->bus_locked = false;spi_bus_unlock (sigma_delta->spi->master); -mutex_unlock (&indio_dev->mlock); +iio_device_release_direct_mode (indio_dev);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 1049/1073 iio: adc128s052: add proper .data members in adc128_of_match table
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit e2af60f5900c6ade53477b494ffb54690eee11f5 upstream.
Prior to commit bd5d54e4d49d ("iio: adc128s052: add ACPI _HID AANT1280"), the driver unconditionally used spi_get_device_id() to get the index into the adc128_config array.
However, with that commit, OF-based boards now incorrectly treat all supported sensors as if they are an adc128s052, because all the .data members of the adc128_of_match table are implicitly 0. Our board, which has an adc122s021, thus exposes 8 channels whereas it really only has two.
--- drivers/iio/adc/ti-adc128s052.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/adc/ti-adc128s052.c +7 -7
@@ -181,13 +181,13 @@ static int adc128_probe(struct spi_devic }static const struct of_device_id adc128_of_match[] = { - { .compatible ="ti,adc128s052" , }, - { .compatible ="ti,adc122s021" , }, - { .compatible ="ti,adc122s051" , }, - { .compatible ="ti,adc122s101" , }, - { .compatible ="ti,adc124s021" , }, - { .compatible ="ti,adc124s051" , }, - { .compatible ="ti,adc124s101" , }, + { .compatible ="ti,adc128s052" , .data = (void *)0L , }, + { .compatible ="ti,adc122s021" , .data = (void *)1L , }, + { .compatible ="ti,adc122s051" , .data = (void *)1L , }, + { .compatible ="ti,adc122s101" , .data = (void *)1L , }, + { .compatible ="ti,adc124s021" , .data = (void *)2L , }, + { .compatible ="ti,adc124s051" , .data = (void *)2L , }, + { .compatible ="ti,adc124s101" , .data = (void *)2L , }, {/* sentinel */ }, };MODULE_DEVICE_TABLE (of, adc128_of_match);
Greg Kroah-Hartman
maintainerPATCH 1050/1073 iio: addac: ad74413r: fix integer promotion bug in ad74413_get_input_current_offset()
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit 980389d06d08442fad0139874bff455c76125e47 upstream.
The constant AD74413R_ADC_RESULT_MAX is defined via GENMASK, so its type is "unsigned long".
Hence in the expression voltage_offset * AD74413R_ADC_RESULT_MAX, voltage_offset is first promoted to unsigned long, and since it may be negative, that results in a garbage value. For example, when range is AD74413R_ADC_RANGE_5V_BI_DIR, voltage_offset is -2500 and voltage_range is 5000, so the RHS of this assignment is, depending on sizeof(long), either 826225UL or 3689348814709142UL, which after truncation to int then results in either 826225 or 1972216214 being the output from in_currentX_offset.
Casting to int avoids that promotion and results in the correct -32767 output.
--- drivers/iio/addac/ad74413r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/addac/ad74413r.c +1 -1
@@ -691,7 +691,7 @@ static int ad74413_get_input_current_offif (ret)return ret; - *val = voltage_offset *AD74413R_ADC_RESULT_MAX / voltage_range; + *val = voltage_offset * (int )AD74413R_ADC_RESULT_MAX / voltage_range;return IIO_VAL_INT ; }
Greg Kroah-Hartman
maintainerPATCH 1051/1073 regulator: core: fix deadlock on regulator enable
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit cb3543cff90a4448ed560ac86c98033ad5fecda9 upstream.
When updating the operating mode as part of regulator enable, the caller has already locked the regulator tree and drms_uA_update() must not try to do the same in order not to trigger a deadlock.
The lock inversion is reported by lockdep as:
======================================================
WARNING: possible circular locking dependency detected
6.1.0-next-20221215 #142 Not tainted
------------------------------------------------------
udevd/154 is trying to acquire lock:
ffffc11f123d7e50 (regulator_list_mutex){+.+.}-{3:3}, at: regulator_lock_dependent+0x54/0x280
but task is already holding lock:
ffff80000e4c36e8 (regulator_ww_class_acquire){+.+.}-{0:0}, at: regulator_enable+0x34/0x80
which lock already depends on the new lock.
...
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(regulator_ww_class_acquire);
lock(regulator_list_mutex);
lock(regulator_ww_class_acquire);
lock(regulator_list_mutex);*** DEADLOCK ***
just before probe of a Qualcomm UFS controller (occasionally) deadlocks when enabling one of its regulators.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -987,7 +987,7 @@ static int drms_uA_update(struct regulat/* get input voltage */ input_uV =0 ;if (rdev->supply) - input_uV =regulator_get_voltage (rdev->supply); + input_uV =regulator_get_voltage_rdev (rdev->supply->rdev);if (input_uV <=0 ) input_uV = rdev->constraints->input_uV;if (input_uV <=0 ) {
Greg Kroah-Hartman
maintainerPATCH 1052/1073 floppy: Fix memory leak in do_floppy_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
commit f8ace2e304c5dd8a7328db9cd2b8a4b1b98d83ec upstream.
A memory leak was reported when floppy_alloc_disk() failed in do_floppy_init().
unreferenced object 0xffff888115ed25a0 (size 8):
comm "modprobe", pid 727, jiffies 4295051278 (age 25.529s) hex dump (first 8 bytes):
00 ac 67 5b 81 88 ff ff ..g[....
backtrace:
[<000000007f457abb>] __kmalloc_node+0x4c/0xc0
[<00000000a87bfa9e>] blk_mq_realloc_tag_set_tags.part.0+0x6f/0x180
[<000000006f02e8b1>] blk_mq_alloc_tag_set+0x573/0x1130
[<0000000066007fd7>] 0xffffffffc06b8b08
[<0000000081f5ac40>] do_one_initcall+0xd0/0x4f0
[<00000000e26d04ee>] do_init_module+0x1a4/0x680
[<000000001bb22407>] load_module+0x6249/0x7110
[<00000000ad31ac4d>] __do_sys_finit_module+0x140/0x200
[<000000007bddca46>] do_syscall_64+0x35/0x80
[<00000000b5afec39>] entry_SYSCALL_64_after_hwframe+0x46/0xb0
unreferenced object 0xffff88810fc30540 (size 32):
comm "modprobe", pid 727, jiffies 4295051278 (age 25.529s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000007f457abb>] __kmalloc_node+0x4c/0xc0
[<000000006b91eab4>] blk_mq_alloc_tag_set+0x393/0x1130
[<0000000066007fd7>] 0xffffffffc06b8b08
[<0000000081f5ac40>] do_one_initcall+0xd0/0x4f0
[<00000000e26d04ee>] do_init_module+0x1a4/0x680
[<000000001bb22407>] load_module+0x6249/0x7110
[<00000000ad31ac4d>] __do_sys_finit_module+0x140/0x200
[<000000007bddca46>] do_syscall_64+0x35/0x80
[<00000000b5afec39>] entry_SYSCALL_64_after_hwframe+0x46/0xb0If the floppy_alloc_disk() failed, disks of current drive will not be set, thus the lastest allocated set->tag cannot be freed in the error handling path. A simple call graph shown as below:
floppy_module_init()
floppy_init()
do_floppy_init()
for (drive = 0; drive < N_DRIVE; drive++)
blk_mq_alloc_tag_set()
blk_mq_alloc_tag_set_tags()
blk_mq_realloc_tag_set_tags() # set->tag allocated
floppy_alloc_disk()
blk_mq_alloc_disk() # error occurred, disks failed to allocated
->out_put_disk:
for (drive = 0; drive < N_DRIVE; drive++)
if (!disks[drive][0]) # the last disks is not set and loop break
break;
blk_mq_free_tag_set() # the latest allocated set->tag leakedFix this problem by free the set->tag of current drive before jump to error handling path.
--- drivers/block/floppy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/block/floppy.c +3 -1
@@ -4593,8 +4593,10 @@ static int __init do_floppy_init(void) goto out_put_disk; err =floppy_alloc_disk (drive,0 ); -if (err) +if (err) { +blk_mq_free_tag_set (&tag_sets[drive]); goto out_put_disk; + }timer_setup (&motor_off_timer[drive], motor_off_callback,0 ); }
Greg Kroah-Hartman
maintainerPATCH 1053/1073 gcov: add support for checksum field
In reply to Greg Kroah-HartmanFrom: Rickard x Andersson <[email protected]>
commit e96b95c2b7a63a454b6498e2df67aac14d046d13 upstream.
In GCC version 12.1 a checksum field was added.
This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX.
--- kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/gcov/gcc_4_7.c +5 -0
@@ -82,6 +82,7 @@ struct gcov_fn_info {* @version: gcov version magic indicating the gcc version used for compilation * @next: list head for a singly-linked list * @stamp: uniquifying time stamp +* @checksum: unique object checksum * @filename: name of the associated gcov data file * @merge: merge functions (null for unused counter type) * @n_functions: number of instrumented functions
@@ -94,6 +95,10 @@ struct gcov_info {unsigned int version;struct gcov_info *next;unsigned int stamp; +/* Since GCC 12.1 a checksum field is added. */ +#if (__GNUC__ >=12 ) +unsigned int checksum; +#endif const char *filename;void (*merge[GCOV_COUNTERS ])(gcov_type *,unsigned int );unsigned int n_functions;
Greg Kroah-Hartman
maintainerPATCH 1054/1073 fbdev: fbcon: release buffer when fbcon_do_set_font() failed
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 3c3bfb8586f848317ceba5d777e11204ba3e5758 upstream.
syzbot is reporting memory leak at fbcon_do_set_font() [1], for commit a5a923038d70 ("fbdev: fbcon: Properly revert changes when vc_resize() failed") missed that the buffer might be newly allocated by fbcon_set_font().
--- drivers/video/fbdev/core/fbcon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +2 -1
@@ -2450,7 +2450,8 @@ err_out:if (userfont) { p->userfont = old_userfont; -REFCOUNT (data)--; +if (--REFCOUNT (data) ==0 ) +kfree (data -FONT_EXTRA_WORDS *sizeof (int )); } vc->vc_font.width = old_width;
Greg Kroah-Hartman
maintainerPATCH 1055/1073 ovl: fix use inode directly in rcu-walk mode
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
commit 672e4268b2863d7e4978dfed29552b31c2f9bd4e upstream.
ovl_dentry_revalidate_common() can be called in rcu-walk mode. As document said, "in rcu-walk mode, d_parent and d_inode should not be used without care".
Check inode here to protect access under rcu-walk mode.
--- fs/overlayfs/super.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/overlayfs/super.c +6 -1
@@ -138,11 +138,16 @@ static int ovl_dentry_revalidate_common( unsigned int flags, bool weak) {struct ovl_entry *oe = dentry->d_fsdata; +struct inode *inode =d_inode_rcu (dentry);struct dentry *upper;unsigned int i;int ret =1 ; - upper =ovl_dentry_upper (dentry); +/* Careful in RCU mode */ +if (!inode) +return -ECHILD ; + + upper =ovl_i_dentry_upper (inode);if (upper) ret =ovl_revalidate_real (upper, flags, weak);
Greg Kroah-Hartman
maintainerPATCH 1056/1073 btrfs: do not BUG_ON() on ENOMEM when dropping extent items for a range
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 162d053e15fe985f754ef495a96eb3db970c43ed upstream.
If we get -ENOMEM while dropping file extent items in a given range, at btrfs_drop_extents(), due to failure to allocate memory when attempting to increment the reference count for an extent or drop the reference count, we handle it with a BUG_ON(). This is excessive, instead we can simply abort the transaction and return the error to the caller. In fact most callers of btrfs_drop_extents(), directly or indirectly, already abort the transaction if btrfs_drop_extents() returns any error.
Also, we already have error paths at btrfs_drop_extents() that may return -ENOMEM and in those cases we abort the transaction, like for example anything that changes the b+tree may return -ENOMEM due to a failure to allocate a new extent buffer when COWing an existing extent buffer, such as a call to btrfs_duplicate_item() for example.
So replace the BUG_ON() calls with proper logic to abort the transaction and return the error.
--- fs/btrfs/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/file.c +8 -2
@@ -880,7 +880,10 @@ next_slot: args->start - extent_offset, 0, false); ret =btrfs_inc_extent_ref (trans, &ref); -BUG_ON (ret);/* -ENOMEM */ +if (ret) { +btrfs_abort_transaction (trans, ret); +break ; + } } key.offset = args->start; }
@@ -967,7 +970,10 @@ delete_extent_item: key.offset - extent_offset,0 , false); ret =btrfs_free_extent (trans, &ref); -BUG_ON (ret);/* -ENOMEM */ +if (ret) { +btrfs_abort_transaction (trans, ret); +break ; + } args->bytes_found += extent_end - key.offset; }
Greg Kroah-Hartman
maintainerPATCH 1057/1073 mm/gup: disallow FOLL_FORCE|FOLL_WRITE on hugetlb mappings
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit f347454d034184b4f0a2caf6e14daf7848cea01c upstream.
hugetlb does not support fake write-faults (write faults without write permissions). However, we are currently able to trigger a FAULT_FLAG_WRITE fault on a VMA without VM_WRITE.
If we'd ever want to support FOLL_FORCE|FOLL_WRITE, we'd have to teach hugetlb to:
(1) Leave the page mapped R/O after the fake write-fault, like maybe_mkwrite() does.
(2) Allow writing to an exclusive anon page that's mapped R/O when FOLL_FORCE is set, like can_follow_write_pte(). E.g., __follow_hugetlb_must_fault() needs adjustment.
For now, it's not clear if that added complexity is really required. History tolds us that FOLL_FORCE is dangerous and that we better limit its use to a bare minimum.
--------------------------------------------------------------------------
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <stdint.h>
#include <sys/mman.h>
#include <linux/mman.h>
int main(int argc, char **argv)
{
char *map;
int mem_fd; map = mmap(NULL, 2 * 1024 * 1024u, PROT_READ,
MAP_PRIVATE|MAP_ANON|MAP_HUGETLB|MAP_HUGE_2MB, -1, 0);
if (map == MAP_FAILED) {
fprintf(stderr, "mmap() failed: %d\n", errno);
return 1;
}
mem_fd = open("/proc/self/mem", O_RDWR);
if (mem_fd < 0) {
fprintf(stderr, "open(/proc/self/mem) failed: %d\n", errno);
return 1;
}
if (pwrite(mem_fd, "0", 1, (uintptr_t) map) == 1) {
fprintf(stderr, "write() succeeded, which is unexpected\n");
return 1;
}
printf("write() failed as expected: %d\n", errno);
return 0; }
--------------------------------------------------------------------------
Fortunately, we have a sanity check in hugetlb_wp() in place ever since commit 1d8d14641fd9 ("mm/hugetlb: support write-faults in shared mappings"), that bails out instead of silently mapping a page writable in a !PROT_WRITE VMA.
Consequently, above reproducer triggers a warning, similar to the one reported by szsbot:
------------[ cut here ]------------ WARNING: CPU: 1 PID: 3612 at mm/hugetlb.c:5313 hugetlb_wp+0x20a/0x1af0 mm/hugetlb.c:5313 Modules linked in: CPU: 1 PID: 3612 Comm: syz-executor250 Not tainted 6.1.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:hugetlb_wp+0x20a/0x1af0 mm/hugetlb.c:5313 Code: ea 03 80 3c 02 00 0f 85 31 14 00 00 49 8b 5f 20 31 ff 48 89 dd 83 e5 02 48 89 ee e8 70 ab b7 ff 48 85 ed 75 5b e8 76 ae b7 ff <0f> 0b 41 bd 40 00 00 00 e8 69 ae b7 ff 48 b8 00 00 00 00 00 fc ff RSP: 0018:ffffc90003caf620 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000008640070 RCX: 0000000000000000 RDX: ffff88807b963a80 RSI: ffffffff81c4ed2a RDI: 0000000000000007 RBP: 0000000000000000 R08: 0000000000000007 R09: 0000000000000000 R10: 0000000000000000 R11: 000000000008c07e R12: ffff888023805800 R13: 0000000000000000 R14: ffffffff91217f38 R15: ffff88801d4b0360 FS: 0000555555bba300(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fff7a47a1b8 CR3: 000000002378d000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> hugetlb_no_page mm/hugetlb.c:5755 [inline] hugetlb_fault+0x19cc/0x2060 mm/hugetlb.c:5874 follow_hugetlb_page+0x3f3/0x1850 mm/hugetlb.c:6301 __get_user_pages+0x2cb/0xf10 mm/gup.c:1202 __get_user_pages_locked mm/gup.c:1434 [inline] __get_user_pages_remote+0x18f/0x830 mm/gup.c:2187 get_user_pages_remote+0x84/0xc0 mm/gup.c:2260 __access_remote_vm+0x287/0x6b0 mm/memory.c:5517 ptrace_access_vm+0x181/0x1d0 kernel/ptrace.c:61 generic_ptrace_pokedata kernel/ptrace.c:1323 [inline] ptrace_request+0xb46/0x10c0 kernel/ptrace.c:1046 arch_ptrace+0x36/0x510 arch/x86/kernel/ptrace.c:828 __do_sys_ptrace kernel/ptrace.c:1296 [inline] __se_sys_ptrace kernel/ptrace.c:1269 [inline] __x64_sys_ptrace+0x178/0x2a0 kernel/ptrace.c:1269 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
[...]
So let's silence that warning by teaching GUP code that FOLL_FORCE -- so far -- does not apply to hugetlb.
Note that FOLL_FORCE for read-access seems to be working as expected. The assumption is that this has been broken forever, only ever since above commit, we actually detect the wrong handling and WARN_ON_ONCE().
I assume this has been broken at least since 2014, when mm/gup.c came to life. I failed to come up with a suitable Fixes tag quickly.
--- mm/gup.c | 3 +++ 1 file changed, 3 insertions(+)
mm/gup.c +3 -0
@@ -1058,6 +1058,9 @@ static int check_vma_flags(struct vm_areif (!(vm_flags &VM_WRITE )) {if (!(gup_flags &FOLL_FORCE ))return -EFAULT ; +/* hugetlb does not support FOLL_FORCE|FOLL_WRITE. */ +if (is_vm_hugetlb_page (vma)) +return -EFAULT ;/* * We used to let the write,force case do COW in a * VM_MAYWRITE VM_SHARED !VM_WRITE vma, so ptrace could
Greg Kroah-Hartman
maintainerPATCH 1058/1073 scsi: qla2xxx: Fix crash when I/O abort times out
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 68ad83188d782b2ecef2e41ac245d27e0710fe8e upstream.
While performing CPU hotplug, a crash with the following stack was seen:
Call Trace:
qla24xx_process_response_queue+0x42a/0x970 [qla2xxx]
qla2x00_start_nvme_mq+0x3a2/0x4b0 [qla2xxx]
qla_nvme_post_cmd+0x166/0x240 [qla2xxx]
nvme_fc_start_fcp_op.part.0+0x119/0x2e0 [nvme_fc]
blk_mq_dispatch_rq_list+0x17b/0x610
__blk_mq_sched_dispatch_requests+0xb0/0x140
blk_mq_sched_dispatch_requests+0x30/0x60
__blk_mq_run_hw_queue+0x35/0x90
__blk_mq_delay_run_hw_queue+0x161/0x180
blk_execute_rq+0xbe/0x160
__nvme_submit_sync_cmd+0x16f/0x220 [nvme_core]
nvmf_connect_admin_queue+0x11a/0x170 [nvme_fabrics]
nvme_fc_create_association.cold+0x50/0x3dc [nvme_fc]
nvme_fc_connect_ctrl_work+0x19/0x30 [nvme_fc]
process_one_work+0x1e8/0x3c0On abort timeout, completion was called without checking if the I/O was already completed.
Verify that I/O and abort request are indeed outstanding before attempting completion.
--- drivers/scsi/qla2xxx/qla_init.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +10 -4
@@ -110,6 +110,7 @@ static void qla24xx_abort_iocb_timeout(vstruct qla_qpair *qpair = sp->qpair;u32 handle;unsigned long flags; +int sp_found =0 , cmdsp_found =0 ;if (sp->cmd_sp) ql_dbg(ql_dbg_async, sp->vha, 0x507c,
@@ -124,18 +125,21 @@ static void qla24xx_abort_iocb_timeout(vspin_lock_irqsave (qpair->qp_lock_ptr, flags);for (handle =1 ; handle < qpair->req->num_outstanding_cmds; handle++) {if (sp->cmd_sp && (qpair->req->outstanding_cmds[handle] == - sp->cmd_sp)) + sp->cmd_sp)) { qpair->req->outstanding_cmds[handle] =NULL ; + cmdsp_found =1 ; + }/* removing the abort */ if (qpair->req->outstanding_cmds[handle] == sp) { qpair->req->outstanding_cmds[handle] =NULL ; + sp_found =1 ;break ; } }spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); -if (sp->cmd_sp) { +if (cmdsp_found && sp->cmd_sp) {/* * This done function should take care of * original command ref: INIT
@@ -143,8 +147,10 @@ static void qla24xx_abort_iocb_timeout(v sp->cmd_sp->done (sp->cmd_sp,QLA_OS_TIMER_EXPIRED ); } - abt->u.abt.comp_status =cpu_to_le16 (CS_TIMEOUT ); - sp->done (sp,QLA_OS_TIMER_EXPIRED ); +if (sp_found) { + abt->u.abt.comp_status =cpu_to_le16 (CS_TIMEOUT ); + sp->done (sp,QLA_OS_TIMER_EXPIRED ); + } }static void qla24xx_abort_sp_done (srb_t *sp,int res)
Greg Kroah-Hartman
maintainerPATCH 1059/1073 io_uring: add completion locking for iopoll
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 2ccc92f4effcfa1c51c4fcf1e34d769099d3cad4 upstream.
There are pieces of code that may allow iopoll to race filling cqes, temporarily add spinlocking around posting events.
--- io_uring/rw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
io_uring/rw.c +3 -2
@@ -1063,6 +1063,7 @@ int io_do_iopoll(struct io_ring_ctx *ctxelse if (!pos)return 0 ; +spin_lock (&ctx->completion_lock); prev = start;wq_list_for_each_resume (pos, prev) { struct io_kiocb *req = container_of(pos, struct io_kiocb, comp_list);
@@ -1077,11 +1078,11 @@ int io_do_iopoll(struct io_ring_ctx *ctx req->cqe.flags =io_put_kbuf (req,0 );__io_fill_cqe_req (req->ctx, req); } - +io_commit_cqring (ctx); +spin_unlock (&ctx->completion_lock);if (unlikely (!nr_events))return 0 ; -io_commit_cqring (ctx);io_cqring_ev_posted_iopoll (ctx); pos = start ? start->next : ctx->iopoll_list.first;wq_list_cut (&ctx->iopoll_list, prev, start);
Greg Kroah-Hartman
maintainerPATCH 1060/1073 io_uring: improve io_double_lock_ctx fail handling
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 4c979eaefa4356d385b7c7d2877dc04d7fe88969 upstream.
msg_ring will fail the request if it can't lock rings, instead punt it to io-wq as was originally intended.
--- io_uring/msg_ring.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/msg_ring.c +2 -0
@@ -164,6 +164,8 @@ int io_msg_ring(struct io_kiocb *req, un } done: +if (ret == -EAGAIN ) +return -EAGAIN ;if (ret <0 )req_set_fail (req);io_req_set_res (req, ret,0 );
Greg Kroah-Hartman
maintainerPATCH 1061/1073 io_uring/net: fix cleanup after recycle
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 6c3e8955d4bd9811a6e1761eea412a14fb51a2e6 upstream.
Don't access io_async_msghdr io_netmsg_recycle(), it may be reallocated.
--- io_uring/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/net.c +1 -1
@@ -772,10 +772,10 @@ retry_multishot: goto retry_multishot;if (mshot_finished) { -io_netmsg_recycle (req, issue_flags);/* fast path, check for non-NULL to avoid function call */ if (kmsg->free_iov)kfree (kmsg->free_iov); +io_netmsg_recycle (req, issue_flags); req->flags &= ~REQ_F_NEED_CLEANUP ; }
Greg Kroah-Hartman
maintainerPATCH 1062/1073 io_uring: protect cq_timeouts with timeout_lock
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit ea011ee10231f5fa6cbb415007048ca0bb948baf upstream.
Read cq_timeouts in io_flush_timeouts() only after taking the timeout_lock, as it's protected by it. There are many places where we also grab ->completion_lock, but for instance io_timeout_fn() doesn't and still modifies cq_timeouts.
--- io_uring/timeout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
io_uring/timeout.c +3 -1
@@ -72,10 +72,12 @@ static bool io_kill_timeout(struct io_ki__cold void io_flush_timeouts (struct io_ring_ctx *ctx) __must_hold(&ctx->completion_lock) { -u32 seq = ctx->cached_cq_tail -atomic_read (&ctx->cq_timeouts); +u32 seq;struct io_timeout *timeout, *tmp;spin_lock_irq (&ctx->timeout_lock); + seq = ctx->cached_cq_tail -atomic_read (&ctx->cq_timeouts); +list_for_each_entry_safe (timeout, tmp, &ctx->timeout_list, list) {struct io_kiocb *req =cmd_to_io_kiocb (timeout);u32 events_needed, events_got;
Greg Kroah-Hartman
maintainerPATCH 1063/1073 io_uring: remove iopoll spinlock
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 2dac1a159216b39ced8d78dba590c5d2f4249586 upstream.
This reverts commit 2ccc92f4effcfa1c51c4fcf1e34d769099d3cad4
io_req_complete_post() should now behave well even in case of IOPOLL, we can remove completion_lock locking.
--- io_uring/rw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
io_uring/rw.c +2 -3
@@ -1063,7 +1063,6 @@ int io_do_iopoll(struct io_ring_ctx *ctxelse if (!pos)return 0 ; -spin_lock (&ctx->completion_lock); prev = start;wq_list_for_each_resume (pos, prev) { struct io_kiocb *req = container_of(pos, struct io_kiocb, comp_list);
@@ -1078,11 +1077,11 @@ int io_do_iopoll(struct io_ring_ctx *ctx req->cqe.flags =io_put_kbuf (req,0 );__io_fill_cqe_req (req->ctx, req); } -io_commit_cqring (ctx); -spin_unlock (&ctx->completion_lock); +if (unlikely (!nr_events))return 0 ; +io_commit_cqring (ctx);io_cqring_ev_posted_iopoll (ctx); pos = start ? start->next : ctx->iopoll_list.first;wq_list_cut (&ctx->iopoll_list, prev, start);
Greg Kroah-Hartman
maintainerPATCH 1064/1073 net: stmmac: fix errno when create_singlethread_workqueue() fails
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
commit 2cb815cfc78b137ee38bcd65e7c955d6cc2cc250 upstream.
We should set the return value to -ENOMEM explicitly when create_singlethread_workqueue() fails in stmmac_dvr_probe(), otherwise we'll lose the error value.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
@@ -7115,6 +7115,7 @@ int stmmac_dvr_probe(struct device *devi priv->wq =create_singlethread_workqueue ("stmmac_wq" );if (!priv->wq) {dev_err (priv->device,"failed to create workqueue\n" ); + ret = -ENOMEM ; goto error_wq_init; }
Greg Kroah-Hartman
maintainerPATCH 1065/1073 media: dvbdev: fix build warning due to comments
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
commit 3edfd14bb50fa6f94ed1a37bbb17d9f1c2793b57 upstream.
Previous commit that introduces reference counter does not add proper comments, which will lead to warning when building htmldocs. Fix them.
--- include/media/dvbdev.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/media/dvbdev.h +2 -1
@@ -126,6 +126,7 @@ struct dvb_adapter {* struct dvb_device - represents a DVB device node * * @list_head: List head with all DVB devices +* @ref: reference counter * @fops: pointer to struct file_operations * @adapter: pointer to the adapter that holds this device node * @type: type of the device, as defined by &enum dvb_device_type.
@@ -196,7 +197,7 @@ struct dvb_device {struct dvb_device *dvb_device_get (struct dvb_device *dvbdev);/** -* dvb_device_get - Decrease dvb_device reference +* dvb_device_put - Decrease dvb_device reference * * @dvbdev: pointer to struct dvb_device */
Greg Kroah-Hartman
maintainerPATCH 1066/1073 media: dvbdev: fix refcnt bug
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
commit 3a664569b71b0a52be5ffb9fb87cc4f83d29bd71 upstream.
Previous commit initialize the dvbdev->ref before the template copy, which will overwrite the reference and cause refcnt bug.
refcount_t: addition on 0; use-after-free.
WARNING: CPU: 0 PID: 1 at lib/refcount.c:25 refcount_warn_saturate+0x17c/0x1f0 lib/refcount.c:25 Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc6-next-20221128-syzkaller #0 ... RIP: 0010:refcount_warn_saturate+0x17c/0x1f0 lib/refcount.c:25 RSP: 0000:ffffc900000678d0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff88813ff58000 RSI: ffffffff81660e7c RDI: fffff5200000cf0c RBP: ffff888022a45010 R08: 0000000000000005 R09: 0000000000000000 R10: 0000000080000000 R11: 0000000000000000 R12: 0000000000000001 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff88823ffff000 CR3: 000000000c48e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __refcount_add include/linux/refcount.h:199 [inline] __refcount_inc include/linux/refcount.h:250 [inline] refcount_inc include/linux/refcount.h:267 [inline] kref_get include/linux/kref.h:45 [inline] dvb_device_get drivers/media/dvb-core/dvbdev.c:585 [inline] dvb_register_device+0xe83/0x16e0 drivers/media/dvb-core/dvbdev.c:517
...
Just place the kref_init at correct position.
--- drivers/media/dvb-core/dvbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-core/dvbdev.c +1 -1
@@ -480,8 +480,8 @@ int dvb_register_device(struct dvb_adaptreturn -ENOMEM ; } -kref_init (&dvbdev->ref);memcpy (dvbdev, template,sizeof (struct dvb_device )); +kref_init (&dvbdev->ref); dvbdev->type = type; dvbdev->id = id; dvbdev->adapter = adap;
Greg Kroah-Hartman
maintainerPATCH 1067/1073 drm/amd/display: revert Disable DRR actions during state commit
In reply to Greg Kroah-HartmanFrom: Martin Leung <[email protected]>
commit 6f8816261db9251f2635533572f95ab8e530266c upstream.
why and how:
causes unstable on certain surface format/mpo transitions
This reverts commit de020e5fa9ebc6fc32e82ae6ccb0282451ed937c
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +3 -0
@@ -973,5 +973,8 @@ void dcn30_prepare_bandwidth(struct dc * dc->clk_mgr->funcs->set_max_memclk (dc->clk_mgr, dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz);dcn20_prepare_bandwidth (dc, context); + +dc_dmub_srv_p_state_delegate (dc, + context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching, context); }
Greg Kroah-Hartman
maintainerPATCH 1068/1073 clk: renesas: r8a779f0: Fix SD0H clock name
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 99c05a2b710f16ea592ccb63ef5fe5f1f6b15db9 upstream.
Correct the misspelled textual name of the SD0H clock.
--- drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/renesas/r8a779f0-cpg-mssr.c +1 -1
@@ -113,7 +113,7 @@ static const struct cpg_core_clk r8a779fDEF_FIXED ("sasyncperd2" ,R8A779F0_CLK_SASYNCPERD2 ,R8A779F0_CLK_SASYNCPERD1 ,2 ,1 ),DEF_FIXED ("sasyncperd4" ,R8A779F0_CLK_SASYNCPERD4 ,R8A779F0_CLK_SASYNCPERD1 ,4 ,1 ), -DEF_GEN4_SDH ("sdh0" ,R8A779F0_CLK_SD0H ,CLK_SDSRC ,0x870 ), +DEF_GEN4_SDH ("sd0h" ,R8A779F0_CLK_SD0H ,CLK_SDSRC ,0x870 ),DEF_GEN4_SD ("sd0" ,R8A779F0_CLK_SD0 ,R8A779F0_CLK_SD0H ,0x870 ), DEF_BASE("rpc", R8A779F0_CLK_RPC, CLK_TYPE_GEN4_RPC, CLK_RPCSRC),
Greg Kroah-Hartman
maintainerPATCH 1069/1073 extcon: usbc-tusb320: Call the Type-C IRQ handler only if a port is registered
In reply to Greg Kroah-HartmanFrom: Yassine Oudjana <[email protected]>
commit 341fd15e2e18c24d5c738496cfc3d7a272241201 upstream.
Commit bf7571c00dca ("extcon: usbc-tusb320: Add USB TYPE-C support") added an optional Type-C interface to the driver but missed to check if it is in use when calling the IRQ handler. This causes an oops on devices currently using the old extcon interface. Check if a Type-C port is registered before calling the Type-C IRQ handler.
--- drivers/extcon/extcon-usbc-tusb320.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/extcon/extcon-usbc-tusb320.c +7 -1
@@ -327,7 +327,13 @@ static irqreturn_t tusb320_state_update_return IRQ_NONE ;tusb320_extcon_irq_handler (priv, reg); -tusb320_typec_irq_handler (priv, reg); + +/* +* Type-C support is optional. Only call the Type-C handler if a +* port had been registered previously. +*/ +if (priv->port) +tusb320_typec_irq_handler (priv, reg);regmap_write (priv->regmap,TUSB320_REG9 , reg);
Greg Kroah-Hartman
maintainerPATCH 1070/1073 cifs: fix double-fault crash during ntlmssp
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit b854b4ee66437e6e1622fda90529c814978cb4ca upstream.
The crash occurred because we were calling memzero_explicit() on an already freed sess_data::iov[1] (ntlmsspblob) in sess_free_buffer().
Fix this by not calling memzero_explicit() on sess_data::iov[1] as it's already by handled by callers.
--- fs/cifs/sess.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/cifs/sess.c +9 -7
@@ -1214,16 +1214,18 @@ out_free_smb_buf:static void sess_free_buffer (struct sess_data *sess_data) { -int i; +struct kvec *iov = sess_data->iov; -/* zero the session data before freeing, as it might contain sensitive info (keys, etc) */ -for (i =0 ; i <3 ; i++) -if (sess_data->iov[i].iov_base) -memzero_explicit (sess_data->iov[i].iov_base, sess_data->iov[i].iov_len); +/* +* Zero the session data before freeing, as it might contain sensitive info (keys, etc). +* Note that iov[1] is already freed by caller. +*/ +if (sess_data->buf0_type !=CIFS_NO_BUFFER && iov[0 ].iov_base) +memzero_explicit (iov[0 ].iov_base, iov[0 ].iov_len); -free_rsp_buf (sess_data->buf0_type, sess_data->iov[0 ].iov_base); +free_rsp_buf (sess_data->buf0_type, iov[0 ].iov_base); sess_data->buf0_type =CIFS_NO_BUFFER ; -kfree (sess_data->iov[2 ].iov_base); +kfree_sensitive (iov[2 ].iov_base); } static int
Greg Kroah-Hartman
maintainerPATCH 1071/1073 cifs: Fix xid leak in cifs_get_file_info_unix()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit 10269f13257d4eb6061d09ccce61666316df9838 upstream.
If stardup the symlink target failed, should free the xid, otherwise the xid will be leaked.
--- fs/cifs/inode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cifs/inode.c +4 -2
@@ -368,8 +368,10 @@ cifs_get_file_info_unix(struct file *filif (cfile->symlink_target) { fattr.cf_symlink_target =kstrdup (cfile->symlink_target,GFP_KERNEL ); -if (!fattr.cf_symlink_target) -return -ENOMEM ; +if (!fattr.cf_symlink_target) { + rc = -ENOMEM ; + goto cifs_gfiunix_out; + } } rc =CIFSSMBUnixQFileInfo (xid, tcon, cfile->fid.netfid, &find_data);
Greg Kroah-Hartman
maintainerPATCH 1072/1073 cifs: fix memory leaks in session setup
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 01f2ee7e325611524078009d70392a5d5eca0945 upstream.
We were only zeroing out the ntlmssp blob but forgot to free the allocated buffer in the end of SMB2_sess_auth_rawntlmssp_negotiate() and SMB2_sess_auth_rawntlmssp_authenticate() functions.
This fixes below kmemleak reports:
unreferenced object 0xffff88800ddcfc60 (size 96):
comm "mount.cifs", pid 758, jiffies 4294696066 (age 42.967s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d0beeb29>] __kmalloc+0x39/0xa0
[<00000000e3834047>] build_ntlmssp_smb3_negotiate_blob+0x2c/0x110 [cifs]
[<00000000e85f5ab2>] SMB2_sess_auth_rawntlmssp_negotiate+0xd3/0x230 [cifs]
[<0000000080fdb897>] SMB2_sess_setup+0x16c/0x2a0 [cifs]
[<000000009af320a8>] cifs_setup_session+0x13b/0x370 [cifs]
[<00000000f15d5982>] cifs_get_smb_ses+0x643/0xb90 [cifs]
[<00000000fe15eb90>] mount_get_conns+0x63/0x3e0 [cifs]
[<00000000768aba03>] mount_get_dfs_conns+0x16/0xa0 [cifs]
[<00000000cf1cf146>] cifs_mount+0x1c2/0x9a0 [cifs]
[<000000000d66b51e>] cifs_smb3_do_mount+0x10e/0x710 [cifs]
[<0000000077a996c5>] smb3_get_tree+0xf4/0x200 [cifs]
[<0000000094dbd041>] vfs_get_tree+0x23/0xc0
[<000000003a8561de>] path_mount+0x2d3/0xb50
[<00000000ed5c86d6>] __x64_sys_mount+0x102/0x140
[<00000000142142f3>] do_syscall_64+0x3b/0x90
[<00000000e2b89731>] entry_SYSCALL_64_after_hwframe+0x63/0xcd
unreferenced object 0xffff88801437f000 (size 512):
comm "mount.cifs", pid 758, jiffies 4294696067 (age 42.970s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d0beeb29>] __kmalloc+0x39/0xa0
[<00000000004f53d2>] build_ntlmssp_auth_blob+0x4f/0x340 [cifs]
[<000000005f333084>] SMB2_sess_auth_rawntlmssp_authenticate+0xd4/0x250 [cifs]
[<0000000080fdb897>] SMB2_sess_setup+0x16c/0x2a0 [cifs]
[<000000009af320a8>] cifs_setup_session+0x13b/0x370 [cifs]
[<00000000f15d5982>] cifs_get_smb_ses+0x643/0xb90 [cifs]
[<00000000fe15eb90>] mount_get_conns+0x63/0x3e0 [cifs]
[<00000000768aba03>] mount_get_dfs_conns+0x16/0xa0 [cifs]
[<00000000cf1cf146>] cifs_mount+0x1c2/0x9a0 [cifs]
[<000000000d66b51e>] cifs_smb3_do_mount+0x10e/0x710 [cifs]
[<0000000077a996c5>] smb3_get_tree+0xf4/0x200 [cifs]
[<0000000094dbd041>] vfs_get_tree+0x23/0xc0
[<000000003a8561de>] path_mount+0x2d3/0xb50
[<00000000ed5c86d6>] __x64_sys_mount+0x102/0x140
[<00000000142142f3>] do_syscall_64+0x3b/0x90
[<00000000e2b89731>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- fs/cifs/smb2pdu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
fs/cifs/smb2pdu.c +7 -8
@@ -1345,14 +1345,13 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_static void SMB2_sess_free_buffer (struct SMB2_sess_data *sess_data) { -int i; +struct kvec *iov = sess_data->iov; -/* zero the session data before freeing, as it might contain sensitive info (keys, etc) */ -for (i =0 ; i <2 ; i++) -if (sess_data->iov[i].iov_base) -memzero_explicit (sess_data->iov[i].iov_base, sess_data->iov[i].iov_len); +/* iov[1] is already freed by caller */ +if (sess_data->buf0_type !=CIFS_NO_BUFFER && iov[0 ].iov_base) +memzero_explicit (iov[0 ].iov_base, iov[0 ].iov_len); -free_rsp_buf (sess_data->buf0_type, sess_data->iov[0 ].iov_base); +free_rsp_buf (sess_data->buf0_type, iov[0 ].iov_base); sess_data->buf0_type =CIFS_NO_BUFFER ; }
@@ -1582,7 +1581,7 @@ SMB2_sess_auth_rawntlmssp_negotiate(stru } out: -memzero_explicit (ntlmssp_blob, blob_length); +kfree_sensitive (ntlmssp_blob);SMB2_sess_free_buffer (sess_data);if (!rc) { sess_data->result =0 ;
@@ -1666,7 +1665,7 @@ SMB2_sess_auth_rawntlmssp_authenticate(s }#endif out: -memzero_explicit (ntlmssp_blob, blob_length); +kfree_sensitive (ntlmssp_blob);SMB2_sess_free_buffer (sess_data);kfree_sensitive (ses->ntlmssp); ses->ntlmssp =NULL ;
Greg Kroah-Hartman
maintainerPATCH 1073/1073 cifs: fix use-after-free on the link name
In reply to Greg Kroah-HartmanFrom: ChenXiaoSong <[email protected]>
commit 542228db2f28fdf775b301f2843e1fe486e7c797 upstream.
xfstests generic/011 reported use-after-free bug as follows:
BUG: KASAN: use-after-free in __d_alloc+0x269/0x859 Read of size 15 at addr ffff8880078933a0 by task dirstress/952 CPU: 1 PID: 952 Comm: dirstress Not tainted 6.1.0-rc3+ #77 Call Trace: __dump_stack+0x23/0x29 dump_stack_lvl+0x51/0x73 print_address_description+0x67/0x27f print_report+0x3e/0x5c kasan_report+0x7b/0xa8 kasan_check_range+0x1b2/0x1c1 memcpy+0x22/0x5d __d_alloc+0x269/0x859 d_alloc+0x45/0x20c d_alloc_parallel+0xb2/0x8b2 lookup_open+0x3b8/0x9f9 open_last_lookups+0x63d/0xc26 path_openat+0x11a/0x261 do_filp_open+0xcc/0x168 do_sys_openat2+0x13b/0x3f7 do_sys_open+0x10f/0x146 __se_sys_creat+0x27/0x2e __x64_sys_creat+0x55/0x6a do_syscall_64+0x40/0x96 entry_SYSCALL_64_after_hwframe+0x63/0xcd Allocated by task 952: kasan_save_stack+0x1f/0x42 kasan_set_track+0x21/0x2a kasan_save_alloc_info+0x17/0x1d __kasan_kmalloc+0x7e/0x87 __kmalloc_node_track_caller+0x59/0x155 kstrndup+0x60/0xe6 parse_mf_symlink+0x215/0x30b check_mf_symlink+0x260/0x36a cifs_get_inode_info+0x14e1/0x1690 cifs_revalidate_dentry_attr+0x70d/0x964 cifs_revalidate_dentry+0x36/0x62 cifs_d_revalidate+0x162/0x446 lookup_open+0x36f/0x9f9 open_last_lookups+0x63d/0xc26 path_openat+0x11a/0x261 do_filp_open+0xcc/0x168 do_sys_openat2+0x13b/0x3f7 do_sys_open+0x10f/0x146 __se_sys_creat+0x27/0x2e __x64_sys_creat+0x55/0x6a do_syscall_64+0x40/0x96 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 950: kasan_save_stack+0x1f/0x42 kasan_set_track+0x21/0x2a kasan_save_free_info+0x1c/0x34 ____kasan_slab_free+0x1c1/0x1d5 __kasan_slab_free+0xe/0x13 __kmem_cache_free+0x29a/0x387 kfree+0xd3/0x10e cifs_fattr_to_inode+0xb6a/0xc8c cifs_get_inode_info+0x3cb/0x1690 cifs_revalidate_dentry_attr+0x70d/0x964 cifs_revalidate_dentry+0x36/0x62 cifs_d_revalidate+0x162/0x446 lookup_open+0x36f/0x9f9 open_last_lookups+0x63d/0xc26 path_openat+0x11a/0x261 do_filp_open+0xcc/0x168 do_sys_openat2+0x13b/0x3f7 do_sys_open+0x10f/0x146 __se_sys_creat+0x27/0x2e __x64_sys_creat+0x55/0x6a do_syscall_64+0x40/0x96 entry_SYSCALL_64_after_hwframe+0x63/0xcd
When opened a symlink, link name is from 'inode->i_link', but it may be reset to a new value when revalidate the dentry. If some processes get the link name on the race scenario, then UAF will happen on link name.
Fix this by implementing 'get_link' interface to duplicate the link name.
--- fs/cifs/cifsfs.c | 26 +++++++++++++++++++++++++- fs/cifs/inode.c | 5 ----- 2 files changed, 25 insertions(+), 6 deletions(-)
fs/cifs/cifsfs.c +25 -1
@@ -1143,8 +1143,32 @@ const struct inode_operations cifs_file_ .fiemap = cifs_fiemap, }; +const char *cifs_get_link (struct dentry *dentry,struct inode *inode, +struct delayed_call *done) +{ +char *target_path; + + target_path =kmalloc (PATH_MAX ,GFP_KERNEL ); +if (!target_path) +return ERR_PTR (-ENOMEM ); + +spin_lock (&inode->i_lock); +if (likely (CIFS_I (inode)->symlink_target)) { +strscpy (target_path,CIFS_I (inode)->symlink_target,PATH_MAX ); + }else { +kfree (target_path); + target_path =ERR_PTR (-EOPNOTSUPP ); + } +spin_unlock (&inode->i_lock); + +if (!IS_ERR (target_path)) +set_delayed_call (done, kfree_link, target_path); + +return target_path; +} +const struct inode_operations cifs_symlink_inode_ops = { - .get_link = simple_get_link, + .get_link = cifs_get_link, .permission = cifs_permission, .listxattr = cifs_listxattr, };
fs/cifs/inode.c +0 -5
@@ -215,11 +215,6 @@ cifs_fattr_to_inode(struct inode *inode,kfree (cifs_i->symlink_target); cifs_i->symlink_target = fattr->cf_symlink_target; fattr->cf_symlink_target =NULL ; - -if (unlikely (!cifs_i->symlink_target)) - inode->i_link =ERR_PTR (-EOPNOTSUPP ); -else - inode->i_link = cifs_i->symlink_target; }spin_unlock (&inode->i_lock);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, armv7, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing the following problems, as with 6.1, with GCC-8 on allmodconfig on the following architectures: Arm64 [2], Arm [1][2], i386 [1], mips [1], parisc [1], sh [1]. With GCC-12 on allmodconfig: arm64 [2], arm [2].
[1] Problem on 32-bits:
| /builds/linux/drivers/pwm/pwm-tegra.c: In function 'tegra_pwm_config':
| /builds/linux/drivers/pwm/pwm-tegra.c:148:53: error: result of '1000000000 << 8' requires 39 bits to represent, but 'long int' only has 32 bits [-Werror=shift-overflow=]
| required_clk_rate = DIV_ROUND_UP_ULL(NSEC_PER_SEC << PWM_DUTY_WIDTH,
| ^~
| /builds/linux/include/linux/math.h:40:32: note: in definition of macro 'DIV_ROUND_DOWN_ULL'
| ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })
| ^~
| /builds/linux/drivers/pwm/pwm-tegra.c:148:23: note: in expansion of macro 'DIV_ROUND_UP_ULL'
| required_clk_rate = DIV_ROUND_UP_ULL(NSEC_PER_SEC << PWM_DUTY_WIDTH,
| ^~~~~~~~~~~~~~~~
| cc1: all warnings being treated as errorsAnd [2] problem with qcom_rpm:
| /builds/linux/drivers/mfd/qcom_rpm.c: In function 'qcom_rpm_remove': | /builds/linux/drivers/mfd/qcom_rpm.c:680:19: error: unused variable 'rpm' [-Werror=unused-variable] | struct qcom_rpm *rpm = dev_get_drvdata(&pdev->dev); | ^~~
Greetings!
Daniel Díaz
[email protected]
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.0:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
130 tests: 130 pass, 0 failLinux version: 6.0.16-rc1-ga1ecccf7f610
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.0:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
120 tests: 120 pass, 0 failLinux version: 6.0.16-rc1-g05397cfe6e37
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.0:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
116 tests: 116 pass, 0 failLinux version: 6.0.16-rc1-g4c258f770fed
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.2.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
Build results:
total: 155 pass: 153 fail: 2
Failed builds:
arm:allmodconfig
arm64:allmodconfig
Qemu test results:
total: 500 pass: 500 fail: 0
Build errors as reported.
Guenter
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
Daniel Díaz reported allmodconfig failures [1].
https://lore.kernel.org/stable/[email protected]/
## Build
* kernel: 6.0.16-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.0.y
* git commit: 4c258f770fed290e92e6c284822fc4b4544b9ba0
* git describe: v6.0.15-1074-g4c258f770fed
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.15-1074-g4c258f770fed
## Test Regressions (compared to v6.0.14-29-g65f3ab07fb24)
## Metric Regressions (compared to v6.0.14-29-g65f3ab07fb24)
## Test Fixes (compared to v6.0.14-29-g65f3ab07fb24)
## Metric Fixes (compared to v6.0.14-29-g65f3ab07fb24)
## Test result summary
total: 144840, pass: 128905, fail: 2636, skip: 13000, xfail: 299
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 151 total, 144 passed, 7 failed
* arm64: 49 total, 45 passed, 4 failed
* i386: 39 total, 35 passed, 4 failed
* mips: 30 total, 27 passed, 3 failed
* parisc: 8 total, 7 passed, 1 failed
* powerpc: 38 total, 32 passed, 6 failed
* riscv: 16 total, 14 passed, 2 failed
* s390: 16 total, 13 passed, 3 failed
* sh: 14 total, 12 passed, 2 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 42 total, 39 passed, 3 failed
## Test suites summary
* boot
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* perf
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.16 release. There are 1073 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 Fri, 30 Dec 2022 14:41:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.16-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah