kernel 6.10.4

5 files changed, 46 insertions, 63 deletions

diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index 64270ad..3241732 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/2c6b48dfc4f3aad194a99c23f8d3e604c1a5593f
+ 2c6b48dfc4f3aad194a99c23f8d3e604c1a5593f wifi: brcmfmac: cfg80211: Handle SSID based pmksa deletion
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/64905c656dbdbc1a21d838d33e10699e391f185b
  64905c656dbdbc1a21d838d33e10699e391f185b Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning
 
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index c2a6705..7d58f0a 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,9 @@
+* Sun Aug 11 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.10.4-0]
+- wifi: brcmfmac: cfg80211: Handle SSID based pmksa deletion (Janne Grunau)
+- New config for 6.10.3 (Justin M. Forbes)
+- Linux v6.10.4
+Resolves: 
+
 * Mon Aug 05 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.10.3-0]
 - Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning (Luiz Augusto von Dentz)
 - Linux v6.10.3
diff --git a/SOURCES/patch-6.10-redhat.patch b/SOURCES/patch-6.10-redhat.patch
index 108e8a4..f39d754 100644
--- a/SOURCES/patch-6.10-redhat.patch
+++ b/SOURCES/patch-6.10-redhat.patch
@@ -23,6 +23,7 @@
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++-------
  drivers/iommu/iommu.c                              |  22 +++
  drivers/media/pci/intel/ipu-bridge.c               |  40 ++++--
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c         |  13 +-
  drivers/pci/quirks.c                               |  24 ++++
  drivers/scsi/sd.c                                  |  10 ++
  drivers/usb/core/hub.c                             |   7 +
@@ -33,18 +34,16 @@
  include/linux/rmi.h                                |   1 +
  include/linux/security.h                           |   5 +
  kernel/module/signing.c                            |   9 +-
- net/bluetooth/hci_core.c                           |   7 -
- net/bluetooth/hci_event.c                          |   5 +-
  scripts/sign-file.c                                |  29 +---
  scripts/tags.sh                                    |   2 +
  security/integrity/platform_certs/load_uefi.c      |   6 +-
  security/lockdown/Kconfig                          |  13 ++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |  12 ++
- 43 files changed, 782 insertions(+), 265 deletions(-)
+ 42 files changed, 789 insertions(+), 259 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index c0af6d8aeb05..33ffe9e302df 100644
+index aec5cc0babf8..d1c4b7c6cdea 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1523,6 +1522,30 @@ index 61750cc98d70..a0e9a71580b5 100644
  };
  
  static const struct ipu_property_names prop_names = {
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+index 5fe0e671ecb3..826b768196e2 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+@@ -4320,9 +4320,16 @@ brcmf_pmksa_v3_op(struct brcmf_if *ifp, struct cfg80211_pmksa *pmksa,
+ 		/* Single PMK operation */
+ 		pmk_op->count = cpu_to_le16(1);
+ 		length += sizeof(struct brcmf_pmksa_v3);
+-		memcpy(pmk_op->pmk[0].bssid, pmksa->bssid, ETH_ALEN);
+-		memcpy(pmk_op->pmk[0].pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
+-		pmk_op->pmk[0].pmkid_len = WLAN_PMKID_LEN;
++		if (pmksa->bssid)
++			memcpy(pmk_op->pmk[0].bssid, pmksa->bssid, ETH_ALEN);
++		if (pmksa->pmkid) {
++			memcpy(pmk_op->pmk[0].pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
++			pmk_op->pmk[0].pmkid_len = WLAN_PMKID_LEN;
++		}
++		if (pmksa->ssid && pmksa->ssid_len) {
++			memcpy(pmk_op->pmk[0].ssid.SSID, pmksa->ssid, pmksa->ssid_len);
++			pmk_op->pmk[0].ssid.SSID_len = pmksa->ssid_len;
++		}
+ 		pmk_op->pmk[0].time_left = cpu_to_le32(alive ? BRCMF_PMKSA_NO_EXPIRY : 0);
+ 	}
+ 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 index 568410e64ce6..6afbaee83950 100644
 --- a/drivers/pci/quirks.c
@@ -1783,41 +1806,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644
  }
  
  int module_sig_check(struct load_info *info, int flags)
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 7ae118a6d947..6ecb110bf46b 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -120,13 +120,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
- 	case DISCOVERY_STARTING:
- 		break;
- 	case DISCOVERY_FINDING:
--		/* If discovery was not started then it was initiated by the
--		 * MGMT interface so no MGMT event shall be generated either
--		 */
--		if (old_state != DISCOVERY_STARTING) {
--			hdev->discovery.state = old_state;
--			return;
--		}
- 		mgmt_discovering(hdev, 1);
- 		break;
- 	case DISCOVERY_RESOLVING:
-diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
-index 4611a67d7dcc..a78f6d706cd4 100644
---- a/net/bluetooth/hci_event.c
-+++ b/net/bluetooth/hci_event.c
-@@ -1722,9 +1722,10 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)
- 	switch (enable) {
- 	case LE_SCAN_ENABLE:
- 		hci_dev_set_flag(hdev, HCI_LE_SCAN);
--		if (hdev->le_scan_type == LE_SCAN_ACTIVE)
-+		if (hdev->le_scan_type == LE_SCAN_ACTIVE) {
- 			clear_pending_adv_report(hdev);
--		hci_discovery_set_state(hdev, DISCOVERY_FINDING);
-+			hci_discovery_set_state(hdev, DISCOVERY_FINDING);
-+		}
- 		break;
- 
- 	case LE_SCAN_DISABLE:
 diff --git a/scripts/sign-file.c b/scripts/sign-file.c
 index 3edb156ae52c..0114ae1dbf7f 100644
 --- a/scripts/sign-file.c
diff --git a/SOURCES/scx-kernel.patch b/SOURCES/scx-kernel.patch
index 1522e45..1445dae 100644
--- a/SOURCES/scx-kernel.patch
+++ b/SOURCES/scx-kernel.patch
@@ -356,19 +356,6 @@ index 958e935449e5..17d2679d291a 100644
  SCSI LIBSAS SUBSYSTEM
  R:	John Garry <john.g.garry@oracle.com>
  R:	Jason Yan <yanaijie@huawei.com>
-diff --git a/Makefile b/Makefile
-index c0af6d8aeb05..99cb65a24af6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- VERSION = 6
- PATCHLEVEL = 10
- SUBLEVEL = 3
--EXTRAVERSION =
-+EXTRAVERSION = -scx1
- NAME = Baby Opossum Posse
- 
- # *DOCUMENTATION*
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
 index e5974b8239c9..167e877b8bef 100644
 --- a/drivers/tty/sysrq.c
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4453353..60a4a9d 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -160,18 +160,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specrpmversion 6.10.3
-%define specversion 6.10.3
+%define specrpmversion 6.10.4
+%define specversion 6.10.4
 %define patchversion 6.10
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.10.3
+%define tarfile_release 6.10.4
 # This is needed to do merge window version magic
 %define patchlevel 10
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 202%{?buildid}%{?dist}
+%define specrelease 201%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.10.3
+%define kabiversion 6.10.4
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4206,14 +4206,13 @@ fi\
 #
 #
 %changelog
-* Tue Aug 13 2024 Jan200101 <sentrycraft123@gmail.com> - 6.10.3-202.fsync
-- kernel-fsync v6.10.3 revert loki mini patch
+* Thu Aug 15 2024 Jan200101 <sentrycraft123@gmail.com> - 6.10.4-201.fsync
+- kernel-fsync v6.10.4
 
-* Tue Aug 06 2024 Jan200101 <sentrycraft123@gmail.com> - 6.10.3-201.fsync
-- kernel-fsync v6.10.3
-
-* Mon Aug 05 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.10.3-200]
+* Sun Aug 11 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.10.4-0]
+- wifi: brcmfmac: cfg80211: Handle SSID based pmksa deletion (Janne Grunau)
 - New config for 6.10.3 (Justin M. Forbes)
+- Linux v6.10.4
 
 * Mon Aug 05 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.10.3-0]
 - Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning (Luiz Augusto von Dentz)