Skip to contentSkip to conversation

Linux 6.1.27

DISCUSSION Greg Kroah-Hartman 2 participants 4 messages Apr 30, 2023 – May 1, 2023 Stable branch

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 6.1.27 kernel.

All users of the 6.1 kernel series must upgrade.

The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/riscv/vm-layout.rst                           |    4 
 Makefile                                                    |    2 
 arch/arm64/kvm/mmu.c                                        |   47 ++--
 arch/riscv/include/asm/fixmap.h                             |    8 
 arch/riscv/include/asm/pgtable.h                            |    8 
 arch/riscv/kernel/setup.c                                   |    6 
 arch/riscv/mm/init.c                                        |   82 +++-----
 arch/x86/Makefile.um                                        |    5 
 drivers/base/dd.c                                           |    7 
 drivers/gpio/gpiolib-acpi.c                                 |   13 +
 drivers/gpu/drm/drm_fb_helper.c                             |    3 
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |    5 
 drivers/phy/broadcom/phy-brcm-usb.c                         |    4 
 drivers/usb/serial/option.c                                 |    6 
 fs/btrfs/send.c                                             |    2 
 fs/btrfs/volumes.c                                          |    2 
 mm/mempolicy.c                                              |  115 +++++-------
 net/bluetooth/hci_sock.c                                    |    9 
 net/mptcp/protocol.c                                        |   74 +++++--
 net/mptcp/protocol.h                                        |    2 
 net/mptcp/subflow.c                                         |   80 ++++++++
 21 files changed, 308 insertions(+), 176 deletions(-)

Alexandre Ghiti (3):
riscv: Move early dtb mapping into the fixmap region
riscv: Do not set initial_boot_params to the linear address of the dtb
riscv: No need to relocate the dtb as it lies in the fixmap region

Arınç ÜNAL (1):
USB: serial: option: add UNISOC vendor and TOZED LT70C product

Daniel Vetter (1):
drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var

David Gow (1):
um: Only disable SSE on clang to work around old GCC bugs

David Matlack (1):
KVM: arm64: Retry fault if vma_lookup() results become invalid

Florian Fainelli (1):
phy: phy-brcm-usb: Utilize platform_get_irq_byname_optional()

Genjian Zhang (1):
btrfs: fix uninitialized variable warnings

Greg Kroah-Hartman (1):

      Linux 6.1.27

Jisoo Jang (1):
wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies()

Liam R. Howlett (1):
mm/mempolicy: fix use-after-free of VMA iterator

Paolo Abeni (2):
mptcp: stops worker on unaccepted sockets at listener close
mptcp: fix accept vs worker race

Ruihan Li (1):
bluetooth: Perform careful capability checks in hci_sock_ioctl()

Stephen Boyd (1):
driver core: Don't require dynamic_debug for initcall_debug probe timing

Werner Sembach (1):
gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU

author maintainer
#1 lore raw
Documentation/riscv/vm-layout.rst +2 -2
index 5b36e45fef60..edb533128712 100644
@@ -47,7 +47,7 @@ RISC-V Linux Kernel SV39
                                                               | Kernel-space virtual memory, shared between all processes:
   ____________________________________________________________|___________________________________________________________
                     |            |                  |         |
-   ffffffc6fee00000 | -228    GB | ffffffc6feffffff |    2 MB | fixmap
+   ffffffc6fea00000 | -228    GB | ffffffc6feffffff |    6 MB | fixmap
    ffffffc6ff000000 | -228    GB | ffffffc6ffffffff |   16 MB | PCI io
    ffffffc700000000 | -228    GB | ffffffc7ffffffff |    4 GB | vmemmap
    ffffffc800000000 | -224    GB | ffffffd7ffffffff |   64 GB | vmalloc/ioremap space
@@ -83,7 +83,7 @@ RISC-V Linux Kernel SV48
                                                               | Kernel-space virtual memory, shared between all processes:
   ____________________________________________________________|___________________________________________________________
                     |            |                  |         |
-   ffff8d7ffee00000 |  -114.5 TB | ffff8d7ffeffffff |    2 MB | fixmap
+   ffff8d7ffea00000 |  -114.5 TB | ffff8d7ffeffffff |    6 MB | fixmap
    ffff8d7fff000000 |  -114.5 TB | ffff8d7fffffffff |   16 MB | PCI io
    ffff8d8000000000 |  -114.5 TB | ffff8f7fffffffff |    2 TB | vmemmap
    ffff8f8000000000 |  -112.5 TB | ffffaf7fffffffff |   32 TB | vmalloc/ioremap space
Makefile +1 -1
index d2eff3747f2f..a5cfcd0a85a9 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 26
+SUBLEVEL = 27
 EXTRAVERSION =
 NAME = Hurr durr I'ma ninja sloth
 
arch/arm64/kvm/mmu.c +21 -26

63 lines not on this page · raw message

arch/riscv/include/asm/fixmap.h +8 -0
index 5c3e7b97fcc6..0a55099bb734 100644
@@ -22,6 +22,14 @@
  */
 enum fixed_addresses {
 	FIX_HOLE,
+	/*
+	 * The fdt fixmap mapping must be PMD aligned and will be mapped
+	 * using PMD entries in fixmap_pmd in 64-bit and a PGD entry in 32-bit.
+	 */
+	FIX_FDT_END,
+	FIX_FDT = FIX_FDT_END + FIX_FDT_SIZE / PAGE_SIZE - 1,
+
+	/* Below fixmaps will be mapped using fixmap_pte */
 	FIX_PTE,
 	FIX_PMD,
 	FIX_PUD,
arch/riscv/include/asm/pgtable.h +6 -2
index 92ec2d9d7273..2aeaf8e3a4ab 100644
@@ -87,9 +87,13 @@
 
 #define FIXADDR_TOP      PCI_IO_START
 #ifdef CONFIG_64BIT
-#define FIXADDR_SIZE     PMD_SIZE
+#define MAX_FDT_SIZE	 PMD_SIZE
+#define FIX_FDT_SIZE	 (MAX_FDT_SIZE + SZ_2M)
+#define FIXADDR_SIZE     (PMD_SIZE + FIX_FDT_SIZE)
 #else
-#define FIXADDR_SIZE     PGDIR_SIZE
+#define MAX_FDT_SIZE	 PGDIR_SIZE
+#define FIX_FDT_SIZE	 MAX_FDT_SIZE
+#define FIXADDR_SIZE     (PGDIR_SIZE + FIX_FDT_SIZE)
 #endif
 #define FIXADDR_START    (FIXADDR_TOP - FIXADDR_SIZE)
 
arch/riscv/kernel/setup.c +1 -5
index 86acd690d529..2acf51c23567 100644
@@ -278,12 +278,8 @@ void __init setup_arch(char **cmdline_p)
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
 	unflatten_and_copy_device_tree();
 #else
-	if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
-		unflatten_device_tree();
-	else
-		pr_err("No DTB found in kernel mappings\n");
+	unflatten_device_tree();
 #endif
-	early_init_fdt_scan_reserved_mem();
 	misc_mem_init();
 
 	init_resources();
arch/riscv/mm/init.c +36 -46

144 lines not on this page · raw message

arch/x86/Makefile.um +5 -0
index d2e95d1d4db7..1aa64846e539 100644
@@ -3,9 +3,14 @@ core-y += arch/x86/crypto/
 
 #
 # Disable SSE and other FP/SIMD instructions to match normal x86
+# This is required to work around issues in older LLVM versions, but breaks
+# GCC versions < 11. See:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99652
 #
+ifeq ($(CONFIG_CC_IS_CLANG),y)
 KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
 KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
+endif
 
 ifeq ($(CONFIG_X86_32),y)
 START := 0x8048000
drivers/base/dd.c +6 -1
index c463173f1fb1..97ab1468a876 100644
@@ -718,7 +718,12 @@ static int really_probe_debug(struct device *dev, struct device_driver *drv)
 	calltime = ktime_get();
 	ret = really_probe(dev, drv);
 	rettime = ktime_get();
-	pr_debug("probe of %s returned %d after %lld usecs\n",
+	/*
+	 * Don't change this to pr_debug() because that requires
+	 * CONFIG_DYNAMIC_DEBUG and we want a simple 'initcall_debug' on the
+	 * kernel commandline to print this all the time at the debug level.
+	 */
+	printk(KERN_DEBUG "probe of %s returned %d after %lld usecs\n",
 		 dev_name(dev), ret, ktime_us_delta(rettime, calltime));
 	return ret;
 }
drivers/gpio/gpiolib-acpi.c +13 -0
index fa3de3c3010c..787d47e667ad 100644
@@ -1600,6 +1600,19 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
 			.ignore_interrupt = "AMDI0030:00@18",
 		},
 	},
+	{
+		/*
+		 * Spurious wakeups from TP_ATTN# pin
+		 * Found in BIOS 1.7.8
+		 * https://gitlab.freedesktop.org/drm/amd/-/issues/1722#note_1720627
+		 */
+		.matches = {
+			DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),
+		},
+		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
+			.ignore_wake = "ELAN0415:00@9",
+		},
+	},
 	{
 		/*
 		 * Spurious wakeups from TP_ATTN# pin
drivers/gpu/drm/drm_fb_helper.c +3 -0
index 71edb80fe0fb..06cd2f8c2773 100644
@@ -1406,6 +1406,9 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 		return -EINVAL;
 	}
 
+	var->xres_virtual = fb->width;
+	var->yres_virtual = fb->height;
+
 	/*
 	 * Workaround for SDL 1.2, which is known to be setting all pixel format
 	 * fields values to zero in some cases. We treat this situation as a
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +5 -0
index ea8409e0e70e..12c4408bbc3b 100644
@@ -5888,6 +5888,11 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
 		(struct brcmf_cfg80211_assoc_ielen_le *)cfg->extra_buf;
 	req_len = le32_to_cpu(assoc_info->req_len);
 	resp_len = le32_to_cpu(assoc_info->resp_len);
+	if (req_len > WL_EXTRA_BUF_MAX || resp_len > WL_EXTRA_BUF_MAX) {
+		bphy_err(drvr, "invalid lengths in assoc info: req %u resp %u\n",
+			 req_len, resp_len);
+		return -EINVAL;
+	}
 	if (req_len) {
 		err = brcmf_fil_iovar_data_get(ifp, "assoc_req_ies",
 					       cfg->extra_buf,
drivers/phy/broadcom/phy-brcm-usb.c +2 -2
index 2bfd78e2d8fd..7a4c328bac58 100644
@@ -445,9 +445,9 @@ static int brcm_usb_phy_dvr_init(struct platform_device *pdev,
 		priv->suspend_clk = NULL;
 	}
 
-	priv->wake_irq = platform_get_irq_byname(pdev, "wake");
+	priv->wake_irq = platform_get_irq_byname_optional(pdev, "wake");
 	if (priv->wake_irq < 0)
-		priv->wake_irq = platform_get_irq_byname(pdev, "wakeup");
+		priv->wake_irq = platform_get_irq_byname_optional(pdev, "wakeup");
 	if (priv->wake_irq >= 0) {
 		err = devm_request_irq(dev, priv->wake_irq,
 				       brcm_usb_phy_wake_isr, 0,
drivers/usb/serial/option.c +6 -0
index fc12fee66141..f05aea57e2d8 100644
@@ -595,6 +595,11 @@ static void option_instat_callback(struct urb *urb);
 #define SIERRA_VENDOR_ID			0x1199
 #define SIERRA_PRODUCT_EM9191			0x90d3
 
+/* UNISOC (Spreadtrum) products */
+#define UNISOC_VENDOR_ID			0x1782
+/* TOZED LT70-C based on UNISOC SL8563 uses UNISOC's vendor ID */
+#define TOZED_PRODUCT_LT70C			0x4055
+
 /* Device flags */
 
 /* Highest interface number which can be used with NCTRL() and RSVD() */
@@ -2225,6 +2230,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) },
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
fs/btrfs/send.c +1 -1
index 937b60ae576e..35e889fe2a95 100644
@@ -1658,7 +1658,7 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen)
 	int left_ret;
 	int right_ret;
 	u64 left_gen;
-	u64 right_gen;
+	u64 right_gen = 0;
 	struct btrfs_inode_info info;
 
 	ret = get_inode_info(sctx->send_root, ino, &info);
fs/btrfs/volumes.c +1 -1
index 67b2aa552d22..099af8ba6fe5 100644
@@ -2631,7 +2631,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
 	struct super_block *sb = fs_info->sb;
 	struct rcu_string *name;
 	struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
-	struct btrfs_fs_devices *seed_devices;
+	struct btrfs_fs_devices *seed_devices = NULL;
 	u64 orig_super_total_bytes;
 	u64 orig_super_num_devices;
 	int ret = 0;
mm/mempolicy.c +53 -62

162 lines not on this page · raw message

net/bluetooth/hci_sock.c +8 -1
index 06581223238c..f597fe0db9f8 100644
@@ -1003,7 +1003,14 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,
 	if (hci_sock_gen_cookie(sk)) {
 		struct sk_buff *skb;
 
-		if (capable(CAP_NET_ADMIN))
+		/* Perform careful checks before setting the HCI_SOCK_TRUSTED
+		 * flag. Make sure that not only the current task but also
+		 * the socket opener has the required capability, since
+		 * privileged programs can be tricked into making ioctl calls
+		 * on HCI sockets, and the socket should not be marked as
+		 * trusted simply because the ioctl caller is privileged.
+		 */
+		if (sk_capable(sk, CAP_NET_ADMIN))
 			hci_sock_set_flag(sk, HCI_SOCK_TRUSTED);
 
 		/* Send event to monitor */
net/mptcp/protocol.c +51 -23

123 lines not on this page · raw message

net/mptcp/protocol.h +2 -0
index 051e8022d661..441feeaeb242 100644
@@ -615,10 +615,12 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
 		     struct mptcp_subflow_context *subflow);
 void __mptcp_subflow_send_ack(struct sock *ssk);
 void mptcp_subflow_reset(struct sock *ssk);
+void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk);
 void mptcp_sock_graft(struct sock *sk, struct socket *parent);
 struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
 bool __mptcp_close(struct sock *sk, long timeout);
 void mptcp_cancel_work(struct sock *sk);
+void __mptcp_unaccepted_force_close(struct sock *sk);
 
 bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
 			   const struct mptcp_addr_info *b, bool use_port);
net/mptcp/subflow.c +77 -3

92 lines not on this page · raw message

Tested-by
#2 lore raw
In reply to Greg Kroah-Hartman

Hi Greg,

Quoted 74 lines · Greg Kroah-Hartman

I'm announcing the release of the 6.1.27 kernel.

All users of the 6.1 kernel series must upgrade.

The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/riscv/vm-layout.rst                           |    4 
 Makefile                                                    |    2 
 arch/arm64/kvm/mmu.c                                        |   47 ++--
 arch/riscv/include/asm/fixmap.h                             |    8 
 arch/riscv/include/asm/pgtable.h                            |    8 
 arch/riscv/kernel/setup.c                                   |    6 
 arch/riscv/mm/init.c                                        |   82 +++-----
 arch/x86/Makefile.um                                        |    5 
 drivers/base/dd.c                                           |    7 
 drivers/gpio/gpiolib-acpi.c                                 |   13 +
 drivers/gpu/drm/drm_fb_helper.c                             |    3 
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |    5 
 drivers/phy/broadcom/phy-brcm-usb.c                         |    4 
 drivers/usb/serial/option.c                                 |    6 
 fs/btrfs/send.c                                             |    2 
 fs/btrfs/volumes.c                                          |    2 
 mm/mempolicy.c                                              |  115 +++++-------
 net/bluetooth/hci_sock.c                                    |    9 
 net/mptcp/protocol.c                                        |   74 +++++--
 net/mptcp/protocol.h                                        |    2 
 net/mptcp/subflow.c                                         |   80 ++++++++
 21 files changed, 308 insertions(+), 176 deletions(-)

Alexandre Ghiti (3):
riscv: Move early dtb mapping into the fixmap region
riscv: Do not set initial_boot_params to the linear address of the dtb
riscv: No need to relocate the dtb as it lies in the fixmap region

Arınç ÜNAL (1):
USB: serial: option: add UNISOC vendor and TOZED LT70C product

Daniel Vetter (1):
drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var

David Gow (1):
um: Only disable SSE on clang to work around old GCC bugs

David Matlack (1):
KVM: arm64: Retry fault if vma_lookup() results become invalid

Florian Fainelli (1):
phy: phy-brcm-usb: Utilize platform_get_irq_byname_optional()

Genjian Zhang (1):
btrfs: fix uninitialized variable warnings

Greg Kroah-Hartman (1):

      Linux 6.1.27

Jisoo Jang (1):
wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies()

Liam R. Howlett (1):
mm/mempolicy: fix use-after-free of VMA iterator

Paolo Abeni (2):
mptcp: stops worker on unaccepted sockets at listener close
mptcp: fix accept vs worker race

Quoted 11 lines

Ruihan Li (1):
bluetooth: Perform careful capability checks in hci_sock_ioctl()

Stephen Boyd (1):
driver core: Don't require dynamic_debug for initcall_debug probe timing

Werner Sembach (1):
gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU

6.1.27 FTBFS thusly:

drivers/net/wireguard/timers.c: In function 'wg_expired_retransmit_handshake':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:47:17: note: in expansion of macro 'pr_debug'
   47 |                 pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d attempts, giving up\n",
      |                 ^~~~~~~~

<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:65:17: note: in expansion of macro 'pr_debug'
   65 |                 pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d seconds, retrying
(try %d)\n",
      |                 ^~~~~~~~

drivers/net/wireguard/timers.c: In function 'wg_expired_new_handshake':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:95:9: note: in expansion of macro 'pr_debug'
   95 |         pr_debug("%s: Retrying handshake with peer %llu (%pISpfsc) because we stopped hearing back after %d
seconds\n",
      |         ^~~~~~~~

drivers/net/wireguard/timers.c: In function 'wg_queued_expired_zero_key_material':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:127:9: note: in expansion of macro 'pr_debug'
  127 |         pr_debug("%s: Zeroing out all keys for peer %llu (%pISpfsc), since we haven't received a new one in %d
seconds\n",
      |         ^~~~~~~~

There's a patch to drivers/net/wireguard/timers.c that fixes these errors and you can find it at 2d4ee16d969c97996e80e4c9cb6de0acaff22c9f in Linus' tree.

I don't know if it's necessary. but I guess I can say:

#3 lore raw

Hi again.

Quoted 183 lines · Chris Clayton

Hi Greg,

Quoted 74 lines · Greg Kroah-Hartman

I'm announcing the release of the 6.1.27 kernel.

All users of the 6.1 kernel series must upgrade.

The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/riscv/vm-layout.rst                           |    4 
 Makefile                                                    |    2 
 arch/arm64/kvm/mmu.c                                        |   47 ++--
 arch/riscv/include/asm/fixmap.h                             |    8 
 arch/riscv/include/asm/pgtable.h                            |    8 
 arch/riscv/kernel/setup.c                                   |    6 
 arch/riscv/mm/init.c                                        |   82 +++-----
 arch/x86/Makefile.um                                        |    5 
 drivers/base/dd.c                                           |    7 
 drivers/gpio/gpiolib-acpi.c                                 |   13 +
 drivers/gpu/drm/drm_fb_helper.c                             |    3 
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |    5 
 drivers/phy/broadcom/phy-brcm-usb.c                         |    4 
 drivers/usb/serial/option.c                                 |    6 
 fs/btrfs/send.c                                             |    2 
 fs/btrfs/volumes.c                                          |    2 
 mm/mempolicy.c                                              |  115 +++++-------
 net/bluetooth/hci_sock.c                                    |    9 
 net/mptcp/protocol.c                                        |   74 +++++--
 net/mptcp/protocol.h                                        |    2 
 net/mptcp/subflow.c                                         |   80 ++++++++
 21 files changed, 308 insertions(+), 176 deletions(-)

Alexandre Ghiti (3):
riscv: Move early dtb mapping into the fixmap region
riscv: Do not set initial_boot_params to the linear address of the dtb
riscv: No need to relocate the dtb as it lies in the fixmap region

Arınç ÜNAL (1):
USB: serial: option: add UNISOC vendor and TOZED LT70C product

Daniel Vetter (1):
drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var

David Gow (1):
um: Only disable SSE on clang to work around old GCC bugs

David Matlack (1):
KVM: arm64: Retry fault if vma_lookup() results become invalid

Florian Fainelli (1):
phy: phy-brcm-usb: Utilize platform_get_irq_byname_optional()

Genjian Zhang (1):
btrfs: fix uninitialized variable warnings

Greg Kroah-Hartman (1):

      Linux 6.1.27

Jisoo Jang (1):
wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies()

Liam R. Howlett (1):
mm/mempolicy: fix use-after-free of VMA iterator

Paolo Abeni (2):
mptcp: stops worker on unaccepted sockets at listener close
mptcp: fix accept vs worker race

Quoted 11 lines

Ruihan Li (1):
bluetooth: Perform careful capability checks in hci_sock_ioctl()

Stephen Boyd (1):
driver core: Don't require dynamic_debug for initcall_debug probe timing

Werner Sembach (1):
gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU

6.1.27 FTBFS thusly:

drivers/net/wireguard/timers.c: In function 'wg_expired_retransmit_handshake':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:47:17: note: in expansion of macro 'pr_debug'
   47 |                 pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d attempts, giving up\n",
      |                 ^~~~~~~~

<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:65:17: note: in expansion of macro 'pr_debug'
   65 |                 pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d seconds, retrying
(try %d)\n",
      |                 ^~~~~~~~

drivers/net/wireguard/timers.c: In function 'wg_expired_new_handshake':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:95:9: note: in expansion of macro 'pr_debug'
   95 |         pr_debug("%s: Retrying handshake with peer %llu (%pISpfsc) because we stopped hearing back after %d
seconds\n",
      |         ^~~~~~~~

drivers/net/wireguard/timers.c: In function 'wg_queued_expired_zero_key_material':
<command-line>: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' [-Werror=format=]
<command-line>: note: in expansion of macro 'KBUILD_MODNAME' ./include/linux/dynamic_debug.h:223:29: note: in expansion of macro 'pr_fmt'

  223 |                 func(&id, ##__VA_ARGS__);                       \
      |                             ^~~~~~~~~~~
./include/linux/dynamic_debug.h:247:9: note: in expansion of macro '__dynamic_func_call_cls'
  247 |         __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
  249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/dynamic_debug.h:268:9: note: in expansion of macro '_dynamic_func_call'
  268 |         _dynamic_func_call(fmt, __dynamic_pr_debug,             \
      |         ^~~~~~~~~~~~~~~~~~
./include/linux/printk.h:581:9: note: in expansion of macro 'dynamic_pr_debug'
  581 |         dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~
drivers/net/wireguard/timers.c:127:9: note: in expansion of macro 'pr_debug'
  127 |         pr_debug("%s: Zeroing out all keys for peer %llu (%pISpfsc), since we haven't received a new one in %d
seconds\n",
      |         ^~~~~~~~
Quoted 7 lines

There's a patch to drivers/net/wireguard/timers.c that fixes these errors and you can find it at 2d4ee16d969c97996e80e4c9cb6de0acaff22c9f in Linus' tree.

I don't know if it's necessary. but I guess I can say:

The patch is needed in 5.15.110 too.

Chris