[merged mm-nonmm-stable] s390-netiucv-remove-function-pointer-cast.patch removed from -mm tree

[merged mm-nonmm-stable] s390-netiucv-remove-function-pointer-cast.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: s390/netiucv: remove function pointer cast
has been removed from the -mm tree.  Its filename was
     s390-netiucv-remove-function-pointer-cast.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Nathan Chancellor <nathan@kernel.org>
Subject: s390/netiucv: remove function pointer cast
Date: Wed, 17 Apr 2024 11:24:37 -0700

Clang warns (or errors with CONFIG_WERROR) after enabling
-Wcast-function-type-strict by default:

  drivers/s390/net/netiucv.c:1716:18: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
   1716 |                 dev->release = (void (*)(struct device *))kfree;
        |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  1 error generated.

Add a standalone function to fix the warning properly, which addresses
the root of the warning that these casts are not safe for kCFI. The
comment is not really relevant after this change, so remove it.

Link: https://lkml.kernel.org/r/20240417-s390-drivers-fix-cast-function-type-v1-3-fd048c9903b0@kernel.org
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandra Winter <wintera@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thorsten Winkler <twinkler@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/s390/net/netiucv.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

--- a/drivers/s390/net/netiucv.c~s390-netiucv-remove-function-pointer-cast
+++ a/drivers/s390/net/netiucv.c
@@ -1693,6 +1693,11 @@ static const struct attribute_group *net
 	NULL,
 };
 
+static void netiucv_free_dev(struct device *dev)
+{
+	kfree(dev);
+}
+
 static int netiucv_register_device(struct net_device *ndev)
 {
 	struct netiucv_priv *priv = netdev_priv(ndev);
@@ -1706,14 +1711,7 @@ static int netiucv_register_device(struc
 		dev->bus = &iucv_bus;
 		dev->parent = iucv_root;
 		dev->groups = netiucv_attr_groups;
-		/*
-		 * The release function could be called after the
-		 * module has been unloaded. It's _only_ task is to
-		 * free the struct. Therefore, we specify kfree()
-		 * directly here. (Probably a little bit obfuscating
-		 * but legitime ...).
-		 */
-		dev->release = (void (*)(struct device *))kfree;
+		dev->release = netiucv_free_dev;
 		dev->driver = &netiucv_driver;
 	} else
 		return -ENOMEM;
_

Patches currently in -mm which might be from nathan@kernel.org are

Re: [merged mm-nonmm-stable] s390-netiucv-remove-function-pointer-cast.patch removed from -mm tree

[Heiko Carstens]

On Thu, Apr 25, 2024 at 09:08:13PM -0700, Andrew Morton wrote:
> The quilt patch titled
>      Subject: s390/netiucv: remove function pointer cast
> has been removed from the -mm tree.  Its filename was
>      s390-netiucv-remove-function-pointer-cast.patch
> 
> This patch was dropped because it was merged into the mm-nonmm-stable branch
> of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> 
> ------------------------------------------------------
> From: Nathan Chancellor <nathan@kernel.org>
> Subject: s390/netiucv: remove function pointer cast
> Date: Wed, 17 Apr 2024 11:24:37 -0700
> 
> Clang warns (or errors with CONFIG_WERROR) after enabling
> -Wcast-function-type-strict by default:
> 
>   drivers/s390/net/netiucv.c:1716:18: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
>    1716 |                 dev->release = (void (*)(struct device *))kfree;
>         |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   1 error generated.
> 
> Add a standalone function to fix the warning properly, which addresses
> the root of the warning that these casts are not safe for kCFI. The
> comment is not really relevant after this change, so remove it.
> 
> Link: https://lkml.kernel.org/r/20240417-s390-drivers-fix-cast-function-type-v1-3-fd048c9903b0@kernel.org
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Alexandra Winter <wintera@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Sven Schnelle <svens@linux.ibm.com>
> Cc: Thorsten Winkler <twinkler@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/s390/net/netiucv.c |   14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)

And this one should be dropped as well.

Re: [merged mm-nonmm-stable] s390-netiucv-remove-function-pointer-cast.patch removed from -mm tree

[Andrew Morton]

On Fri, 26 Apr 2024 10:10:05 +0200 Heiko Carstens <hca@linux.ibm.com> wrote:

> >  drivers/s390/net/netiucv.c |   14 ++++++--------
> >  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> And this one should be dropped as well.

Thanks, I dropped all three.