Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[ota] Fix exchange context leak in OTA requestor (#20304)" #20563

Merged
merged 1 commit into from
Jul 11, 2022
Merged

Revert "[ota] Fix exchange context leak in OTA requestor (#20304)" #20563

merged 1 commit into from
Jul 11, 2022

Conversation

Damian-Nordic
Copy link
Contributor

Problem

The fix for exchange leak causes crashes.

Change overview

This reverts commit 757682e.

Testing

N/A

@boring-cyborg boring-cyborg bot added the app label Jul 11, 2022
@isiu-apple isiu-apple added the ota label Jul 11, 2022
@isiu-apple
Copy link
Contributor

isiu-apple commented Jul 11, 2022 •
edited
Loading

Steps for reproducing the crash due to commit 757682e:

out/apps/ota-provider/chip-ota-provider-app -f ~/Downloads/test2.ota --passcode 20202021 --discriminator 3840 --KVS /tmp/chip_kvs_provider

out/apps/chip-tool/chip-tool pairing onnetwork 0xABCD 20202021

out/apps/ota-requestor/chip-ota-requestor-app --discriminator 30 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor

out/apps/chip-tool/chip-tool pairing onnetwork-long 0x1234567890 20202021 30

out/apps/chip-tool/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 0xABCD 0

out/apps/chip-tool/chip-tool otasoftwareupdaterequestor announce-ota-provider 0x00000000ABCD 0 0 0 0x0000001234567890 0

Crash log:
EC crash OTA-R log.txt

@Damian-Nordic Damian-Nordic mentioned this pull request Jul 11, 2022
Closed
@github-actions
Copy link

github-actions bot commented Jul 11, 2022 •
edited
Loading

PR #20563: Size comparison from 0cda316 to 47b7aef

Increases (3 builds for cc13x2_26x2, cyw30739, esp32)
platform target config section 0cda316 47b7aef change % change
cc13x2_26x2 shell LP_CC2652R7 (read/write) 187984 187992 8 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579614 579622 8 0.0
.app_xip_area 458368 458376 8 0.0
esp32 all-clusters-app c3devkit (read only) 1020098 1020100 2 0.0
.flash.text 1020098 1020100 2 0.0
Decreases (11 builds for cc13x2_26x2, cyw30739, efr32, linux, nrfconnect, telink)
platform target config section 0cda316 47b7aef change % change
cc13x2_26x2 shell LP_CC2652R7 (read only) 658742 658734 -8 -0.0
.text 573508 573500 -8 -0.0
cyw30739 lock cyw930739m2evb_01 (read/write) 585550 585542 -8 -0.0
.app_xip_area 459576 459568 -8 -0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582790 582774 -16 -0.0
.app_xip_area 462392 462376 -16 -0.0
efr32 lighting-app BRD4161A (read/write) 1081452 1081436 -16 -0.0
.text 946388 946372 -16 -0.0
BRD4161A+rpc (read/write) 1135780 1135764 -16 -0.0
.text 983824 983808 -16 -0.0
BRD4161A+rs911x (read/write) 947940 947924 -16 -0.0
.text 805104 805088 -16 -0.0
linux ota-requestor-app debug (read only) 2439425 2439361 -64 -0.0
.text 2060978 2060914 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 811452 811448 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 text 800896 800892 -4 -0.0
telink light-switch-app tlsr9518adk80d text 565670 565668 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 817100 817092 -8 -0.0
text 581994 581992 -2 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 0cda316 47b7aef change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 666243 666243 0 0.0
(read/write) 184980 184980 0 0.0
.bss 74116 74116 0 0.0
.data 3356 3356 0 0.0
.rodata 88139 88139 0 0.0
.text 577788 577788 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 632051 632051 0 0.0
(read/write) 157684 157684 0 0.0
.bss 73412 73412 0 0.0
.data 3356 3356 0 0.0
.rodata 77379 77379 0 0.0
.text 554348 554348 0 0.0
lock-ftd LP_CC2652R7 (read only) 669151 669151 0 0.0
(read/write) 172216 172216 0 0.0
.bss 71148 71148 0 0.0
.data 3280 3280 0 0.0
.rodata 76279 76279 0 0.0
.text 592392 592392 0 0.0
lock-mtd LP_CC2652R7 (read only) 618559 618559 0 0.0
(read/write) 144264 144264 0 0.0
.bss 66868 66868 0 0.0
.data 3280 3280 0 0.0
.rodata 76159 76159 0 0.0
.text 541912 541912 0 0.0
pump-app LP_CC2652R7 (read only) 678183 678183 0 0.0
(read/write) 164032 164032 0 0.0
.bss 71228 71228 0 0.0
.data 3280 3280 0 0.0
.rodata 88503 88503 0 0.0
.text 589196 589196 0 0.0
pump-controller-app LP_CC2652R7 (read only) 664007 664007 0 0.0
(read/write) 178328 178328 0 0.0
.bss 71348 71348 0 0.0
.data 3276 3276 0 0.0
.rodata 84367 84367 0 0.0
.text 579160 579160 0 0.0
shell LP_CC2652R7 (read only) 658742 658734 -8 -0.0
(read/write) 187984 187992 8 0.0
.bss 76420 76420 0 0.0
.data 3360 3360 0 0.0
.rodata 84918 84918 0 0.0
.text 573508 573500 -8 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579614 579622 8 0.0
.app_xip_area 458368 458376 8 0.0
.bss 64184 64184 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 585550 585542 -8 -0.0
.app_xip_area 459576 459568 -8 -0.0
.bss 68912 68912 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582790 582774 -16 -0.0
.app_xip_area 462392 462376 -16 -0.0
.bss 63392 63392 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1081452 1081436 -16 -0.0
.bss 132996 132996 0 0.0
.data 2048 2048 0 0.0
.text 946388 946372 -16 -0.0
BRD4161A+rpc (read/write) 1135780 1135764 -16 -0.0
.bss 149676 149676 0 0.0
.data 2260 2260 0 0.0
.text 983824 983808 -16 -0.0
BRD4161A+rs911x (read/write) 947940 947924 -16 -0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 805104 805088 -16 -0.0
lock-app BRD4161A+wf200 (read/write) 1128816 1128816 0 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 982548 982548 0 0.0
window-app BRD4161A (read/write) 1075244 1075244 0 0.0
.bss 134468 134468 0 0.0
.data 2076 2076 0 0.0
.text 938676 938676 0 0.0
esp32 all-clusters-app c3devkit (read only) 1020098 1020100 2 0.0
(read/write) 1485642 1485642 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215528 215528 0 0.0
.flash.text 1020098 1020100 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1073987 1073987 0 0.0
(read/write) 487712 487712 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 245972 245972 0 0.0
.flash.text 1068603 1068603 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658832 658832 0 0.0
.bss 69516 69516 0 0.0
.data 1992 1992 0 0.0
.text 581524 581524 0 0.0
lock k32w061+release (read/write) 685652 685652 0 0.0
.bss 69980 69980 0 0.0
.data 2004 2004 0 0.0
.text 607868 607868 0 0.0
linux all-clusters-app debug (read only) 2960705 2960705 0 0.0
(read/write) 154744 154744 0 0.0
.bss 61536 61536 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84968 84968 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 263613 263613 0 0.0
.text 2519906 2519906 0 0.0
all-clusters-minimal-app debug (read only) 2813281 2813281 0 0.0
(read/write) 146680 146680 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 265341 265341 0 0.0
.text 2372930 2372930 0 0.0
bridge-app debug+rpc (read only) 2315449 2315449 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198016 198016 0 0.0
.text 1955698 1955698 0 0.0
chip-tool debug (read only) 10345025 10345025 0 0.0
(read/write) 622240 622240 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 587888 587888 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 515861 515861 0 0.0
.text 8397476 8397476 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10031716 10031716 0 0.0
(read/write) 684529 684529 0 0.0
.bss 42609 42609 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 623432 623432 0 0.0
.dynamic 528 528 0 0.0
.got 13520 13520 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 478260 478260 0 0.0
.text 7992788 7992788 0 0.0
lighting-app debug+rpc (read only) 2551193 2551193 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 213704 213704 0 0.0
.text 2167522 2167522 0 0.0
lock-app debug (read only) 2515793 2515793 0 0.0
(read/write) 124504 124504 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 228744 228744 0 0.0
.text 2121906 2121906 0 0.0
ota-provider-app debug (read only) 2322305 2322305 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203512 203512 0 0.0
.text 1956018 1956018 0 0.0
ota-requestor-app debug (read only) 2439425 2439361 -64 -0.0
(read/write) 125216 125216 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67288 67288 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207296 207296 0 0.0
.text 2060978 2060914 -64 -0.0
shell debug (read only) 2551049 2551049 0 0.0
(read/write) 141096 141096 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 227762 227762 0 0.0
.text 2166210 2166210 0 0.0
thermostat-no-ble arm64 (read only) 2595316 2595316 0 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165476 165476 0 0.0
.text 2190064 2190064 0 0.0
tv-app debug (read only) 3102225 3102225 0 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249024 249024 0 0.0
.text 2665298 2665298 0 0.0
tv-casting-app debug (read only) 5577785 5577785 0 0.0
(read/write) 161968 161968 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 103048 103048 0 0.0
.dynamic 608 608 0 0.0
.got 4744 4744 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 343209 343209 0 0.0
.text 4956626 4956626 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448112 2448112 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1410756 1410756 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1175119 1175119 0 0.0
bss 142900 142900 0 0.0
rodata 141880 141880 0 0.0
text 811452 811448 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1155315 1155315 0 0.0
bss 142136 142136 0 0.0
rodata 133412 133412 0 0.0
text 800896 800892 -4 -0.0
p6 all-clusters-app default (read/write) 2565392 2565392 0 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1523656 1523656 0 0.0
all-clusters-minimal-app default (read/write) 2510440 2510440 0 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1468704 1468704 0 0.0
light-app default (read/write) 2440736 2440736 0 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1399000 1399000 0 0.0
lock-app default (read/write) 2467992 2467992 0 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1426256 1426256 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 797268 797268 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565670 565668 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 817100 817092 -8 -0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 581994 581992 -2 -0.0

@andy31415 andy31415 merged commit bd132ee into project-chip:master Jul 11, 2022
@bzbarsky-apple bzbarsky-apple mentioned this pull request Jul 12, 2022
Merged
@Damian-Nordic Damian-Nordic deleted the ota-crash-fix-2 branch July 13, 2022 09:17
ArekBalysNordic pushed a commit to ArekBalysNordic/connectedhomeip that referenced this pull request Jul 13, 2022
@Damian-Nordic @ArekBalysNordic
Revert "[ota] Fix exchange context leak in OTA requestor (project-chi…
be79104 
…p#20304)" (project-chip#20563)

This reverts commit 757682e.
andy31415 pushed a commit that referenced this pull request Jul 13, 2022
@ArekBalysNordic @Damian-Nordic
Revert "[ota] Fix exchange context leak in OTA requestor (#20304)" (#…
eb2fb5b 
…20563) (#20675)

This reverts commit 757682e.

Co-authored-by: Damian Królik <[email protected]>
ajwak pushed a commit to ajwak/connectedhomeip that referenced this pull request Jul 13, 2022
@Damian-Nordic @ajwak
Revert "[ota] Fix exchange context leak in OTA requestor (project-chi…
9ed476b 
…p#20304)" (project-chip#20563)

This reverts commit 757682e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isiu-apple isiu-apple isiu-apple approved these changes

@mrjerryjohns mrjerryjohns mrjerryjohns approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
app ota review - approved sve
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Damian-Nordic @isiu-apple @mrjerryjohns @andy31415