From: Greg Kroah-Hartman Date: Tue, 16 Jun 2026 04:52:26 +0000 (+0530) Subject: 6.12-stable patches X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=006bc7221113d507e11c84733d5af830deed2597;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: ipmi-ssif-null-thread-on-error.patch ipmi-ssif-remove-unnecessary-indention.patch --- diff --git a/queue-6.12/ipmi-ssif-null-thread-on-error.patch b/queue-6.12/ipmi-ssif-null-thread-on-error.patch new file mode 100644 index 0000000000..692879d86c --- /dev/null +++ b/queue-6.12/ipmi-ssif-null-thread-on-error.patch @@ -0,0 +1,34 @@ +From a8aebe93a4938c0ca1941eeaae821738f869be3d Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 21 Apr 2026 06:50:22 -0500 +Subject: ipmi:ssif: NULL thread on error + +From: Corey Minyard + +commit a8aebe93a4938c0ca1941eeaae821738f869be3d upstream. + +Cleanup code was checking the thread for NULL, but it was possibly +a PTR_ERR() in one spot. + +Spotted with static analysis. + +Link: https://sourceforge.net/p/openipmi/mailman/message/59324676/ +Fixes: 75c486cb1bca ("ipmi:ssif: Clean up kthread on errors") +Cc: # 91eb7ec72612: ipmi:ssif: Remove unnecessary indention +Cc: stable@vger.kernel.org +Signed-off-by: Corey Minyard +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/ipmi/ipmi_ssif.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/char/ipmi/ipmi_ssif.c ++++ b/drivers/char/ipmi/ipmi_ssif.c +@@ -1907,6 +1907,7 @@ static int ssif_probe(struct i2c_client + "kssif%4.4x", thread_num); + if (IS_ERR(ssif_info->thread)) { + rv = PTR_ERR(ssif_info->thread); ++ ssif_info->thread = NULL; + dev_notice(&ssif_info->client->dev, + "Could not start kernel thread: error %d\n", + rv); diff --git a/queue-6.12/ipmi-ssif-remove-unnecessary-indention.patch b/queue-6.12/ipmi-ssif-remove-unnecessary-indention.patch new file mode 100644 index 0000000000..d41474678e --- /dev/null +++ b/queue-6.12/ipmi-ssif-remove-unnecessary-indention.patch @@ -0,0 +1,62 @@ +From 91eb7ec7261254b6875909df767185838598e21e Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Mon, 13 Apr 2026 07:09:15 -0500 +Subject: ipmi:ssif: Remove unnecessary indention + +From: Corey Minyard + +commit 91eb7ec7261254b6875909df767185838598e21e upstream. + +A section was in {} that didn't need to be, move the variable +definition to the top and set th eindentino properly. + +Signed-off-by: Corey Minyard +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/ipmi/ipmi_ssif.c | 28 ++++++++++++---------------- + 1 file changed, 12 insertions(+), 16 deletions(-) + +--- a/drivers/char/ipmi/ipmi_ssif.c ++++ b/drivers/char/ipmi/ipmi_ssif.c +@@ -1681,6 +1681,7 @@ static int ssif_probe(struct i2c_client + int len = 0; + int i; + u8 slave_addr = 0; ++ unsigned int thread_num; + struct ssif_addr_info *addr_info = NULL; + + mutex_lock(&ssif_infos_mutex); +@@ -1899,22 +1900,17 @@ static int ssif_probe(struct i2c_client + ssif_info->handlers.request_events = request_events; + ssif_info->handlers.set_need_watch = ssif_set_need_watch; + +- { +- unsigned int thread_num; +- +- thread_num = ((i2c_adapter_id(ssif_info->client->adapter) +- << 8) | +- ssif_info->client->addr); +- init_completion(&ssif_info->wake_thread); +- ssif_info->thread = kthread_run(ipmi_ssif_thread, ssif_info, +- "kssif%4.4x", thread_num); +- if (IS_ERR(ssif_info->thread)) { +- rv = PTR_ERR(ssif_info->thread); +- dev_notice(&ssif_info->client->dev, +- "Could not start kernel thread: error %d\n", +- rv); +- goto out; +- } ++ thread_num = ((i2c_adapter_id(ssif_info->client->adapter) << 8) | ++ ssif_info->client->addr); ++ init_completion(&ssif_info->wake_thread); ++ ssif_info->thread = kthread_run(ipmi_ssif_thread, ssif_info, ++ "kssif%4.4x", thread_num); ++ if (IS_ERR(ssif_info->thread)) { ++ rv = PTR_ERR(ssif_info->thread); ++ dev_notice(&ssif_info->client->dev, ++ "Could not start kernel thread: error %d\n", ++ rv); ++ goto out; + } + + dev_set_drvdata(&ssif_info->client->dev, ssif_info); diff --git a/queue-6.12/series b/queue-6.12/series index 8528b2164e..03a8b2e727 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -242,3 +242,5 @@ rdma-move-dma-block-iterator-logic-into-dedicated-files.patch rdma-umem-fix-truncation-for-block-sizes-4g.patch mm-hugetlb-avoid-false-positive-lockdep-assertion.patch mptcp-fix-missing-wakeups-in-edge-scenarios.patch +ipmi-ssif-remove-unnecessary-indention.patch +ipmi-ssif-null-thread-on-error.patch