summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2019-02-15 17:32:38 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-02-15 20:10:36 +0000
commitda75d2a91a1547326084d03e52e35f38f1442bd9 (patch)
treeee6cf805e24eae7321b5a1c9d9b8246bdc33506f
parent8c1284f9212ccf7722d0ab701486f7d3adedd06e (diff)
downloadmeta-virtualization-da75d2a91a1547326084d03e52e35f38f1442bd9.tar.gz
runc: address CVE-2019-5736
Use git hash which addresses CVE-2019-5736. Use the same git hash used in top of Docker 18.09 branch. Changes in runc since 6635b4f0 merge branch 'cve-2019-5736' 0a8e4117 nsenter: clone /proc/self/exe to avoid exposing host binary to container dd023c45 merge branch 'pr-1972' Fixes: CVE-2019-5736 Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/runc/runc-docker_git.bb2
-rw-r--r--recipes-containers/runc/runc-opencontainers_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index 41c82f7e..4eb2d078 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -4,7 +4,7 @@ RRECOMMENDS_${PN} = "lxc docker"
4 4
5# Note: this rev is before the required protocol field, update when all components 5# Note: this rev is before the required protocol field, update when all components
6# have been updated to match. 6# have been updated to match.
7SRCREV_runc-docker = "4a600c04ed480084b2351b3e32c26cb4a2d5d533" 7SRCREV_runc-docker = "6635b4f0c6af3810594d2770f662f34ddc15b40d"
8SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \ 8SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
9 file://0001-runc-Add-console-socket-dev-null.patch \ 9 file://0001-runc-Add-console-socket-dev-null.patch \
10 file://0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch \ 10 file://0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch \
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index 27c5f23b..5f65940f 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,6 +1,6 @@
1include runc.inc 1include runc.inc
2 2
3SRCREV = "4a600c04ed480084b2351b3e32c26cb4a2d5d533" 3SRCREV = "6635b4f0c6af3810594d2770f662f34ddc15b40d"
4SRC_URI = " \ 4SRC_URI = " \
5 git://github.com/opencontainers/runc;branch=master \ 5 git://github.com/opencontainers/runc;branch=master \
6 " 6 "