kernel-7.0.12-100
* Tue Jun 09 2026 Augusto Caringi <acaringi@redhat.com> [7.0.12-1] - Revert "xfrm: esp: restore combined single-frag length gate" (Justin M. Forbes) - Revert "ipv6: preserve insertion order for same-scope addresses" (Justin M. Forbes) - scsi: target: iscsi: Validate CHAP_R length before base64 decode (Alexandru Hossu) - Linux v7.0.12 Resolves: Signed-off-by: Augusto Caringi <acaringi@redhat.com>
This commit is contained in:
Augusto Caringi
parent
1f9e35f1e5
commit
94eb6855e4
5 changed files with 31 additions and 106 deletions
|
|
@ -1,3 +1,12 @@
|
|||
https://gitlab.com/cki-project/kernel-ark/-/commit/111e288c147f0d1312f96b47bfbb69f6e2bc73b4
|
||||
111e288c147f0d1312f96b47bfbb69f6e2bc73b4 Revert "xfrm: esp: restore combined single-frag length gate"
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/7fd666cd6c4ebc9914a1c349dbc923541b4d35c6
|
||||
7fd666cd6c4ebc9914a1c349dbc923541b4d35c6 Revert "ipv6: preserve insertion order for same-scope addresses"
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/66b536bf79c4d6f755b31fb631887fe3d214dd2d
|
||||
66b536bf79c4d6f755b31fb631887fe3d214dd2d scsi: target: iscsi: Validate CHAP_R length before base64 decode
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/9a0b5572ccfd1b7c79dfb9c683e89758893ecf0a
|
||||
9a0b5572ccfd1b7c79dfb9c683e89758893ecf0a Revert "crypto/krb5, rxrpc: Fix lack of pre-decrypt/pre-verify length checks"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
* Tue Jun 09 2026 Augusto Caringi <acaringi@redhat.com> [7.0.12-1]
|
||||
- Revert "xfrm: esp: restore combined single-frag length gate" (Justin M. Forbes)
|
||||
- Revert "ipv6: preserve insertion order for same-scope addresses" (Justin M. Forbes)
|
||||
- scsi: target: iscsi: Validate CHAP_R length before base64 decode (Alexandru Hossu)
|
||||
- Linux v7.0.12
|
||||
Resolves:
|
||||
|
||||
* Mon Jun 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.11-1]
|
||||
- Revert "crypto/krb5, rxrpc: Fix lack of pre-decrypt/pre-verify length checks" (Justin M. Forbes)
|
||||
- Revert "rxrpc: Fix DATA decrypt vs splice() by copying data to buffer in recvmsg" (Justin M. Forbes)
|
||||
|
|
|
|||
14
kernel.spec
14
kernel.spec
|
|
@ -187,18 +187,18 @@ Summary: The Linux kernel
|
|||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 1
|
||||
# define buildid .local
|
||||
%define specrpmversion 7.0.11
|
||||
%define specversion 7.0.11
|
||||
%define specrpmversion 7.0.12
|
||||
%define specversion 7.0.12
|
||||
%define patchversion 7.0
|
||||
%define pkgrelease 100
|
||||
%define kversion 7
|
||||
%define tarfile_release 7.0.11
|
||||
%define tarfile_release 7.0.12
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 0
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 100%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 7.0.11
|
||||
%define kabiversion 7.0.12
|
||||
|
||||
# If this variable is set to 1, a bpf selftests build failure will cause a
|
||||
# fatal kernel package build error
|
||||
|
|
@ -4825,6 +4825,12 @@ fi\
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Tue Jun 09 2026 Augusto Caringi <acaringi@redhat.com> [7.0.12-1]
|
||||
- Revert "xfrm: esp: restore combined single-frag length gate" (Justin M. Forbes)
|
||||
- Revert "ipv6: preserve insertion order for same-scope addresses" (Justin M. Forbes)
|
||||
- scsi: target: iscsi: Validate CHAP_R length before base64 decode (Alexandru Hossu)
|
||||
- Linux v7.0.12
|
||||
|
||||
* Mon Jun 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.11-1]
|
||||
- Revert "crypto/krb5, rxrpc: Fix lack of pre-decrypt/pre-verify length checks" (Justin M. Forbes)
|
||||
- Revert "rxrpc: Fix DATA decrypt vs splice() by copying data to buffer in recvmsg" (Justin M. Forbes)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@
|
|||
drivers/mfd/bcm2835-pm.c | 9 +-
|
||||
drivers/net/ethernet/cadence/macb.h | 35 +
|
||||
drivers/net/ethernet/cadence/macb_main.c | 736 ++++++++------
|
||||
drivers/nfc/nxp-nci/i2c.c | 21 +-
|
||||
drivers/pci/quirks.c | 24 +
|
||||
drivers/usb/core/hub.c | 7 +
|
||||
include/linux/efi.h | 22 +-
|
||||
|
|
@ -71,8 +70,6 @@
|
|||
include/linux/security.h | 9 +
|
||||
kernel/module/signing.c | 9 +-
|
||||
net/core/gro.c | 3 +
|
||||
net/ipv4/esp4.c | 5 +-
|
||||
net/ipv6/esp6.c | 5 +-
|
||||
net/sched/act_pedit.c | 72 +-
|
||||
scripts/Makefile.lib | 3 +
|
||||
scripts/tags.sh | 2 +
|
||||
|
|
@ -84,7 +81,7 @@
|
|||
sound/soc/codecs/rt722-sdca.h | 4 +
|
||||
tools/testing/selftests/bpf/Makefile | 2 +-
|
||||
tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -
|
||||
86 files changed, 5584 insertions(+), 593 deletions(-)
|
||||
83 files changed, 5558 insertions(+), 588 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/media/amdisp4-1.rst b/Documentation/admin-guide/media/amdisp4-1.rst
|
||||
new file mode 100644
|
||||
|
|
@ -216,7 +213,7 @@ index d1cc0e12fe1f..985c66951475 100644
|
|||
M: Felix Kuehling <Felix.Kuehling@amd.com>
|
||||
L: amd-gfx@lists.freedesktop.org
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d2a1c3a1ab44..5343e34c0fb1 100644
|
||||
index 7c25748018cb..9e9860c591f5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -356,6 +356,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),)
|
||||
|
|
@ -7397,54 +7394,6 @@ index 99e7d5cf3786..a12aa21244e8 100644
|
|||
disable_irq_wake(bp->queues[0].irq);
|
||||
|
||||
/* Now make sure we disable phy before moving
|
||||
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
|
||||
index b3d34433bd14..a6c08175d9dd 100644
|
||||
--- a/drivers/nfc/nxp-nci/i2c.c
|
||||
+++ b/drivers/nfc/nxp-nci/i2c.c
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/interrupt.h>
|
||||
+#include <linux/irq.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/nfc.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
@@ -267,6 +268,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client)
|
||||
{
|
||||
struct device *dev = &client->dev;
|
||||
struct nxp_nci_i2c_phy *phy;
|
||||
+ unsigned long irqflags;
|
||||
int r;
|
||||
|
||||
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
|
||||
@@ -303,9 +305,26 @@ static int nxp_nci_i2c_probe(struct i2c_client *client)
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
+ /*
|
||||
+ * ACPI platforms may report incorrect IRQ trigger types
|
||||
+ * (e.g. level-high), which can lead to interrupt storms.
|
||||
+ *
|
||||
+ * Use the historically stable rising-edge trigger for ACPI devices.
|
||||
+ *
|
||||
+ * On non-ACPI systems (e.g. Device Tree), prefer the firmware-
|
||||
+ * provided trigger type, falling back to rising-edge if not set.
|
||||
+ */
|
||||
+ if (ACPI_COMPANION(dev)) {
|
||||
+ irqflags = IRQF_TRIGGER_RISING;
|
||||
+ } else {
|
||||
+ irqflags = irq_get_trigger_type(client->irq);
|
||||
+ if (!irqflags)
|
||||
+ irqflags = IRQF_TRIGGER_RISING;
|
||||
+ }
|
||||
+
|
||||
r = request_threaded_irq(client->irq, NULL,
|
||||
nxp_nci_i2c_irq_thread_fn,
|
||||
- IRQF_ONESHOT,
|
||||
+ irqflags | IRQF_ONESHOT,
|
||||
NXP_NCI_I2C_DRIVER_NAME, phy);
|
||||
if (r < 0)
|
||||
nfc_err(&client->dev, "Unable to register IRQ handler\n");
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index 48946cca4be7..a1f5fe8e583f 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
|
|
@ -7668,52 +7617,6 @@ index a84753983467..3e20f61724ad 100644
|
|||
if (headlen <= offset) {
|
||||
skb_frag_t *frag;
|
||||
skb_frag_t *frag2;
|
||||
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
|
||||
index 6a5febbdbee4..2d7daca8516c 100644
|
||||
--- a/net/ipv4/esp4.c
|
||||
+++ b/net/ipv4/esp4.c
|
||||
@@ -410,6 +410,7 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *
|
||||
struct page *page;
|
||||
struct sk_buff *trailer;
|
||||
int tailen = esp->tailen;
|
||||
+ unsigned int allocsize;
|
||||
|
||||
/* this is non-NULL only with TCP/UDP Encapsulation */
|
||||
if (x->encap) {
|
||||
@@ -419,8 +420,8 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *
|
||||
return err;
|
||||
}
|
||||
|
||||
- if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE ||
|
||||
- ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE)
|
||||
+ allocsize = ALIGN(skb->data_len + tailen, L1_CACHE_BYTES);
|
||||
+ if (allocsize > PAGE_SIZE)
|
||||
goto cow;
|
||||
|
||||
if (!skb_cloned(skb)) {
|
||||
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
|
||||
index 9c06c5a1419d..0fad1dc558b8 100644
|
||||
--- a/net/ipv6/esp6.c
|
||||
+++ b/net/ipv6/esp6.c
|
||||
@@ -440,6 +440,7 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info
|
||||
struct page *page;
|
||||
struct sk_buff *trailer;
|
||||
int tailen = esp->tailen;
|
||||
+ unsigned int allocsize;
|
||||
|
||||
if (x->encap) {
|
||||
int err = esp6_output_encap(x, skb, esp);
|
||||
@@ -448,8 +449,8 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info
|
||||
return err;
|
||||
}
|
||||
|
||||
- if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE ||
|
||||
- ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE)
|
||||
+ allocsize = ALIGN(skb->data_len + tailen, L1_CACHE_BYTES);
|
||||
+ if (allocsize > PAGE_SIZE)
|
||||
goto cow;
|
||||
|
||||
if (!skb_cloned(skb)) {
|
||||
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
|
||||
index bc20f08a2789..1aa95c34ad87 100644
|
||||
--- a/net/sched/act_pedit.c
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-7.0.11.tar.xz) = 4823d9d1aae69001983c865c7faa56f6cd67f27a548fa6e3532572e6800ddebfe9f04113d4b9e7a52232c16ced93a0cc115f1ac233883e540d03b1793bf76822
|
||||
SHA512 (kernel-abi-stablelists-7.0.11.tar.xz) = 14ecdd357c853ee946157c5e14b463bbf29fc58a86df8e7aa8ed7c02663557025da70ffa2cd79facd13a354550dee40b855d065cdecbeaf0ddfb372b8b398be9
|
||||
SHA512 (kernel-kabi-dw-7.0.11.tar.xz) = 6c63255f38b2027c8165a471eaa6875aa266caf97556e69339b2f146dd926f789a20034d923ee8e754a395cff04122f9c89a621eccd2bb6b2032b37053e073a2
|
||||
SHA512 (linux-7.0.12.tar.xz) = 01f127087f05a0548bcebf9b54039450545e4d09fc4666be5685e6c95f68c2aa2d8443be52903300ceab0136dc01a83e3c3a34cff0e4625523bf0bc04594958f
|
||||
SHA512 (kernel-abi-stablelists-7.0.12.tar.xz) = b9ecfc9a0be0137fe8f7cd342b6fd9ba4f1b6674641ff1770bdd4a690b511fe7ef688f83a48ce9b3bed22ac35cb3e04f49aab333377d0102736bfd931360fb81
|
||||
SHA512 (kernel-kabi-dw-7.0.12.tar.xz) = dfec0f8964d05f561c165c76fb7eb64720a1711381dddac3f1981e7215d6f93772c9dedaa5bf73dcd99baae72b11b20331d318f9ed2b2c84cdfc55b2117236d3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue