[PR PATCH] linux6.2: update to 6.2.14

[PR PATCH] linux6.2: update to 6.2.14

[atk]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

There is a new pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.14
https://github.com/void-linux/void-packages/pull/43709

linux6.2: update to 6.2.14
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.14-43709.patch --]
[-- Type: text/x-diff, Size: 1037 bytes --]

From 865b2513f32619bfaea61ff7eba5b9453d5ff34d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 1 May 2023 22:17:33 +0200
Subject: [PATCH] linux6.2: update to 6.2.14

---
 srcpkgs/linux6.2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 12ae8bdcc9aa..804edbd3ad17 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.2'
 pkgname=linux6.2
-version=6.2.13
+version=6.2.14
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd"
+ d4f34f8438c90dd37b38bc8252a38ce94ba2449bed0a82614162690e05dc5577"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: linux6.2: update to 6.2.14

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1542301097

Comment:
is it possible to include this https://github.com/torvalds/linux/commit/c1592a89942e9678f7d9c8030efa777c0d57edab as patch?
or alternatively, as soon as 6.2.15 is out?

Re: linux6.2: update to 6.2.14

[atk]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1542363968

Comment:
Definitely possible; give me a few hours.

Re: [PR PATCH] [Updated] linux6.2: update to 6.2.14

[atk]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.14
https://github.com/void-linux/void-packages/pull/43709

linux6.2: update to 6.2.14
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.14-43709.patch --]
[-- Type: text/x-diff, Size: 6092 bytes --]

From 2c1870b137001d1da0d7acce8c48cb7a21ab8981 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 10 May 2023 21:59:28 +0200
Subject: [PATCH] linux6.2: update to 6.2.14

---
 .../patches/nf_tables_no_anonymous_set.patch  | 119 ++++++++++++++++++
 srcpkgs/linux6.2/template                     |   4 +-
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch

diff --git a/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch b/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch
new file mode 100644
index 000000000000..53599f3c2d09
--- /dev/null
+++ b/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch
@@ -0,0 +1,119 @@
+From c1592a89942e9678f7d9c8030efa777c0d57edab Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Tue, 2 May 2023 10:25:24 +0200
+Subject: [PATCH] netfilter: nf_tables: deactivate anonymous set from
+ preparation phase
+
+Toggle deleted anonymous sets as inactive in the next generation, so
+users cannot perform any update on it. Clear the generation bitmask
+in case the transaction is aborted.
+
+The following KASAN splat shows a set element deletion for a bound
+anonymous set that has been already removed in the same transaction.
+
+[   64.921510] ==================================================================
+[   64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.924745] Write of size 8 at addr dead000000000122 by task test/890
+[   64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253
+[   64.931120] Call Trace:
+[   64.932699]  <TASK>
+[   64.934292]  dump_stack_lvl+0x33/0x50
+[   64.935908]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.937551]  kasan_report+0xda/0x120
+[   64.939186]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.940814]  nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.942452]  ? __kasan_slab_alloc+0x2d/0x60
+[   64.944070]  ? nf_tables_setelem_notify+0x190/0x190 [nf_tables]
+[   64.945710]  ? kasan_set_track+0x21/0x30
+[   64.947323]  nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink]
+[   64.948898]  ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink]
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ include/net/netfilter/nf_tables.h |  1 +
+ net/netfilter/nf_tables_api.c     | 12 ++++++++++++
+ net/netfilter/nft_dynset.c        |  2 +-
+ net/netfilter/nft_lookup.c        |  2 +-
+ net/netfilter/nft_objref.c        |  2 +-
+ 5 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
+index 3ed21d2d565901..2e24ea1d744c25 100644
+--- a/include/net/netfilter/nf_tables.h
++++ b/include/net/netfilter/nf_tables.h
+@@ -619,6 +619,7 @@ struct nft_set_binding {
+ };
+ 
+ enum nft_trans_phase;
++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set);
+ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 			      struct nft_set_binding *binding,
+ 			      enum nft_trans_phase phase);
+diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
+index 8b6c61a2196cb2..59fb8320ab4d77 100644
+--- a/net/netfilter/nf_tables_api.c
++++ b/net/netfilter/nf_tables_api.c
+@@ -5127,12 +5127,24 @@ static void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 	}
+ }
+ 
++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set)
++{
++	if (nft_set_is_anonymous(set))
++		nft_clear(ctx->net, set);
++
++	set->use++;
++}
++EXPORT_SYMBOL_GPL(nf_tables_activate_set);
++
+ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 			      struct nft_set_binding *binding,
+ 			      enum nft_trans_phase phase)
+ {
+ 	switch (phase) {
+ 	case NFT_TRANS_PREPARE:
++		if (nft_set_is_anonymous(set))
++			nft_deactivate_next(ctx->net, set);
++
+ 		set->use--;
+ 		return;
+ 	case NFT_TRANS_ABORT:
+diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
+index 274579b1696e0c..bd19c7aec92ee7 100644
+--- a/net/netfilter/nft_dynset.c
++++ b/net/netfilter/nft_dynset.c
+@@ -342,7 +342,7 @@ static void nft_dynset_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_dynset *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_dynset_destroy(const struct nft_ctx *ctx,
+diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c
+index cecf8ab90e58f7..03ef4fdaa460b6 100644
+--- a/net/netfilter/nft_lookup.c
++++ b/net/netfilter/nft_lookup.c
+@@ -167,7 +167,7 @@ static void nft_lookup_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_lookup *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_lookup_destroy(const struct nft_ctx *ctx,
+diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c
+index cb37169608babd..a48dd5b5d45b13 100644
+--- a/net/netfilter/nft_objref.c
++++ b/net/netfilter/nft_objref.c
+@@ -185,7 +185,7 @@ static void nft_objref_map_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_objref_map *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_objref_map_destroy(const struct nft_ctx *ctx,
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 12ae8bdcc9aa..804edbd3ad17 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.2'
 pkgname=linux6.2
-version=6.2.13
+version=6.2.14
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd"
+ d4f34f8438c90dd37b38bc8252a38ce94ba2449bed0a82614162690e05dc5577"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: linux6.2: update to 6.2.14

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1542748981

Comment:
cc mantainer @Johnnynator

Re: linux6.2: update to 6.2.14

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1544486860

Comment:
actually, 6.2.15 is out :)

Re: [PR PATCH] [Updated] linux6.2: update to 6.2.14

[atk]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.14
https://github.com/void-linux/void-packages/pull/43709

linux6.2: update to 6.2.14
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.14-43709.patch --]
[-- Type: text/x-diff, Size: 6092 bytes --]

From 2d98265ed830a0f8e99b62975d884d3999aeef4d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 11 May 2023 21:08:45 +0200
Subject: [PATCH] linux6.2: update to 6.2.15

---
 .../patches/nf_tables_no_anonymous_set.patch  | 119 ++++++++++++++++++
 srcpkgs/linux6.2/template                     |   4 +-
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch

diff --git a/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch b/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch
new file mode 100644
index 000000000000..53599f3c2d09
--- /dev/null
+++ b/srcpkgs/linux6.2/patches/nf_tables_no_anonymous_set.patch
@@ -0,0 +1,119 @@
+From c1592a89942e9678f7d9c8030efa777c0d57edab Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Tue, 2 May 2023 10:25:24 +0200
+Subject: [PATCH] netfilter: nf_tables: deactivate anonymous set from
+ preparation phase
+
+Toggle deleted anonymous sets as inactive in the next generation, so
+users cannot perform any update on it. Clear the generation bitmask
+in case the transaction is aborted.
+
+The following KASAN splat shows a set element deletion for a bound
+anonymous set that has been already removed in the same transaction.
+
+[   64.921510] ==================================================================
+[   64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.924745] Write of size 8 at addr dead000000000122 by task test/890
+[   64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253
+[   64.931120] Call Trace:
+[   64.932699]  <TASK>
+[   64.934292]  dump_stack_lvl+0x33/0x50
+[   64.935908]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.937551]  kasan_report+0xda/0x120
+[   64.939186]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.940814]  nf_tables_commit+0xa24/0x1490 [nf_tables]
+[   64.942452]  ? __kasan_slab_alloc+0x2d/0x60
+[   64.944070]  ? nf_tables_setelem_notify+0x190/0x190 [nf_tables]
+[   64.945710]  ? kasan_set_track+0x21/0x30
+[   64.947323]  nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink]
+[   64.948898]  ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink]
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ include/net/netfilter/nf_tables.h |  1 +
+ net/netfilter/nf_tables_api.c     | 12 ++++++++++++
+ net/netfilter/nft_dynset.c        |  2 +-
+ net/netfilter/nft_lookup.c        |  2 +-
+ net/netfilter/nft_objref.c        |  2 +-
+ 5 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
+index 3ed21d2d565901..2e24ea1d744c25 100644
+--- a/include/net/netfilter/nf_tables.h
++++ b/include/net/netfilter/nf_tables.h
+@@ -619,6 +619,7 @@ struct nft_set_binding {
+ };
+ 
+ enum nft_trans_phase;
++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set);
+ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 			      struct nft_set_binding *binding,
+ 			      enum nft_trans_phase phase);
+diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
+index 8b6c61a2196cb2..59fb8320ab4d77 100644
+--- a/net/netfilter/nf_tables_api.c
++++ b/net/netfilter/nf_tables_api.c
+@@ -5127,12 +5127,24 @@ static void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 	}
+ }
+ 
++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set)
++{
++	if (nft_set_is_anonymous(set))
++		nft_clear(ctx->net, set);
++
++	set->use++;
++}
++EXPORT_SYMBOL_GPL(nf_tables_activate_set);
++
+ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,
+ 			      struct nft_set_binding *binding,
+ 			      enum nft_trans_phase phase)
+ {
+ 	switch (phase) {
+ 	case NFT_TRANS_PREPARE:
++		if (nft_set_is_anonymous(set))
++			nft_deactivate_next(ctx->net, set);
++
+ 		set->use--;
+ 		return;
+ 	case NFT_TRANS_ABORT:
+diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
+index 274579b1696e0c..bd19c7aec92ee7 100644
+--- a/net/netfilter/nft_dynset.c
++++ b/net/netfilter/nft_dynset.c
+@@ -342,7 +342,7 @@ static void nft_dynset_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_dynset *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_dynset_destroy(const struct nft_ctx *ctx,
+diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c
+index cecf8ab90e58f7..03ef4fdaa460b6 100644
+--- a/net/netfilter/nft_lookup.c
++++ b/net/netfilter/nft_lookup.c
+@@ -167,7 +167,7 @@ static void nft_lookup_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_lookup *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_lookup_destroy(const struct nft_ctx *ctx,
+diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c
+index cb37169608babd..a48dd5b5d45b13 100644
+--- a/net/netfilter/nft_objref.c
++++ b/net/netfilter/nft_objref.c
+@@ -185,7 +185,7 @@ static void nft_objref_map_activate(const struct nft_ctx *ctx,
+ {
+ 	struct nft_objref_map *priv = nft_expr_priv(expr);
+ 
+-	priv->set->use++;
++	nf_tables_activate_set(ctx, priv->set);
+ }
+ 
+ static void nft_objref_map_destroy(const struct nft_ctx *ctx,
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 12ae8bdcc9aa..970ce644770e 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.2'
 pkgname=linux6.2
-version=6.2.13
+version=6.2.15
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd"
+ 398b3d1187454f32b5168b7a01eb294f214634042d89ac79f82c56411566cb9b"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: [PR PATCH] [Updated] linux6.2: update to 6.2.15

[atk]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.14
https://github.com/void-linux/void-packages/pull/43709

linux6.2: update to 6.2.15
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.14-43709.patch --]
[-- Type: text/x-diff, Size: 1038 bytes --]

From 05309a629ed128a7bce8e5d659730a0d42d68837 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 11 May 2023 21:10:36 +0200
Subject: [PATCH] linux6.2: update to 6.2.15

---
 srcpkgs/linux6.2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 12ae8bdcc9aa..970ce644770e 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.2'
 pkgname=linux6.2
-version=6.2.13
+version=6.2.15
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd"
+ 398b3d1187454f32b5168b7a01eb294f214634042d89ac79f82c56411566cb9b"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: linux6.2: update to 6.2.15

[atk]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1544541658

Comment:
The netfilter patch is no longer neccessary, too, as 6.2.15 already received the changes.

Re: [PR PATCH] [Updated] linux6.2: update to 6.2.15

[atk]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.14
https://github.com/void-linux/void-packages/pull/43709

linux6.2: update to 6.2.15
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.14-43709.patch --]
[-- Type: text/x-diff, Size: 3101 bytes --]

From b07cb164d5db51ffd2ca52fd4197b9057f374dbd Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 11 May 2023 21:10:36 +0200
Subject: [PATCH] linux6.2: update to 6.2.15

---
 ...x-use-after-free-in-fw-features-query.diff | 40 -------------------
 srcpkgs/linux6.2/template                     |  4 +-
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff

diff --git a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff b/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
deleted file mode 100644
index f508877af224..000000000000
--- a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Taken from https://patchwork.kernel.org/project/linux-wireless/patch/51fd8f76494348aa9ecbf0abc471ebe47a983dfd.1679502607.git.lorenzo@kernel.org/
-
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-index 80c71acfe159..cc94531185da 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-@@ -171,12 +171,12 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
- 
- u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- {
--	struct mt7921_fw_features *features = NULL;
- 	const struct mt76_connac2_fw_trailer *hdr;
- 	struct mt7921_realease_info *rel_info;
- 	const struct firmware *fw;
- 	int ret, i, offset = 0;
- 	const u8 *data, *end;
-+	u8 offload_caps = 0;
- 
- 	ret = request_firmware(&fw, fw_wm, dev);
- 	if (ret)
-@@ -208,7 +208,10 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- 		data += sizeof(*rel_info);
- 
- 		if (rel_info->tag == MT7921_FW_TAG_FEATURE) {
-+			struct mt7921_fw_features *features;
-+
- 			features = (struct mt7921_fw_features *)data;
-+			offload_caps = features->data;
- 			break;
- 		}
- 
-@@ -218,7 +221,7 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- out:
- 	release_firmware(fw);
- 
--	return features ? features->data : 0;
-+	return offload_caps;
- }
- EXPORT_SYMBOL_GPL(mt7921_check_offload_capability);
- 
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 12ae8bdcc9aa..970ce644770e 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.2'
 pkgname=linux6.2
-version=6.2.13
+version=6.2.15
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd"
+ 398b3d1187454f32b5168b7a01eb294f214634042d89ac79f82c56411566cb9b"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: linux6.2: update to 6.2.15

[atk]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1544549145

Comment:
Same goes for the previous mt7921 wireless patch.

Re: linux6.2: update to 6.2.15

[atk]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1544601205

Comment:
lint job failed due to network issue; worked flawlessly locally.

Re: linux6.2: update to 6.2.15

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43709#issuecomment-1546356283

Comment:
@leahneukirchen can this be merged? it fixes cve

Re: [PR PATCH] [Merged]: linux6.2: update to 6.2.15

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]

There's a merged pull request on the void-packages repository

linux6.2: update to 6.2.15
https://github.com/void-linux/void-packages/pull/43709

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->