Backport a patch to fix CVE-2015-1572
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1572
(From OE-Core rev: 203e1024cc7517cad28423cc04f641376cc8f2f5)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS="$CONTRIB_DIR/../debugfs/debugfs"
(From OE-Core rev: 525b7b587a00466e4322450c171d920b47201e56)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 3047160d04dfa1846db52b58d77f6380ea3dfb6e)
Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes a heap buffer overflow in lib/ext2fs/openfs.c which allows
a trivial arbitrary memory write under certain conditions.
References
http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/?id=f66e6ce4http://www.ocert.org/advisories/ocert-2015-002.html
(From OE-Core rev: 572437720b6698a3a10627fcd9654ef10f827836)
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
See the patch description, this adds a tweak to an algorithm to improve
core-image-sato-sdk mkfs time from over 8 minutes to about 35s.
Needs discussion upstream but seems reasonable for our uses of it.
(From OE-Core rev: 468fa9a7fac86bb0fcd3cbd18dc1492b57ca25f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The build system uses BUILD_CC itself now, so we don't need to do it manually.
(From OE-Core rev: 32ddff201eb00b1ffa244904251ad0ad39760b62)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This chmod doesn't appear to be needed, and history fades away in 2005.
(From OE-Core rev: bade04d62468acbec2b54f38b5071a3b1070ab9a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both of these fixes have been applied upstream and improve general code
correctness. They are needed when building with TCLIBC=musl but shouldn't cause
any harm with other libc implementations.
(From OE-Core rev: 23a533908355b7bb37ce34b073ac91aa20c5776d)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both busybox and e2fsprogs provide chattr, ensure that they are delivered
to the same location and use update-alternatives to ensure the correct
links are there.
[YOCTO #6407]
(From OE-Core rev: 23f1dddbf9cf783d90040b67978d1291b16a13de)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ext2_types.h conflicts between 32-bit and 64-bit versions.
(From OE-Core rev: e5bae3426856f9d2fdb604278154b6242011d103)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The mke2fs and e2fsck commands are regular tools of e2fsprogs, so they
should be installed.
(From OE-Core rev: a2b6610dceb0c27484d3958d84d7f491aa759a04)
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need return retval when "mke2fs -d" failed, otherwise the "$?" would
be 0 which is misleading.
[YOCTO #6011]
(From OE-Core rev: 46896b601c1c93e276954b674aa30b8b4dc4f611)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When compiling e2fsprogs for qemumips64, we got compilation errors.
The root cause is that parse-types.sh script would fail for mips64.
However, the type size checking in parse-types.sh doesn't make much
sense in case of cross compilation. This is because that the typedef
statements in asm_types.h are for the target machine while the generated
binary in parse-types.sh script is executed on build machine.
This patch fixes such problem.
(From OE-Core rev: 45877518e2d277c63d5a561408fbfcd4cb5a2a76)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove it since we don't need it anymore, and there is one inside the
e2fsprogs.
[YOCTO #4083]
(From OE-Core rev: f3a95ca6886b55e5819b068bdbd2cceb882d91a6)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These patches should be enabled at the same time, so enable them in a
single commit, and thus we can disable it easily.
[YOCTO #4083]
(From OE-Core rev: 671bf47101b8f7bd2e6e8b7920615f9e7837ea81)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Upgrade to 1.42.9
* Remove the following patches since they have been merged/fixed by
upstream:
- debugfs-extent-header.patch
- debugfs-sparse-copy.patch
- debugfs-too-short.patch
- e2fsprogs-fix-tests-f_extent_oobounds.patch
- fallocate.patch
* The populate-extfs.sh had been merged by the upstream, but I'd like to
go on using the previous one which is from our meta layer, they are a
little different, and the script would be dropped when we use the mke2fs
to populate the rootfs.
* Sumitted the patch for populate-extfs.sh (from Søren Holm) to upstream.
* Submitted fix-icache.patch to upstream, I wrongly thought it was not
applicable to the upstream, but it does.
* Join the do_install() and do_install_append() together.
(From OE-Core rev: 82cc941128f9eaf57c3a9a648fc58227f6c1956c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Roy Li
Martin Jansa
Dmitry Eremin-Solenikov
Alex J Lennon
Sona Sarmadi
Richard Purdie
Shiqun Lin
Ross Burton
Paul Barker
Saul Wold
Ming Liu
Yue Tao
Robert Yang
Chen Qi