mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

pseudo: Abort on mismatch patch

Browse Source 
Rather than doing what turns out to be a rather dangerous "fixup" if
we see a file with a different path but the same inode as another file
we've previously seen, throw and abort. Direct the user to a wiki page
where we can maintain information about what this error means.

(From OE-Core rev: 2db491d97da08d44ebd257f98489550a82a7935c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-09-29 17:57:38 +01:00
parent 84d006b9fb
commit 84e0642ed6
2 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
meta/recipes-devtools/pseudo/files/abort_on_mismatch.patch Normal file
View File

@@ -0,0 +1,64 @@
Rather than mapping mismatched inode entries to paths, thrown an abort()
instead. Add a new result type to allow the server to pass back
this instruction to the client.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Pending
Index: git/pseudo.c
===================================================================
--- git.orig/pseudo.c
+++ git/pseudo.c
@@ -695,17 +695,15 @@ pseudo_op(pseudo_msg_t *msg, const char
msg->path);
pdb_did_unlink_file(path_by_ino, &by_ino, by_ino.deleting);
} else {
- int flags = 0;
- if (msg->nlink > 1) {
- flags = PDBGF_FILE | PDBGF_VERBOSE;
- }
- pseudo_debug(flags, "path mismatch [%d link%s]: ino %llu db '%s' req '%s'.\n",
+ pseudo_diag("path mismatch [%d link%s]: ino %llu db '%s' req '%s'.\n",
msg->nlink,
msg->nlink == 1 ? "" : "s",
(unsigned long long) msg_header.ino,
path_by_ino ? path_by_ino : "no path",
msg->path);
found_ino = 0;
+ msg->result = RESULT_ABORT;
+ goto op_exit;
}
}
} else {
@@ -1025,6 +1023,7 @@ pseudo_op(pseudo_msg_t *msg, const char
break;
}
+op_exit:
/* in the case of an exact match, we just used the pointer
* rather than allocating space.
*/
Index: git/pseudo_client.c
===================================================================
--- git.orig/pseudo_client.c
+++ git/pseudo_client.c
@@ -1919,6 +1919,10 @@ pseudo_client_op(pseudo_op_t op, int acc
#endif
if (result) {
pseudo_debug(PDBGF_OP, "(%d) %s", getpid(), pseudo_res_name(result->result));
+ if (result->result == RESULT_ABORT) {
+ pseudo_diag("abort()ing pseudi client by server request. See https://wiki.yoctoproject.org/wiki/Pseudo_Abort for more details on this.\n");
+ abort();
+ }
if (op == OP_STAT || op == OP_FSTAT) {
pseudo_debug(PDBGF_OP, " mode 0%o uid %d:%d",
(int) result->mode,
Index: git/enums/res.in
===================================================================
--- git.orig/enums/res.in
+++ git/enums/res.in
@@ -2,3 +2,4 @@ res: RESULT
succeed
fail
error
+abort

1
meta/recipes-devtools/pseudo/pseudo_git.bb
View File

@@ -4,6 +4,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
file://0001-configure-Prune-PIE-flags.patch \
file://delete_mismatches.patch \
file://add_ignore_paths.patch \
file://abort_on_mismatch.patch \
file://fallback-passwd \
file://fallback-group \
"