| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From d77148e3a3ef6c29b26ec74331455394581aa257 Mon Sep 17 00:00:00 2001 |
| 2 | From: "djm@openbsd.org" <djm@openbsd.org> |
| 3 | Date: Sun, 8 Nov 2015 21:59:11 +0000 |
| 4 | Subject: [PATCH] upstream commit |
| 5 | |
| 6 | fix OOB read in packet code caused by missing return |
| 7 | statement found by Ben Hawkes; ok markus@ deraadt@ |
| 8 | |
| 9 | Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62 |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | CVE: CVE-2016-1907 |
| 13 | |
| 14 | [YOCTO #8935] |
| 15 | |
| 16 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 17 | |
| 18 | --- |
| 19 | packet.c | 1 + |
| 20 | 1 file changed, 1 insertion(+) |
| 21 | |
| 22 | Index: openssh-7.1p2/packet.c |
| 23 | =================================================================== |
| 24 | --- openssh-7.1p2.orig/packet.c |
| 25 | +++ openssh-7.1p2/packet.c |
| 26 | @@ -1855,6 +1855,7 @@ ssh_packet_process_incoming(struct ssh * |
| 27 | if (len >= state->packet_discard) { |
| 28 | if ((r = ssh_packet_stop_discard(ssh)) != 0) |
| 29 | return r; |
| 30 | + return SSH_ERR_CONN_CORRUPT; |
| 31 | } |
| 32 | state->packet_discard -= len; |
| 33 | return 0; |