summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_1.23.1.bb
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-04-14 19:53:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-15 18:12:44 +0100
commitc18b02e5e97a41b03377bd53ae02678c1fcb5c81 (patch)
treeacd7eb112a80ad6bdcb872593b2025e5c993abb2 /meta/recipes-core/busybox/busybox_1.23.1.bb
parentaa263849ba573196d2cc859e7f84aa1758a20b06 (diff)
downloadpoky-c18b02e5e97a41b03377bd53ae02678c1fcb5c81.tar.gz
busybox: remove CVE-2014-9645 patch (already upstream in 1.23.x)
The CVE-2014-9645 fix was merged in Busybox prior to the 1.23.0 release [1]. The fix was then reworked in Busybox 1.23.1, in such a way that the original change was no longer required [2]. Although oe-core's CVE-2014-9645 patch still applies cleanly to Busybox 1.23.1 and 1.23.2, applying it partially reverts the second version of the upstream fix. [1] http://git.busybox.net/busybox/commit/modutils/modprobe.c?h=1_23_stable&id=4e314faa0aecb66717418e9a47a4451aec59262b [2] http://git.busybox.net/busybox/commit/modutils/modprobe.c?h=1_23_stable&id=1ecfe811fe2f70380170ef7d820e8150054e88ca (From OE-Core master rev: a753d3d8884b96baad5ed1a03335a81586420b86) (From OE-Core rev: ef1748f26ab246d893f51141caa24dd4ae6b5ec0) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_1.23.1.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_1.23.1.bb1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb b/meta/recipes-core/busybox/busybox_1.23.1.bb
index 1742390ed9..7c3ed84394 100644
--- a/meta/recipes-core/busybox/busybox_1.23.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.1.bb
@@ -30,7 +30,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
30 file://login-utilities.cfg \ 30 file://login-utilities.cfg \
31 file://recognize_connmand.patch \ 31 file://recognize_connmand.patch \
32 file://busybox-cross-menuconfig.patch \ 32 file://busybox-cross-menuconfig.patch \
33 file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \
34" 33"
35 34
36SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" 35SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245"