Bump version to v0.2.7-beta - #96
Merged
Merged
Conversation
labbati
approved these changes
Nov 1, 2018
Contributor
Author
|
@labbati Grazie mille! Also fixed the title 😅 |
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
added a commit
that referenced
this pull request
Sep 5, 2023
Illustrating the issue: // calling begin adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_begin add x8, x8, #0x6b0 blr x8 // start of function execution // reading string arg from execute_data constants mov x8, #0xe400 // #58368 movk x8, #0xac44, lsl #16 movk x8, #0xaaaa, lsl #32 // storing to CV[1] str x8, [x27, #96] mov w8, #0x6 // #6 // storing type of CV[1] str w8, [x27, #104] // nothing happens, my test function is empty :-) // calling end with 2 args adrp x1, 0xaaaaacad4000 add x1, x1, #0x740 mov x0, x27 adrp x8, 0xaaaaacad4000 add x8, x8, #0x7b0 str x8, [x27] adrp x8, 0xaaaaab361000 <zend_observer_fcall_install+496> // zend_observer_fcall_end add x8, x8, #0x844 blr x8 As one can see, with the tracing JIT, it just forcibly overrides the second arg, inlining the called function. (Which is also why we leaked our custom $context array in the LogsIntegration). The JIT has no exit points here. Hence, we have no choice but to forcefully disallow inlining the hooked methods where overrideArguments is used. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
pushed a commit
that referenced
this pull request
Sep 15, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.