Browse code

Docker : Fix CVE-2019-5736

Change-Id: I79da41f9df398ee9f65bf0edf22f1de87daa8af2
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6678
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Him Kalyan Bordoloi authored on 2019/02/12 11:08:37
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+diff -ru docker-18.03.0-old/components/engine/hack/dockerfile/install/runc.installer docker-18.03.0/components/engine/hack/dockerfile/install/runc.installer
1
+--- docker-18.03.0-old/components/engine/hack/dockerfile/install/runc.installer	2018-03-21 15:59:46.000000000 -0700
2
+@@ -1,7 +1,7 @@
3
+ #!/bin/sh
4
+ 
5
+ # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
6
+-RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871
7
++RUNC_COMMIT=0a8e4117e7f715d5fbeef398405813ce8e88558b
8
+ 
9
+ install_runc() {
10
+ 	# Do not build with ambient capabilities support
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Docker
5 5
 Name:           docker
6 6
 Version:        18.03.0
7
-Release:        2%{?dist}
7
+Release:        3%{?dist}
8 8
 License:        ASL 2.0
9 9
 URL:            http://docs.docker.com
10 10
 Group:          Applications/File
... ...
@@ -15,6 +15,7 @@ Source0:        https://github.com/docker/docker-ce/archive/docker-%{version}-ce
15 15
 %define DOCKER_GITCOMMIT 0520e243029d1361649afb0706a1c5d9a1c012b8
16 16
 Source99:       default-disable.preset
17 17
 Patch0:         fix-apparmor-not-being-applied-to-exec-processes.patch
18
+Patch1:         CVE-2019-5736.patch
18 19
 Patch99:        remove-firewalld.patch
19 20
 
20 21
 BuildRequires:  systemd
... ...
@@ -52,6 +53,7 @@ Documentation and vimfiles for docker
52 52
 %setup -q -c
53 53
 
54 54
 %patch0 -p1
55
+%patch1 -p1
55 56
 %patch99 -p1
56 57
 
57 58
 mkdir -p /go/src/github.com
... ...
@@ -190,6 +192,8 @@ rm -rf %{buildroot}/*
190 190
 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
191 191
 
192 192
 %changelog
193
+*   Mon Feb 11 2019 Him Kalyan Bordoloi <bordoloih@vmware.com> 18.03.0-3
194
+-   Patch to fix CVE-2019-5736
193 195
 *   Fri Sep 07 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 18.03.0-2
194 196
 -   Fix apparmor not being applied to exec processes
195 197
 *   Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 18.03.0-1