metalefty/fedora-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Activity

kernel-6.14.0-0.rc7.20250321gitb3ee1e460951.60

Browse Source 
* Fri Mar 21 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.b3ee1e460951.60]
- mei: vsc: Fix fortify-panic caused by invalid counted_by() use (Hans de Goede)
- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis)
- include/linux: Adjust headers for C23 (Jakub Jelinek)
- x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2025-03-21 10:56:47 -06:00
parent 5c37886921
commit f8b7809310
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
24 changed files with 155 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 57
RHEL_RELEASE = 60
#
# RHEL_REBASE_NUM

15
Patchlist.changelog
View File

@ -1,11 +1,14 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/b8afd7cacd5df06e7ac6372e514ce82ec411eeec
b8afd7cacd5df06e7ac6372e514ce82ec411eeec apply -Wno-error=unterminated-string-initialization temporarily
https://gitlab.com/cki-project/kernel-ark/-/commit/af62f097f5d1c64b98900e2db09fee4ff7f21c66
af62f097f5d1c64b98900e2db09fee4ff7f21c66 mei: vsc: Fix fortify-panic caused by invalid counted_by() use
https://gitlab.com/cki-project/kernel-ark/-/commit/459a45c92c0dfdc8e8251fcc187910c20360486b
459a45c92c0dfdc8e8251fcc187910c20360486b include/linux: Adjust headers for C23
https://gitlab.com/cki-project/kernel-ark/-/commit/14299023211182156daa4f117788d7bda81e1e1c
14299023211182156daa4f117788d7bda81e1e1c apply -Wno-error=unterminated-string-initialization temporarily
https://gitlab.com/cki-project/kernel-ark/-/commit/6f0057750fea1e6efd202985194886b1f136fc8e
6f0057750fea1e6efd202985194886b1f136fc8e x86/insn_decoder_test: allow longer symbol-names
https://gitlab.com/cki-project/kernel-ark/-/commit/7bb2f5565c6dc806d422a2a9e4a6ad411f60cb03
7bb2f5565c6dc806d422a2a9e4a6ad411f60cb03 include/linux: Adjust headers for C23
https://gitlab.com/cki-project/kernel-ark/-/commit/b8aef7b7caa01acb0d171dba6b17fb130e97a293
b8aef7b7caa01acb0d171dba6b17fb130e97a293 x86/insn_decoder_test: allow longer symbol-names
https://gitlab.com/cki-project/kernel-ark/-/commit/be163c8164ebf72e9820a78774533b1f0672d751
be163c8164ebf72e9820a78774533b1f0672d751 Revert "be2iscsi: remove unsupported device IDs"

4
kernel-aarch64-16k-debug-fedora.config
View File

@ -10218,8 +10218,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-aarch64-16k-fedora.config
View File

@ -10187,8 +10187,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-aarch64-debug-fedora.config
View File

@ -10217,8 +10217,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-aarch64-fedora.config
View File

@ -10186,8 +10186,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-aarch64-rt-debug-fedora.config
View File

@ -10228,8 +10228,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-aarch64-rt-fedora.config
View File

@ -10197,8 +10197,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-ppc64le-debug-fedora.config
View File

@ -8359,8 +8359,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-ppc64le-fedora.config
View File

@ -8327,8 +8327,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-riscv64-debug-fedora.config
View File

@ -8491,8 +8491,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-riscv64-fedora.config
View File

@ -8459,8 +8459,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-riscv64-rt-debug-fedora.config
View File

@ -8502,8 +8502,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-riscv64-rt-fedora.config
View File

@ -8470,8 +8470,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-s390x-debug-fedora.config
View File

@ -8304,8 +8304,8 @@ CONFIG_VIDEO_WM8775=m
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

4
kernel-s390x-fedora.config
View File

@ -8272,8 +8272,8 @@ CONFIG_VIDEO_WM8775=m
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

6
kernel-x86_64-debug-fedora.config
View File

@ -2861,7 +2861,7 @@ CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_HID_ACPI=m
CONFIG_I2C_HID_OF_ELAN=m
# CONFIG_I2C_HID_OF_GOODIX is not set
# CONFIG_I2C_HID_OF is not set
CONFIG_I2C_HID_OF=m
CONFIG_I2C_HID=y
# CONFIG_I2C_HISI is not set
CONFIG_I2C_I801=m
@ -8937,8 +8937,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

6
kernel-x86_64-fedora.config
View File

@ -2841,7 +2841,7 @@ CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_HID_ACPI=m
CONFIG_I2C_HID_OF_ELAN=m
# CONFIG_I2C_HID_OF_GOODIX is not set
# CONFIG_I2C_HID_OF is not set
CONFIG_I2C_HID_OF=m
CONFIG_I2C_HID=y
# CONFIG_I2C_HISI is not set
CONFIG_I2C_I801=m
@ -8906,8 +8906,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

6
kernel-x86_64-rt-debug-fedora.config
View File

@ -2866,7 +2866,7 @@ CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_HID_ACPI=m
CONFIG_I2C_HID_OF_ELAN=m
# CONFIG_I2C_HID_OF_GOODIX is not set
# CONFIG_I2C_HID_OF is not set
CONFIG_I2C_HID_OF=m
CONFIG_I2C_HID=y
# CONFIG_I2C_HISI is not set
CONFIG_I2C_I801=m
@ -8948,8 +8948,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

6
kernel-x86_64-rt-fedora.config
View File

@ -2846,7 +2846,7 @@ CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_HID_ACPI=m
CONFIG_I2C_HID_OF_ELAN=m
# CONFIG_I2C_HID_OF_GOODIX is not set
# CONFIG_I2C_HID_OF is not set
CONFIG_I2C_HID_OF=m
CONFIG_I2C_HID=y
# CONFIG_I2C_HISI is not set
CONFIG_I2C_I801=m
@ -8917,8 +8917,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VIRTIO_FS=m
# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set

18
kernel.changelog
View File

@ -1,9 +1,25 @@
* Tue Mar 18 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.76b6905c11fd.57]
* Fri Mar 21 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.b3ee1e460951.60]
- mei: vsc: Fix fortify-panic caused by invalid counted_by() use (Hans de Goede)
- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis)
- include/linux: Adjust headers for C23 (Jakub Jelinek)
- x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg)
Resolves:
* Fri Mar 21 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.b3ee1e460951.59]
- Linux v6.14.0-0.rc7.b3ee1e460951
Resolves:
* Thu Mar 20 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.a7f2e10ecd8f.58]
- Linux v6.14.0-0.rc7.a7f2e10ecd8f
Resolves:
* Wed Mar 19 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.81e4f8d68c66.57]
- redhat: configs: fedora: enable CONFIG_I2C_HID_OF=m on x86 (Hans de Goede)
- redhat: move dist-relase-check behind new variable (Jan Stancek)
- Set last minute config item for 6.14 for Fedora (Justin M. Forbes)
- Linux v6.14.0-0.rc7.81e4f8d68c66
Resolves:
* Tue Mar 18 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.76b6905c11fd.56]
- redhat/configs: automotive: Disable CONFIG_USERFAULTFD config (Dorinda Bassey)
- Revert "be2iscsi: remove unsupported device IDs" (Scott Weaver)

25
kernel.spec
View File

@ -162,13 +162,13 @@ Summary: The Linux kernel
%define specrpmversion 6.14.0
%define specversion 6.14.0
%define patchversion 6.14
%define pkgrelease 0.rc7.20250318git76b6905c11fd.57
%define pkgrelease 0.rc7.20250321gitb3ee1e460951.60
%define kversion 6
%define tarfile_release 6.14-rc7-67-g76b6905c11fd
%define tarfile_release 6.14-rc7-179-gb3ee1e460951
# This is needed to do merge window version magic
%define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc7.20250318git76b6905c11fd.57%{?buildid}%{?dist}
%define specrelease 0.rc7.20250321gitb3ee1e460951.60%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.14.0
@ -4212,14 +4212,27 @@ fi\
#
#
%changelog
* Tue Mar 18 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.14.0-0.rc7.20250318git76b6905c11fd.57]
- redhat: move dist-relase-check behind new variable (Jan Stancek)
* Fri Mar 21 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.14.0-0.rc7.20250321gitb3ee1e460951.60]
- Turn VIRTIO_BLK and VIRTIO_CONSOLE inline for Fedora (Justin M. Forbes)
* Tue Mar 18 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.76b6905c11fd.57]
* Fri Mar 21 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.b3ee1e460951.60]
- mei: vsc: Fix fortify-panic caused by invalid counted_by() use (Hans de Goede)
- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis)
- include/linux: Adjust headers for C23 (Jakub Jelinek)
- x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg)
* Fri Mar 21 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.b3ee1e460951.59]
- Linux v6.14.0-0.rc7.b3ee1e460951
* Thu Mar 20 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.a7f2e10ecd8f.58]
- Linux v6.14.0-0.rc7.a7f2e10ecd8f
* Wed Mar 19 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.81e4f8d68c66.57]
- redhat: configs: fedora: enable CONFIG_I2C_HID_OF=m on x86 (Hans de Goede)
- redhat: move dist-relase-check behind new variable (Jan Stancek)
- Set last minute config item for 6.14 for Fedora (Justin M. Forbes)
- Linux v6.14.0-0.rc7.81e4f8d68c66
* Tue Mar 18 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.14.0-0.rc7.76b6905c11fd.56]
- redhat/configs: automotive: Disable CONFIG_USERFAULTFD config (Dorinda Bassey)
- Revert "be2iscsi: remove unsupported device IDs" (Scott Weaver)

67
patch-6.14-redhat.patch
View File

@ -35,6 +35,7 @@
drivers/media/i2c/ov08x40.c | 170 +++----
drivers/message/fusion/mptsas.c | 5 +
drivers/message/fusion/mptspi.c | 6 +
drivers/misc/mei/vsc-tp.c | 26 +-
drivers/net/wireguard/main.c | 6 +
drivers/pci/pci-driver.c | 9 +
drivers/pci/quirks.c | 24 +
@ -80,7 +81,7 @@
security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 11 +
82 files changed, 2834 insertions(+), 290 deletions(-)
83 files changed, 2849 insertions(+), 301 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index fb8752b42ec8..4e22c8f2f90e 100644
@ -2266,6 +2267,70 @@ index a3901fbfac4f..9dab0279bdff 100644
return 0;
out_mptspi_probe:
diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c
index 7be1649b1972..fa553d4914b6 100644
--- a/drivers/misc/mei/vsc-tp.c
+++ b/drivers/misc/mei/vsc-tp.c
@@ -36,20 +36,24 @@
#define VSC_TP_XFER_TIMEOUT_BYTES 700
#define VSC_TP_PACKET_PADDING_SIZE 1
#define VSC_TP_PACKET_SIZE(pkt) \
- (sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE)
+ (sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE)
#define VSC_TP_MAX_PACKET_SIZE \
- (sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE)
+ (sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE)
#define VSC_TP_MAX_XFER_SIZE \
(VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES)
#define VSC_TP_NEXT_XFER_LEN(len, offset) \
- (len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE)
+ (len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE)
-struct vsc_tp_packet {
+struct vsc_tp_packet_hdr {
__u8 sync;
__u8 cmd;
__le16 len;
__le32 seq;
- __u8 buf[] __counted_by(len);
+};
+
+struct vsc_tp_packet {
+ struct vsc_tp_packet_hdr hdr;
+ __u8 buf[VSC_TP_MAX_XFER_SIZE - sizeof(struct vsc_tp_packet_hdr)];
};
struct vsc_tp {
@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tp *tp, void *obuf, void *ibuf, size_t len
static int vsc_tp_xfer_helper(struct vsc_tp *tp, struct vsc_tp_packet *pkt,
void *ibuf, u16 ilen)
{
- int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet);
+ 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;
int count_down = VSC_TP_MAX_XFER_COUNT;
u32 recv_crc = 0, crc = ~0;
- struct vsc_tp_packet ack;
+ struct vsc_tp_packet_hdr ack;
u8 *dst = (u8 *)&ack;
bool synced = false;
@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void *obuf, size_t olen,
guard(mutex)(&tp->mutex);
- pkt->sync = VSC_TP_PACKET_SYNC;
- pkt->cmd = cmd;
- pkt->len = cpu_to_le16(olen);
- pkt->seq = cpu_to_le32(++tp->seq);
+ pkt->hdr.sync = VSC_TP_PACKET_SYNC;
+ pkt->hdr.cmd = cmd;
+ pkt->hdr.len = cpu_to_le16(olen);
+ pkt->hdr.seq = cpu_to_le32(++tp->seq);
memcpy(pkt->buf, obuf, olen);
crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen);
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
index a00671b58701..eeef2766b8b3 100644
--- a/drivers/net/wireguard/main.c

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.14-rc7-67-g76b6905c11fd.tar.xz) = feba53add240f77cc9918f5d2db0ef7bea3921fdd8e12f75d42d4d2e6e016ceb798cf29e947dd8cea60093172404dd6a168644cd5380122a0f1b4c98a67c43e4
SHA512 (kernel-abi-stablelists-6.14.0.tar.xz) = 988f81f28c45ae5818b0c3f14406e5a77fcde1bbaceda2e49be749738a1c91577eb3fe6a5c1e36a65ae1f337a1d2e5cdf51f4b10443ae3ae1cd73c4aa20e6341
SHA512 (kernel-kabi-dw-6.14.0.tar.xz) = ee02b369e5d63f094d1e1fd1f1a6771626faa773e6312afaab78f244b533120b087d4682d4f70f4fda430823fc237275517917b03f6a2f8f454e41b29ffbb9ee
SHA512 (linux-6.14-rc7-179-gb3ee1e460951.tar.xz) = debdb5448e069befc03031a22ffc43d2424c1a33e147ae4e05ca67e97ad06df8e181941f13ffef4443e05203e561e8354aab5c421d4ac49c84715a6025afa930
SHA512 (kernel-abi-stablelists-6.14.0.tar.xz) = d173b6d746505b6ef74abc5d6fe7418a8c11a7241fc78bee20e49c3d61aa5ea5a5980156a0521465e93e3e74686145f1d1121d4ea08187c7dbe2df00b01216cf
SHA512 (kernel-kabi-dw-6.14.0.tar.xz) = 13880f04cc322787f3c9e1a56a014b8b0b2f1a70fd4dc26d4acf57d45a2c3aec50688289e6ea4ff866767b6ce1f703c2b770a895385a210d7573067a3fc0079d