release 6.14.9
This commit is contained in:
@@ -26,7 +26,7 @@ Signed-off-by: Lingbo Kong <quic_lingbok@quicinc.com>
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath12k/mac.c
|
||||
+++ b/drivers/net/wireless/ath/ath12k/mac.c
|
||||
@@ -9330,6 +9330,11 @@ ath12k_mac_op_unassign_vif_chanctx(struc
|
||||
@@ -9395,6 +9395,11 @@ ath12k_mac_op_unassign_vif_chanctx(struc
|
||||
ar->num_started_vdevs == 1 && ar->monitor_vdev_created)
|
||||
ath12k_mac_monitor_stop(ar);
|
||||
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
From 45a91b33b7de48d4ee8875d2fcc6be04d7e3919c Mon Sep 17 00:00:00 2001
|
||||
From: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Date: Sun, 20 Apr 2025 10:33:23 -0700
|
||||
Subject: gcc-15: make 'unterminated string initialization' just a warning
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
gcc-15 enabling -Wunterminated-string-initialization in -Wextra by
|
||||
default was done with the best intentions, but the warning is still
|
||||
quite broken.
|
||||
|
||||
What annoys me about the warning is that this is a very traditional AND
|
||||
CORRECT way to initialize fixed byte arrays in C:
|
||||
|
||||
unsigned char hex[16] = "0123456789abcdef";
|
||||
|
||||
and we use this all over the kernel. And the warning is fine, but gcc
|
||||
developers apparently never made a reasonable way to disable it. As is
|
||||
(sadly) tradition with these things.
|
||||
|
||||
Yes, there's "__attribute__((nonstring))", and we have a macro to make
|
||||
that absolutely disgusting syntax more palatable (ie the kernel syntax
|
||||
for that monstrosity is just "__nonstring").
|
||||
|
||||
But that attribute is misdesigned. What you'd typically want to do is
|
||||
tell the compiler that you are using a type that isn't a string but a
|
||||
byte array, but that doesn't work at all:
|
||||
|
||||
warning: ‘nonstring’ attribute does not apply to types [-Wattributes]
|
||||
|
||||
and because of this fundamental mis-design, you then have to mark each
|
||||
instance of that pattern.
|
||||
|
||||
This is particularly noticeable in our ACPI code, because ACPI has this
|
||||
notion of a 4-byte "type name" that gets used all over, and is exactly
|
||||
this kind of byte array.
|
||||
|
||||
This is a sad oversight, because the warning is useful, but really would
|
||||
be so much better if gcc had also given a sane way to indicate that we
|
||||
really just want a byte array type at a type level, not the broken "each
|
||||
and every array definition" level.
|
||||
|
||||
So now instead of creating a nice "ACPI name" type using something like
|
||||
|
||||
typedef char acpi_name_t[4] __nonstring;
|
||||
|
||||
we have to do things like
|
||||
|
||||
char name[ACPI_NAMESEG_SIZE] __nonstring;
|
||||
|
||||
in every place that uses this concept and then happens to have the
|
||||
typical initializers.
|
||||
|
||||
This is annoying me mainly because I think the warning _is_ a good
|
||||
warning, which is why I'm not just turning it off in disgust. But it is
|
||||
hampered by this bad implementation detail.
|
||||
|
||||
[ And obviously I'm doing this now because system upgrades for me are
|
||||
something that happen in the middle of the release cycle: don't do it
|
||||
before or during travel, or just before or during the busy merge
|
||||
window period. ]
|
||||
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
Makefile | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1071,6 +1071,9 @@ KBUILD_CFLAGS += $(call cc-option, -fstr
|
||||
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
|
||||
KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)
|
||||
|
||||
+#Currently, disable -Wunterminated-string-initialization as an error
|
||||
+KBUILD_CFLAGS += $(call cc-option, -Wno-error=unterminated-string-initialization)
|
||||
+
|
||||
# disable invalid "can't wrap" optimizations for signed / pointers
|
||||
KBUILD_CFLAGS += -fno-strict-overflow
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
|
||||
|
||||
--- a/net/mac80211/cfg.c
|
||||
+++ b/net/mac80211/cfg.c
|
||||
@@ -2502,7 +2502,7 @@ static inline bool _chg_mesh_attr(enum n
|
||||
@@ -2501,7 +2501,7 @@ static inline bool _chg_mesh_attr(enum n
|
||||
return (mask >> (parm-1)) & 0x1;
|
||||
}
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From 4018bbbaed061f15e0b84ea36b4aa95784934a33 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Date: Sun, 20 Apr 2025 15:30:53 -0700
|
||||
Subject: gcc-15: disable '-Wunterminated-string-initialization' entirely for
|
||||
now
|
||||
|
||||
I had left the warning around but as a non-fatal error to get my gcc-15
|
||||
builds going, but fixed up some of the most annoying warning cases so
|
||||
that it wouldn't be *too* verbose.
|
||||
|
||||
Because I like the _concept_ of the warning, even if I detested the
|
||||
implementation to shut it up.
|
||||
|
||||
It turns out the implementation to shut it up is even more broken than I
|
||||
thought, and my "shut up most of the warnings" patch just caused fatal
|
||||
errors on gcc-14 instead.
|
||||
|
||||
I had tested with clang, but when I upgrade my development environment,
|
||||
I try to do it on all machines because I hate having different systems
|
||||
to maintain, and hadn't realized that gcc-14 now had issues.
|
||||
|
||||
The ACPI case is literally why I wanted to have a *type* that doesn't
|
||||
trigger the warning (see commit d5d45a7f2619: "gcc-15: make
|
||||
'unterminated string initialization' just a warning"), instead of
|
||||
marking individual places as "__nonstring".
|
||||
|
||||
But gcc-14 doesn't like that __nonstring location that shut gcc-15 up,
|
||||
because it's on an array of char arrays, not on one single array:
|
||||
|
||||
drivers/acpi/tables.c:399:1: error: 'nonstring' attribute ignored on objects of type 'const char[][4]' [-Werror=attributes]
|
||||
399 | static const char table_sigs[][ACPI_NAMESEG_SIZE] __initconst __nonstring = {
|
||||
| ^~~~~~
|
||||
|
||||
and my attempts to nest it properly with a type had failed, because of
|
||||
how gcc doesn't like marking the types as having attributes, only
|
||||
symbols.
|
||||
|
||||
There may be some trick to it, but I was already annoyed by the bad
|
||||
attribute design, now I'm just entirely fed up with it.
|
||||
|
||||
I wish gcc had a proper way to say "this type is a *byte* array, not a
|
||||
string".
|
||||
|
||||
The obvious thing would be to distinguish between "char []" and an
|
||||
explicitly signed "unsigned char []" (as opposed to an implicitly
|
||||
unsigned char, which is typically an architecture-specific default, but
|
||||
for the kernel is universal thanks to '-funsigned-char').
|
||||
|
||||
But any "we can typedef a 8-bit type to not become a string just because
|
||||
it's an array" model would be fine.
|
||||
|
||||
But "__attribute__((nonstring))" is sadly not that sane model.
|
||||
|
||||
Reported-by: Chris Clayton <chris2553@googlemail.com>
|
||||
Fixes: 4b4bd8c50f48 ("gcc-15: acpi: sprinkle random '__nonstring' crumbles around")
|
||||
Fixes: d5d45a7f2619 ("gcc-15: make 'unterminated string initialization' just a warning")
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1071,8 +1071,8 @@ KBUILD_CFLAGS += $(call cc-option, -fstr
|
||||
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
|
||||
KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)
|
||||
|
||||
-#Currently, disable -Wunterminated-string-initialization as an error
|
||||
-KBUILD_CFLAGS += $(call cc-option, -Wno-error=unterminated-string-initialization)
|
||||
+#Currently, disable -Wunterminated-string-initialization as broken
|
||||
+KBUILD_CFLAGS += $(call cc-option, -Wno-unterminated-string-initialization)
|
||||
|
||||
# disable invalid "can't wrap" optimizations for signed / pointers
|
||||
KBUILD_CFLAGS += -fno-strict-overflow
|
||||
@@ -1,72 +0,0 @@
|
||||
From b41541948188c8834cda272defdcaceb6b5192d5 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Tue, 18 Mar 2025 15:12:03 +0100
|
||||
Subject: mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type
|
||||
|
||||
vsc_tp.tx_buf and vsc_tp.rx_buf point to a struct vsc_tp_packet, use
|
||||
the correct type instead of "void *" and use sizeof(*ptr) when allocating
|
||||
memory for these buffers.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com>
|
||||
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
||||
Link: https://lore.kernel.org/r/20250318141203.94342-3-hdegoede@redhat.com
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/misc/mei/vsc-tp.c | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/drivers/misc/mei/vsc-tp.c
|
||||
+++ b/drivers/misc/mei/vsc-tp.c
|
||||
@@ -71,8 +71,8 @@ struct vsc_tp {
|
||||
u32 seq;
|
||||
|
||||
/* command buffer */
|
||||
- void *tx_buf;
|
||||
- void *rx_buf;
|
||||
+ struct vsc_tp_packet *tx_buf;
|
||||
+ struct vsc_tp_packet *rx_buf;
|
||||
|
||||
atomic_t assert_cnt;
|
||||
wait_queue_head_t xfer_wait;
|
||||
@@ -164,7 +164,7 @@ static int vsc_tp_xfer_helper(struct vsc
|
||||
{
|
||||
int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet_hdr);
|
||||
int next_xfer_len = VSC_TP_PACKET_SIZE(pkt) + VSC_TP_XFER_TIMEOUT_BYTES;
|
||||
- u8 *src, *crc_src, *rx_buf = tp->rx_buf;
|
||||
+ u8 *src, *crc_src, *rx_buf = (u8 *)tp->rx_buf;
|
||||
int count_down = VSC_TP_MAX_XFER_COUNT;
|
||||
u32 recv_crc = 0, crc = ~0;
|
||||
struct vsc_tp_packet_hdr ack;
|
||||
@@ -324,7 +324,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, c
|
||||
guard(mutex)(&tp->mutex);
|
||||
|
||||
/* rom xfer is big endian */
|
||||
- cpu_to_be32_array(tp->tx_buf, obuf, words);
|
||||
+ cpu_to_be32_array((u32 *)tp->tx_buf, obuf, words);
|
||||
|
||||
ret = read_poll_timeout(gpiod_get_value_cansleep, ret,
|
||||
!ret, VSC_TP_ROM_XFER_POLL_DELAY_US,
|
||||
@@ -340,7 +340,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, c
|
||||
return ret;
|
||||
|
||||
if (ibuf)
|
||||
- be32_to_cpu_array(ibuf, tp->rx_buf, words);
|
||||
+ be32_to_cpu_array(ibuf, (u32 *)tp->rx_buf, words);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -494,11 +494,11 @@ static int vsc_tp_probe(struct spi_devic
|
||||
if (!tp)
|
||||
return -ENOMEM;
|
||||
|
||||
- tp->tx_buf = devm_kzalloc(dev, VSC_TP_MAX_XFER_SIZE, GFP_KERNEL);
|
||||
+ tp->tx_buf = devm_kzalloc(dev, sizeof(*tp->tx_buf), GFP_KERNEL);
|
||||
if (!tp->tx_buf)
|
||||
return -ENOMEM;
|
||||
|
||||
- tp->rx_buf = devm_kzalloc(dev, VSC_TP_MAX_XFER_SIZE, GFP_KERNEL);
|
||||
+ tp->rx_buf = devm_kzalloc(dev, sizeof(*tp->rx_buf), GFP_KERNEL);
|
||||
if (!tp->rx_buf)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From c3781ee15fb846bc6ad09a09baa2ced404e74e47 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Hellwig <hch@lst.de>
|
||||
Date: Tue, 20 May 2025 15:54:20 +0200
|
||||
Subject: loop: don't require ->write_iter for writable files in loop_configure
|
||||
|
||||
Block devices can be opened read-write even if they can't be written to
|
||||
for historic reasons. Remove the check requiring file->f_op->write_iter
|
||||
when the block devices was opened in loop_configure. The call to
|
||||
loop_check_backing_file just below ensures the ->write_iter is present
|
||||
for backing files opened for writing, which is the only check that is
|
||||
actually needed.
|
||||
|
||||
Fixes: f5c84eff634b ("loop: Add sanity check for read/write_iter")
|
||||
Reported-by: Christian Hesse <mail@eworm.de>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
Link: https://lore.kernel.org/r/20250520135420.1177312-1-hch@lst.de
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
Cherry-picked-for: https://lore.kernel.org/r/20250519175640.2fcac001@leda.eworm.net
|
||||
---
|
||||
drivers/block/loop.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
--- a/drivers/block/loop.c
|
||||
+++ b/drivers/block/loop.c
|
||||
@@ -972,9 +972,6 @@ static int loop_configure(struct loop_de
|
||||
if (!file)
|
||||
return -EBADF;
|
||||
|
||||
- if ((mode & BLK_OPEN_WRITE) && !file->f_op->write_iter)
|
||||
- return -EINVAL;
|
||||
-
|
||||
error = loop_check_backing_file(file);
|
||||
if (error)
|
||||
return error;
|
||||
Reference in New Issue
Block a user