zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-01-29 21:58:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

zephyr-kernel/3.1: update to latest commit

Browse Source 
Recent commits have CVE-2022-2741 fixed.

Also backported CVE-2022-2993 fix.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Naveen Saini
2022-12-20 14:46:14 +08:00
parent 375aea434e
commit 4a733fd788
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.1-Bluetooth-host-Fix-SMP-local-keys-check-when-startin.patch Normal file
View File

@@ -0,0 +1,51 @@
From 74d26b70f080a5dc60c6a1aa2bfec38043ee30d4 Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Fri, 5 Aug 2022 10:50:47 +0200
Subject: [PATCH] Bluetooth: host: Fix SMP local keys check when starting
encryption
Fix SMP check of existing local keys when attempting to start security
with required security mode 1 level 4. The logic for checking the
conditions was wrong, leading to a situation where encryption would be
attempted to be started by the central instead of initiating a new
pairing procedure. This would fail when the connection was encrypted and
the connection would be disconnected.
Upstream-Status: Backport [https://github.com/zephyrproject-rtos/zephyr/commit/83d5402fe830973f943bde085d80f0d3643e811a]
https://github.com/zephyrproject-rtos/zephyr/pull/52947/files
CVE: CVE-2022-2993
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
subsys/bluetooth/host/smp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 02a847f97d..555f09fefd 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -357,15 +357,15 @@ static bool smp_keys_check(struct bt_conn *conn)
return false;
}
- if (conn->required_sec_level > BT_SECURITY_L2 &&
+ if (conn->required_sec_level >= BT_SECURITY_L3 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED)) {
return false;
}
- if (conn->required_sec_level > BT_SECURITY_L3 &&
- !(conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
- !(conn->le.keys->keys & BT_KEYS_LTK_P256) &&
- !(conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE)) {
+ if (conn->required_sec_level >= BT_SECURITY_L4 &&
+ !((conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
+ (conn->le.keys->keys & BT_KEYS_LTK_P256) &&
+ (conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE))) {
return false;
}
--
2.25.1

3
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.1.0.inc
View File

@@ -2,7 +2,7 @@
SRCREV_FORMAT = "default"
SRCREV_default = "2ddd73feafd3316af2c547c34d6969bea637d5c6"
SRCREV_default = "a7d946331f4f9361d1531984524dd8f151ae20b0"
SRCREV_canopennode = "53d3415c14d60f8f4bfca54bfbc5d5a667d7e724"
SRCREV_chre = "0edfe2c2ec656afb910cfab8ed59a5ffd59b87c8"
SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c"
@@ -109,6 +109,7 @@ SRC_URI_ZSCILIB ?= "git://github.com/zephyrproject-rtos/zscilib;protocol=https"
SRC_URI_PATCHES ?= "\
file://0001-3.1-cmake-add-yocto-toolchain.patch;patchdir=zephyr \
file://0001-3.1-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
file://0001-3.1-Bluetooth-host-Fix-SMP-local-keys-check-when-startin.patch;patchdir=zephyr \
"
SRC_URI = "\