e2fsprogs: update to 1.45.5
PATCH 1/1 e2fsprogs: update to 1.45.5
Dropping patch 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time.
Includes: CVE-2019-5188
see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5 for more information.
---
...ate_inode.c-set-dir-s-mode-correctly.patch | 41 -------------------
...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +-
2 files changed, 1 insertion(+), 43 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} (97%)meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted +0 -41
@@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, this was -incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang <[email protected]> ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t ino, - - inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 -
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +1 -2
@@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ "
@@ -13,7 +12,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio file://quiet-debugfs.patch \ " -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
Signature · 1 line
2.17.1
Quoted 4 lines · Armin Kuster
Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time.
Looking at the patch, this worries me a lot. Why have upstream not taken it? Did they say it was incorrect?
We wrote the original code to handle offline root here so its entirely possible this is a value issue and we'll break filesystems if we don't have that patch :(
I can't take a change like this without more info, CVE or not.
Cheers,
Richard
Quoted 101 lines
Includes: CVE-2019-5188
see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5
for more information.Signed-off-by Armin Kuster <[email protected]>--- ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- ---- ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001- misc-create_inode.c-set-dir-s-mode-correctly.patch rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb =>e2fsprogs_1.45.5.bb} (97%)
(quoted diff) +0
-0create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- correctly.patch
deleted file mode 100644
index fc4a5409860..00000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- create_inode.c-set-dir-s-mode-correctly.patch
+++/dev/null(quoted diff) +0
-1@@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:002001
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted +0
-8-From: Robert Yang <[email protected]> -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, thiswas
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted +0
-14-incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang <[email protected]> ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsysfs,
ext2_ino_tino,
-meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted +0
-17- inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 -meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-1@@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode- correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ "meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-0@@ -13,7 +12,7 @@ SRC_URI_append_class-native = "file://e2fsprogs-fix-missing-check-for-permissio
file://quiet-debugfs.patch \"
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +1
-1-SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \Signature · 1 line
2.17.1
Quoted 8 lines · Richard Purdie
Quoted 4 lines · Armin Kuster
Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time.
Looking at the patch, this worries me a lot. Why have upstream not taken it? Did they say it was incorrect?
I can't find any records about it, maybe I didn't send it because of some reason.
We still need it. I refreshed the patch and sent to upstream.
@Armin, The refreshed patch is in the attachment.
// Robert
Quoted 106 lines
We wrote the original code to handle offline root here so its entirely possible this is a value issue and we'll break filesystems if we don't have that patch :(
I can't take a change like this without more info, CVE or not.
Cheers,
Richard
Quoted 93 lines
Includes: CVE-2019-5188
see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5
for more information.Signed-off-by Armin Kuster <[email protected]>--- ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- ---- ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-)delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-
misc-create_inode.c-set-dir-s-mode-correctly.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb =>
e2fsprogs_1.45.5.bb} (97%)(quoted diff) +0
-0create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- correctly.patch
deleted file mode 100644
index fc4a5409860..00000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- create_inode.c-set-dir-s-mode-correctly.patch
+++/dev/null(quoted diff) +0
-1@@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:002001
(quoted diff) +0
-8-From: Robert Yang <[email protected]> -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, thiswas
(quoted diff) +0
-14-incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang <[email protected]> ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsysfs,
ext2_ino_tino,(quoted diff) +0
-18- - inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 -meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-1@@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode- correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ "meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-0@@ -13,7 +12,7 @@ SRC_URI_append_class-native = "file://e2fsprogs-fix-missing-check-for-permissio
file://quiet-debugfs.patch \"
Quoted 10 lines
Quoted 8 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +1
-1-SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \Signature · 1 line
2.17.1
From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 2001
From: Robert Yang <[email protected]>
Date: Mon, 24 Feb 2020 18:46:55 +0800
Subject: [PATCH][e2fsprogs] misc/create_inode.c: set dir's mode correctly
The dir's mode has been set by ext2fs_mkdir() with umask, so reset it to the source's mode in set_inode_extra().
Fixed when source dir's mode is 521, but dst dir's mode is 721 which was incorrect.
Upstream-Status: Submitted [[email protected]]
--- misc/create_inode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
misc/create_inode.c +8 -1
@@ -124,7 +124,14 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t ino,ext2fs_set_i_uid_high (inode, st->st_uid >>16 ); inode.i_gid = st->st_gid;ext2fs_set_i_gid_high (inode, st->st_gid >>16 ); - inode.i_mode |= st->st_mode; +/* +* The dir's mode has been set by ext2fs_mkdir() with umask, so +* reset it to the source's mode +*/ + if S_ISDIR(st->st_mode) + inode.i_mode = LINUX_S_IFDIR | st->st_mode; + else + inode.i_mode |= st->st_mode; inode.i_atime = st->st_atime; inode.i_mtime = st->st_mtime; inode.i_ctime = st->st_ctime;
Signature · 1 line
2.7.4
Quoted 11 lines · Robert Yang
Quoted 8 lines · Richard Purdie
Quoted 4 lines · Armin Kuster
Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time.
Looking at the patch, this worries me a lot. Why have upstream not taken it? Did they say it was incorrect?
Quoted 6 lines
I can't find any records about it, maybe I didn't send it because of some reason.
We still need it. I refreshed the patch and sent to upstream.
@Armin, The refreshed patch is in the attachment.
Will do. thanks for the feedback.
- armin
Quoted 118 lines
// Robert
Quoted 115 lines
We wrote the original code to handle offline root here so its entirely possible this is a value issue and we'll break filesystems if we don't have that patch :(
I can't take a change like this without more info, CVE or not.
Cheers,
Richard
Quoted 100 lines
Includes: CVE-2019-5188
see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5
for more information.Signed-off-by Armin Kuster <[email protected]>---
...ate_inode.c-set-dir-s-mode-correctly.patch | 41 ---------------
----
...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +-2 files changed, 1 insertion(+), 43 deletions(-)delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001- misc-create_inode.c-set-dir-s-mode-correctly.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} (97%)(quoted diff) +0
-0create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- correctly.patch
deleted file mode 100644
index fc4a5409860..00000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- create_inode.c-set-dir-s-mode-correctly.patch
+++/dev/null(quoted diff) +0
-1@@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:002001
(quoted diff) +0
-8-From: Robert Yang <[email protected]> -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, thiswas
(quoted diff) +0
-14-incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang <[email protected]> ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsysfs,
ext2_ino_tino,(quoted diff) +0
-18- - inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 -meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-1@@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode- correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \file://0001-intl-do-not-try-to-use-gettext-defines-that- no-longe.patch \
"meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-0@@ -13,7 +12,7 @@ SRC_URI_append_class-native = "file://e2fsprogs-fix-missing-check-for-permissio file://quiet-debugfs.patch \
"
-SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618"UPSTREAM_CHECK_GITTAGREGEX= "v(?P<pver>\d+\.\d+(\.\d+)*)$"EXTRA_OECONF+= "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--
2.17.1
Hi Armin,
Quoted 14 lines · On 2/24/20 11:19 PM, akuster808 wrote:
Quoted 11 lines · Robert Yang
Quoted 8 lines · Richard Purdie
Quoted 4 lines · Armin Kuster
Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time.
Looking at the patch, this worries me a lot. Why have upstream not taken it? Did they say it was incorrect?
Quoted 8 lines
Quoted 6 lines
I can't find any records about it, maybe I didn't send it because of some reason.
We still need it. I refreshed the patch and sent to upstream.
@Armin, The refreshed patch is in the attachment.
Will do. thanks for the feedback.
Seems that e2fsprogs didn't update to 1.45.5. After I sent the patch to upstream, they fixed the issue in another way:
If you upgrade it to 1.45.5, you can use the upstream patch to replace the current one, but if you don't upgrade it,
I'm leaning to keep the current patch since some context are different.
// Robert
Quoted 122 lines
- armin
Quoted 118 lines
// Robert
Quoted 115 lines
We wrote the original code to handle offline root here so its entirely possible this is a value issue and we'll break filesystems if we don't have that patch :(
I can't take a change like this without more info, CVE or not.
Cheers,
Richard
Quoted 100 lines
Includes: CVE-2019-5188
see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5
for more information.Signed-off-by Armin Kuster <[email protected]>--- ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- ---- ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-)delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-
misc-create_inode.c-set-dir-s-mode-correctly.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb =>
e2fsprogs_1.45.5.bb} (97%)(quoted diff) +0
-0create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- correctly.patch
deleted file mode 100644
index fc4a5409860..00000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- create_inode.c-set-dir-s-mode-correctly.patch
+++/dev/null(quoted diff) +0
-1@@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:002001
(quoted diff) +0
-8-From: Robert Yang <[email protected]> -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, thiswas
(quoted diff) +0
-14-incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang <[email protected]> ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsysfs,
ext2_ino_tino,(quoted diff) +0
-18- - inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 -meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-1@@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode- correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
"meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +0
-0@@ -13,7 +12,7 @@ SRC_URI_append_class-native = "file://e2fsprogs-fix-missing-check-for-permissio
file://quiet-debugfs.patch \
"
-SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac"
+SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618"
UPSTREAM_CHECK_GITTAGREGEX= "v(?P<pver>\d+\.\d+(\.\d+)*)$"EXTRA_OECONF+= "--libdir=${base_libdir}
--sbindir=${base_sbindir} \Signature · 1 line
2.17.1