6.18-stable patches

added patches:
	ipmi-ssif-null-thread-on-error.patch
	ipmi-ssif-remove-unnecessary-indention.patch

diff --git a/queue-6.18/ipmi-ssif-null-thread-on-error.patch b/queue-6.18/ipmi-ssif-null-thread-on-error.patch
new file mode 100644 (file)
index 0000000..e581938
--- /dev/null
+++ b/queue-6.18/ipmi-ssif-null-thread-on-error.patch
@@ -0,0 +1,34 @@
+From a8aebe93a4938c0ca1941eeaae821738f869be3d Mon Sep 17 00:00:00 2001
+From: Corey Minyard <corey@minyard.net>
+Date: Tue, 21 Apr 2026 06:50:22 -0500
+Subject: ipmi:ssif: NULL thread on error
+
+From: Corey Minyard <corey@minyard.net>
+
+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: <stable@vger.kernel.org> # 91eb7ec72612: ipmi:ssif: Remove unnecessary indention
+Cc: stable@vger.kernel.org
+Signed-off-by: Corey Minyard <corey@minyard.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -1888,6 +1888,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.18/ipmi-ssif-remove-unnecessary-indention.patch b/queue-6.18/ipmi-ssif-remove-unnecessary-indention.patch
new file mode 100644 (file)
index 0000000..16cc315
--- /dev/null
+++ b/queue-6.18/ipmi-ssif-remove-unnecessary-indention.patch
@@ -0,0 +1,62 @@
+From 91eb7ec7261254b6875909df767185838598e21e Mon Sep 17 00:00:00 2001
+From: Corey Minyard <corey@minyard.net>
+Date: Mon, 13 Apr 2026 07:09:15 -0500
+Subject: ipmi:ssif: Remove unnecessary indention
+
+From: Corey Minyard <corey@minyard.net>
+
+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 <corey@minyard.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -1662,6 +1662,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);
+@@ -1880,22 +1881,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.18/series b/queue-6.18/series
index db2bd2eb685ced31cf8ffa53cfafec7789f8ac53..a0eb5aeb345e615a50006076b75d701daefe7876 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -273,3 +273,5 @@ mm-page_alloc-return-null-early-from-alloc_frozen_pages_nolock-in-nmi-on-up.patc
 mm-slab-return-null-early-from-kmalloc_nolock-in-nmi-on-up.patch
 net-ipv6-fix-noref-dst-use-in-seg6-and-rpl-lwtunnels.patch
 netfilter-reject-zero-shift-in-nft_bitwise.patch
+ipmi-ssif-remove-unnecessary-indention.patch
+ipmi-ssif-null-thread-on-error.patch