diff --git a/Patchlist.changelog b/Patchlist.changelog index 4f89e841b..ce381b26c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7bc9c467e64c373fd366282769229b76379659ac + 7bc9c467e64c373fd366282769229b76379659ac wifi: cfg80211: Fix use after free for wext + "https://gitlab.com/cki-project/kernel-ark/-/commit"/d2fdc4eb94179d410f628f7f56a6740d6d7f6540 d2fdc4eb94179d410f628f7f56a6740d6d7f6540 Revert "wifi: cfg80211: Fix use after free for wext" diff --git a/kernel.spec b/kernel.spec index 346aedef2..7dd8e0204 100755 --- a/kernel.spec +++ b/kernel.spec @@ -147,17 +147,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.5 +%define specversion 6.2.6 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.5 +%define tarfile_release 6.2.6 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.5 +%define kabiversion 6.2.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3345,8 +3345,11 @@ fi # # %changelog -* Sat Mar 11 2023 Justin M. Forbes [6.2.5-300] +* Mon Mar 13 2023 Justin M. Forbes [6.2.6-0] +- Add Fedora 37 and 36 to release targets (Justin M. Forbes) +- wifi: cfg80211: Fix use after free for wext (Alexander Wetzel) - Drop the applypatches for f37 (Justin M. Forbes) +- Linux v6.2.6 * Sat Mar 11 2023 Justin M. Forbes [6.2.5-0] - Revert "wifi: cfg80211: Fix use after free for wext" (Justin M. Forbes) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index c3dc3eb97..54d6478ac 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -28,16 +28,15 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + kernel/module/signing.c | 9 +- - net/wireless/sme.c | 31 +- scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 36 files changed, 985 insertions(+), 203 deletions(-) + 35 files changed, 980 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index 1a1d63f2a9ed..eaa3abdb6864 100644 +index 70e66e771608..f2acee86e2e0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1706,76 +1705,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) -diff --git a/net/wireless/sme.c b/net/wireless/sme.c -index 4f813e346a8b..696c6ac76948 100644 ---- a/net/wireless/sme.c -+++ b/net/wireless/sme.c -@@ -285,15 +285,6 @@ void cfg80211_conn_work(struct work_struct *work) - wiphy_unlock(&rdev->wiphy); - } - --static void cfg80211_step_auth_next(struct cfg80211_conn *conn, -- struct cfg80211_bss *bss) --{ -- memcpy(conn->bssid, bss->bssid, ETH_ALEN); -- conn->params.bssid = conn->bssid; -- conn->params.channel = bss->channel; -- conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; --} -- - /* Returned bss is reference counted and must be cleaned up appropriately. */ - static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) - { -@@ -311,7 +302,10 @@ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) - if (!bss) - return NULL; - -- cfg80211_step_auth_next(wdev->conn, bss); -+ memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN); -+ wdev->conn->params.bssid = wdev->conn->bssid; -+ wdev->conn->params.channel = bss->channel; -+ wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; - schedule_work(&rdev->conn_work); - - return bss; -@@ -603,12 +597,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, - wdev->conn->params.ssid_len = wdev->u.client.ssid_len; - - /* see if we have the bss already */ -- bss = cfg80211_get_bss(wdev->wiphy, wdev->conn->params.channel, -- wdev->conn->params.bssid, -- wdev->conn->params.ssid, -- wdev->conn->params.ssid_len, -- wdev->conn_bss_type, -- IEEE80211_PRIVACY(wdev->conn->params.privacy)); -+ bss = cfg80211_get_conn_bss(wdev); - - if (prev_bssid) { - memcpy(wdev->conn->prev_bssid, prev_bssid, ETH_ALEN); -@@ -619,7 +608,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, - if (bss) { - enum nl80211_timeout_reason treason; - -- cfg80211_step_auth_next(wdev->conn, bss); - err = cfg80211_conn_do_work(wdev, &treason); - cfg80211_put_bss(wdev->wiphy, bss); - } else { -@@ -1497,15 +1485,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, - } else { - if (WARN_ON(connkeys)) - return -EINVAL; -- -- /* connect can point to wdev->wext.connect which -- * can hold key data from a previous connection -- */ -- connect->key = NULL; -- connect->key_len = 0; -- connect->key_idx = 0; -- connect->crypto.cipher_group = 0; -- connect->crypto.n_ciphers_pairwise = 0; - } - - wdev->connect_keys = connkeys; diff --git a/scripts/tags.sh b/scripts/tags.sh index 0d045182c08c..8606325b0ec2 100755 --- a/scripts/tags.sh diff --git a/sources b/sources index 4038a9314..aa8ee09df 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.5.tar.xz) = cb9666c3038f3d28138c27e30ea37b9be49603ca99d9c88d560152f79cc78b31bba213f7c470d8b159b186228be93718c08623b11f3edffe9c2715788f352a08 -SHA512 (kernel-abi-stablelists-6.2.5.tar.bz2) = b4832eb25252c005568e82621114a2d318b969f9782a36ed9fc4a7e76c28b288bef18a60f47e7a470a6455af5c997465a4aec4ff2b0789604865ca3028c4160f -SHA512 (kernel-kabi-dw-6.2.5.tar.bz2) = 6fc4fce487a34cb7212b3605ccaebeea7d11a150e77ea0e8125792c5fd05f5646638c7f59c14a45c967a0f63f165260245171998b8e751ad84b7146bd74931cd +SHA512 (linux-6.2.6.tar.xz) = 0420c3a03cc88d9becf35fa553e72e548b74a6879c8791d5f80492f510ec950066938b09c1e7c91c9628dbca24dc9ae956ae696edde30137f9e3817e409b4741 +SHA512 (kernel-abi-stablelists-6.2.6.tar.bz2) = 692cfd6e3b0013e2441de8a62feda280063bdd4c0d16202509afae5ea7b8dd93a87ef57013f75b41cbec35c304cc94fc5fe9994bb83b8bbdfcf1e5b2c6f3a8cd +SHA512 (kernel-kabi-dw-6.2.6.tar.bz2) = 05fb670b2a4c87e85712345639c133eabc1678d1de074ffac44c3bb4bc467f482441ab46a83119334afd6768d823278d1b3ea3faf9e7bfcc74b7bb6a39599373