diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2016-08-10 11:19:44 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 15:27:04 +0100 |
commit | c594ff73ab3823c8a233540670cc71980b39eb04 (patch) | |
tree | 4d12c7cb8921c92c10a76b53b05a687660d5b7a7 /meta/recipes-devtools | |
parent | b9e99832b93ba18e75444c4a610870191a41ec92 (diff) | |
download | poky-c594ff73ab3823c8a233540670cc71980b39eb04.tar.gz |
e2fsprogs: Fix missing check for permission denied.
If the path to "ROOT_SYSCONFDIR /mke2fs.conf" has a permission denied problem,
then the get_dirlist() call will return EACCES. But the code in profile_init
will treat that as a fatal error and all executions will fail with:
Couldn't init profile successfully (error: 13).
But the problem should not really be visible for the target package as the path
then will be "/etc/mke2fs.conf", and it is not likely that a user have no
permission to read /etc.
(From OE-Core rev: 9d7c32a88e0670a09e5e1097ff8bca58e9a7943f)
Fixup bb for Krogoth.
(From OE-Core rev: 49086f40c8068ed504d301ef8f56528fd813e10f)
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch new file mode 100644 index 0000000000..33054c61fa --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Subject: [PATCH] Fix missing check for permission denied. | ||
2 | |||
3 | If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem, | ||
4 | then the get_dirlist() call will return EACCES. But the code in profile_init | ||
5 | will treat that as a fatal error and all executions will fail with: | ||
6 | Couldn't init profile successfully (error: 13). | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Written-by: Henrik Wallin <henrik.b.wallin@ericsson.com> | ||
11 | |||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
13 | --- | ||
14 | lib/support/profile.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/lib/support/profile.c b/lib/support/profile.c | ||
18 | index 51a3314..1c1039f 100644 | ||
19 | --- a/lib/support/profile.c | ||
20 | +++ b/lib/support/profile.c | ||
21 | @@ -335,7 +335,7 @@ profile_init(const char **files, profile_t *ret_profile) | ||
22 | *last = new_file; | ||
23 | last = &new_file->next; | ||
24 | } | ||
25 | - } else if ((retval != ENOTDIR) && | ||
26 | + } else if ((retval != ENOTDIR) && (retval != EACCES) && | ||
27 | strcmp(*fs, default_filename)) | ||
28 | goto errout; | ||
29 | |||
30 | -- | ||
31 | 2.7.4 | ||
32 | |||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb index 9cde8e46b7..e372074bd7 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | |||
@@ -10,8 +10,11 @@ SRC_URI += "file://acinclude.m4 \ | |||
10 | file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ | 10 | file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" | ||
14 | |||
13 | SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544" | 15 | SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544" |
14 | PV = "1.42.99+1.43+git${SRCPV}" | 16 | PV = "1.42.99+1.43+git${SRCPV}" |
17 | |||
15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" |
16 | 19 | ||
17 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ | 20 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ |