Browse code
openssh : Fix CVE-2017-15906.
Change-Id: I8b4c076cf916766815ee31cb25a069e5ffc102f9
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4399
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
xiaolin-vmware authored on 2017/11/29 10:30:19Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,31 @@ |
| 0 |
+From a6981567e8e215acc1ef690c8dbb30f2d9b00a19 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: djm <djm@openbsd.org> |
|
| 2 |
+Date: Tue, 4 Apr 2017 00:24:56 +0000 |
|
| 3 |
+Subject: [PATCH] disallow creation (of empty files) in read-only mode; |
|
| 4 |
+ reported by Michal Zalewski, feedback & ok deraadt@ |
|
| 5 |
+ |
|
| 6 |
+--- |
|
| 7 |
+ usr.bin/ssh/sftp-server.c | 6 +++--- |
|
| 8 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
|
| 9 |
+ |
|
| 10 |
+diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c |
|
| 11 |
+index 2510d234a3a..42249ebd60d 100644 |
|
| 12 |
+--- a/usr.bin/ssh/sftp-server.c |
|
| 13 |
+@@ -1,4 +1,4 @@ |
|
| 14 |
+-/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ |
|
| 15 |
++/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */ |
|
| 16 |
+ /* |
|
| 17 |
+ * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
|
| 18 |
+ * |
|
| 19 |
+@@ -683,8 +683,8 @@ process_open(u_int32_t id) |
|
| 20 |
+ logit("open \"%s\" flags %s mode 0%o",
|
|
| 21 |
+ name, string_from_portable(pflags), mode); |
|
| 22 |
+ if (readonly && |
|
| 23 |
+- ((flags & O_ACCMODE) == O_WRONLY || |
|
| 24 |
+- (flags & O_ACCMODE) == O_RDWR)) {
|
|
| 25 |
++ ((flags & O_ACCMODE) != O_RDONLY || |
|
| 26 |
++ (flags & (O_CREAT|O_TRUNC)) != 0)) {
|
|
| 27 |
+ verbose("Refusing open request in read-only mode");
|
|
| 28 |
+ status = SSH2_FX_PERMISSION_DENIED; |
|
| 29 |
+ } else {
|
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Free version of the SSH connectivity tools |
| 2 | 2 |
Name: openssh |
| 3 | 3 |
Version: 7.5p1 |
| 4 |
-Release: 10%{?dist}
|
|
| 4 |
+Release: 11%{?dist}
|
|
| 5 | 5 |
License: BSD |
| 6 | 6 |
URL: https://www.openssh.com/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -16,6 +16,7 @@ Source3: sshd-keygen.service |
| 16 | 16 |
Patch0: blfs_systemd_fixes.patch |
| 17 | 17 |
Patch1: openssh-7.5p1-fips.patch |
| 18 | 18 |
Patch2: openssh-7.5p1-configure-fips.patch |
| 19 |
+Patch3: openssh-CVE-2017-15906.patch |
|
| 19 | 20 |
BuildRequires: openssl-devel |
| 20 | 21 |
BuildRequires: Linux-PAM-devel |
| 21 | 22 |
BuildRequires: krb5-devel |
| ... | ... |
@@ -52,6 +53,7 @@ tar xf %{SOURCE1} --no-same-owner
|
| 52 | 52 |
%patch0 -p0 |
| 53 | 53 |
%patch1 -p1 |
| 54 | 54 |
%patch2 -p1 |
| 55 |
+%patch3 -p3 |
|
| 55 | 56 |
%build |
| 56 | 57 |
./configure \ |
| 57 | 58 |
CFLAGS="%{optflags}" \
|
| ... | ... |
@@ -179,6 +181,8 @@ rm -rf %{buildroot}/*
|
| 179 | 179 |
%{_mandir}/man8/ssh-pkcs11-helper.8.gz
|
| 180 | 180 |
|
| 181 | 181 |
%changelog |
| 182 |
+* Tue Nov 28 2017 Xiaolin Li <xiaolinl@vmware.comm> 7.5p1-11 |
|
| 183 |
+- Fix CVE-2017-15906. |
|
| 182 | 184 |
* Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-10 |
| 183 | 185 |
- Fix: openssh-server requires(pre) shadow tools |
| 184 | 186 |
* Tue Nov 14 2017 Anish Swaminathan <anishs@vmware.com> 7.5p1-9 |