diff options
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/CVE-2021-28041.patch | 20 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.2p1.bb | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2021-28041.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2021-28041.patch new file mode 100644 index 0000000000..9fd7e932d1 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/CVE-2021-28041.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Description: fix double-free memory corruption in ssh-agent | ||
2 | Author: Marc Deslauriers <marc.deslauriers@canonical.com> | ||
3 | Origin: minimal fix for https://github.com/openssh/openssh-portable/commit/e04fd6dde16de1cdc5a4d9946397ff60d96568db | ||
4 | |||
5 | Signed-off-by: Sana Kazi <Sana.Kazi@kpit.com> | ||
6 | |||
7 | CVE: CVE-2021-28041 | ||
8 | Upstream-Status: Backport [http://archive.ubuntu.com/ubuntu/pool/main/o/openssh/openssh_8.2p1-4ubuntu0.3.debian.tar.xz] | ||
9 | Comment: No change in any hunk | ||
10 | |||
11 | --- a/ssh-agent.c | ||
12 | +++ b/ssh-agent.c | ||
13 | @@ -496,6 +496,7 @@ process_add_identity(SocketEntry *e) | ||
14 | goto err; | ||
15 | } | ||
16 | free(ext_name); | ||
17 | + ext_name = NULL; | ||
18 | break; | ||
19 | default: | ||
20 | error("%s: Unknown constraint %d", __func__, ctype); | ||
diff --git a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb index 64a0a72a8f..5f03bdc877 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar | |||
25 | file://sshd_check_keys \ | 25 | file://sshd_check_keys \ |
26 | file://add-test-support-for-busybox.patch \ | 26 | file://add-test-support-for-busybox.patch \ |
27 | file://CVE-2020-14145.patch \ | 27 | file://CVE-2020-14145.patch \ |
28 | file://CVE-2021-28041.patch \ | ||
28 | " | 29 | " |
29 | SRC_URI[md5sum] = "3076e6413e8dbe56d33848c1054ac091" | 30 | SRC_URI[md5sum] = "3076e6413e8dbe56d33848c1054ac091" |
30 | SRC_URI[sha256sum] = "43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" | 31 | SRC_URI[sha256sum] = "43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" |