* [merged mm-nonmm-stable] s390-vmlogrdr-remove-function-pointer-cast.patch removed from -mm tree
@ 2024-04-26 4:08 Andrew Morton
2024-04-26 8:09 ` Heiko Carstens
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Morton @ 2024-04-26 4:08 UTC (permalink / raw)
To: mm-commits, wintera, twinkler, svens, hca, gor, borntraeger,
arnd, agordeev, nathan, akpm
The quilt patch titled
Subject: s390/vmlogrdr: remove function pointer cast
has been removed from the -mm tree. Its filename was
s390-vmlogrdr-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/vmlogrdr: remove function pointer cast
Date: Wed, 17 Apr 2024 11:24:35 -0700
Patch series "drivers/s390: Fix instances of -Wcast-function-type-strict".
This series resolves the instances of -Wcast-function-type-strict that
show up in my s390 builds on -next, which has this warning enabled by
default.
This patch (of 3):
Clang warns (or errors with CONFIG_WERROR) after enabling
-Wcast-function-type-strict by default:
drivers/s390/char/vmlogrdr.c:746:18: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
746 | 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-0-fd048c9903b0@kernel.org
Link: https://lkml.kernel.org/r/20240417-s390-drivers-fix-cast-function-type-v1-1-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/char/vmlogrdr.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- a/drivers/s390/char/vmlogrdr.c~s390-vmlogrdr-remove-function-pointer-cast
+++ a/drivers/s390/char/vmlogrdr.c
@@ -722,6 +722,10 @@ static void vmlogrdr_unregister_driver(v
iucv_unregister(&vmlogrdr_iucv_handler, 1);
}
+static void vmlogrdr_free_dev(struct device *dev)
+{
+ kfree(dev);
+}
static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
{
@@ -736,14 +740,7 @@ static int vmlogrdr_register_device(stru
dev->driver = &vmlogrdr_driver;
dev->groups = vmlogrdr_attr_groups;
dev_set_drvdata(dev, priv);
- /*
- * 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 = vmlogrdr_free_dev;
} else
return -ENOMEM;
ret = device_register(dev);
_
Patches currently in -mm which might be from nathan@kernel.org are
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [merged mm-nonmm-stable] s390-vmlogrdr-remove-function-pointer-cast.patch removed from -mm tree
2024-04-26 4:08 [merged mm-nonmm-stable] s390-vmlogrdr-remove-function-pointer-cast.patch removed from -mm tree Andrew Morton
@ 2024-04-26 8:09 ` Heiko Carstens
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2024-04-26 8:09 UTC (permalink / raw)
To: Andrew Morton
Cc: mm-commits, wintera, twinkler, svens, gor, borntraeger, arnd,
agordeev, nathan
Hi Andrew,
> The quilt patch titled
> Subject: s390/vmlogrdr: remove function pointer cast
> has been removed from the -mm tree. Its filename was
> s390-vmlogrdr-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/vmlogrdr: remove function pointer cast
> Date: Wed, 17 Apr 2024 11:24:35 -0700
>
> Patch series "drivers/s390: Fix instances of -Wcast-function-type-strict".
>
> This series resolves the instances of -Wcast-function-type-strict that
> show up in my s390 builds on -next, which has this warning enabled by
> default.
>
>
> This patch (of 3):
>
> Clang warns (or errors with CONFIG_WERROR) after enabling
> -Wcast-function-type-strict by default:
>
> drivers/s390/char/vmlogrdr.c:746:18: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
> 746 | 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-0-fd048c9903b0@kernel.org
> Link: https://lkml.kernel.org/r/20240417-s390-drivers-fix-cast-function-type-v1-1-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>
> ---
Per this discussion [1] this patch should be dropped. This will be
solved differently.
[1] https://lore.kernel.org/all/20240418102549.6056-B-hca@linux.ibm.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-26 8:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-26 4:08 [merged mm-nonmm-stable] s390-vmlogrdr-remove-function-pointer-cast.patch removed from -mm tree Andrew Morton
2024-04-26 8:09 ` Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).