diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch | 22 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch new file mode 100644 index 0000000000..3deaf3f0e9 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Fix for CVE-2014-2532 | ||
4 | |||
5 | Backported from openssh-6.6p1.tar.gz | ||
6 | |||
7 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
8 | --- | ||
9 | --- a/session.c | ||
10 | +++ b/session.c | ||
11 | @@ -955,6 +955,11 @@ | ||
12 | u_int envsize; | ||
13 | u_int i, namelen; | ||
14 | |||
15 | + if (strchr(name, '=') != NULL) { | ||
16 | + error("Invalid environment variable \"%.100s\"", name); | ||
17 | + return; | ||
18 | + } | ||
19 | + | ||
20 | /* | ||
21 | * If we're passed an uninitialized list, allocate a single null | ||
22 | * entry before continuing. | ||
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb index b93b9ae79f..230f38ab31 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb | |||
@@ -29,7 +29,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. | |||
29 | file://sshdgenkeys.service \ | 29 | file://sshdgenkeys.service \ |
30 | file://volatiles.99_sshd \ | 30 | file://volatiles.99_sshd \ |
31 | file://add-test-support-for-busybox.patch \ | 31 | file://add-test-support-for-busybox.patch \ |
32 | file://run-ptest" | 32 | file://run-ptest \ |
33 | file://openssh-CVE-2014-2532.patch" | ||
33 | 34 | ||
34 | PAM_SRC_URI = "file://sshd" | 35 | PAM_SRC_URI = "file://sshd" |
35 | 36 | ||