summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-22 14:07:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-07 11:18:38 +0100
commitb5c5d84b8be27c611c1c21d5c13039a90977bbd4 (patch)
tree869961afb3b333395e1f4fbb9a9fd45f0be96dfb /meta/recipes-devtools
parent6bf90676038a7a6111bbfeaef2f73614c7206b9e (diff)
downloadpoky-b5c5d84b8be27c611c1c21d5c13039a90977bbd4.tar.gz
pseudo: Ignore mismatched inodes from the db
Currently, where pseudo finds a database entry for an inode but the path doesn't match, it reuses that database entry metadata. This is causing real world "corruption" of file attributes. See [YOCTO #14057] for an example of this. This can happen when files are deleted outside of pseudo context and the inode is reused by a new file which pseduo then "sees". Its possible the opposite could happen, it needs to reuse attributes but this change would prevent it. As far as I can tell, we don't want pseuo to reuse these attributes though so this code should be safer and avoid bugs like the above. (From OE-Core rev: 1c13149b81e03a1ac48b27a208a139d5493c3ce7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pseudo/files/delete_mismatches.patch51
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/files/delete_mismatches.patch b/meta/recipes-devtools/pseudo/files/delete_mismatches.patch
new file mode 100644
index 0000000000..6c78d787c7
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/delete_mismatches.patch
@@ -0,0 +1,51 @@
1When we see cases where the inode no longer matches the file path, pseudo
2notices but currently reuses the database entry. This can happen where for
3example, a file is deleted and a new file created outside of pseudo where
4the inode number is reused.
5
6Change this to ignore the likely stale database entry instead. We're
7seeing bugs where inode reuse for deleted files causes permission corruption.
8(See bug #14057 for example). We don't want to delete the database entry
9as the permissions may need to be applied to that file (and testing shows
10we do need the path matching code which handles that).
11
12I appreciate this should never happen under the original design of pseudo
13where all file accesses are monitored by pseudo. The reality is to do that,
14we'd have to run pseudo:
15
16a) for all tasks
17b) as one pseudo database for all of TMPDIR
18
19Neither of these is realistically possible for performance reasons.
20
21I believe pseudo to be much better at catching all accesses than it
22might once have been. As such, these "fixups" are in the cases I've
23seen in the logs, always incorrect.
24
25It therefore makes more sense to ignore the database data rather than
26corrupt the file permissions or worse. Looking at the pseudo logs
27in my heavily reused build directories, the number of these
28errors is staggering. This issue would explain many weird bugs we've
29seen over the years.
30
31There is a risk that we could not map permissions in some case where
32we currently would. I have not seen evidence of this in any logs I've
33read though. This change, whilst going against the original design,
34is in my view the safer option for the project at this point given we
35don't use pseudo as originally designed and never will be able to.
36
37Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
38Upstream-Status: Pending
39
40Index: git/pseudo.c
41===================================================================
42--- git.orig/pseudo.c
43+++ git/pseudo.c
44@@ -699,6 +701,7 @@ pseudo_op(pseudo_msg_t *msg, const char
45 (unsigned long long) msg_header.ino,
46 path_by_ino ? path_by_ino : "no path",
47 msg->path);
48+ found_ino = 0;
49 }
50 }
51 } else {
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 3b623d8bd7..7eb72f0eab 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -2,6 +2,7 @@ require pseudo.inc
2 2
3SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ 3SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
4 file://0001-configure-Prune-PIE-flags.patch \ 4 file://0001-configure-Prune-PIE-flags.patch \
5 file://delete_mismatches.patch \
5 file://fallback-passwd \ 6 file://fallback-passwd \
6 file://fallback-group \ 7 file://fallback-group \
7 " 8 "