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.

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

Fix discriminator handling in chip-tool pairing commands. #34115

Conversation

bzbarsky-apple
Copy link
Contributor

Not all commands initialize the discriminator value, and the ones that don't should not use it.

Fixes #34096

Not all commands initialize the discriminator value, and the ones that don't should not use it.

Fixes project-chip#34096
Copy link

github-actions bot commented Jun 27, 2024

PR #34115: Size comparison from 6a72fd1 to 27723d5

Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 6a72fd1 27723d5 change % change
bl602 lighting-app bl602 FLASH 1270644 1270644 0 0.0
RAM 95328 95328 0 0.0
bl602+mfd FLASH 1284902 1284902 0 0.0
RAM 95472 95472 0 0.0
bl602+rpc FLASH 1309860 1309860 0 0.0
RAM 103752 103752 0 0.0
bl702 lighting-app bl702 FLASH 1091790 1091790 0 0.0
RAM 15161 15161 0 0.0
bl702+mfd FLASH 1102484 1102484 0 0.0
RAM 15313 15313 0 0.0
bl702+rpc FLASH 1181600 1181600 0 0.0
RAM 24181 24181 0 0.0
bl706-eth FLASH 874884 874884 0 0.0
RAM 27272 27272 0 0.0
bl706-wifi FLASH 1127216 1127216 0 0.0
RAM 14605 14605 0 0.0
bl702l lighting-app bl702l FLASH 1078676 1078676 0 0.0
RAM 21732 21732 0 0.0
bl702l+mfd FLASH 1089938 1089938 0 0.0
RAM 21892 21892 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 798296 798296 0 0.0
RAM 103096 103096 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 814052 814052 0 0.0
RAM 113568 113568 0 0.0
lock-mtd LP_EM_CC1354P10_6 FLASH 803568 803568 0 0.0
RAM 107696 107696 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 756360 756360 0 0.0
RAM 101788 101788 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 742040 742040 0 0.0
RAM 102036 102036 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 605842 605842 0 0.0
RAM 204508 204508 0 0.0
lock CC3235SF_LAUNCHXL FLASH 650870 650870 0 0.0
RAM 204780 204780 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 666065 666065 0 0.0
RAM 75100 75100 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 685909 685909 0 0.0
RAM 77732 77732 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 685909 685909 0 0.0
RAM 77732 77732 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 642845 642845 0 0.0
RAM 70168 70168 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 608609 608609 0 0.0
RAM 70804 70804 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 628245 628245 0 0.0
RAM 73356 73356 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 628245 628245 0 0.0
RAM 73356 73356 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 624113 624113 0 0.0
RAM 73820 73820 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 643837 643837 0 0.0
RAM 76372 76372 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 643837 643837 0 0.0
RAM 76372 76372 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 592677 592677 0 0.0
RAM 67788 67788 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 612529 612529 0 0.0
RAM 70420 70420 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 612529 612529 0 0.0
RAM 70420 70420 0 0.0
efr32 lighting-app BRD4187C FLASH 923220 923220 0 0.0
RAM 134996 134996 0 0.0
lock-app BRD4338a FLASH 762164 762156 -8 -0.0
RAM 174552 174552 0 0.0
window-app BRD4187C FLASH 1012040 1012040 0 0.0
RAM 129616 129616 0 0.0
esp32 all-clusters-app c3devkit DRAM 88332 88332 0 0.0
FLASH 1468744 1468744 0 0.0
IRAM 75570 75570 0 0.0
m5stack DRAM 114796 114796 0 0.0
FLASH 1537959 1537959 0 0.0
IRAM 125403 125403 0 0.0
linux air-purifier-app debug unknown 4592 4592 0 0.0
FLASH 2529216 2529216 0 0.0
RAM 125112 125112 0 0.0
all-clusters-app debug unknown 5368 5368 0 0.0
FLASH 5581246 5581246 0 0.0
RAM 487384 487384 0 0.0
all-clusters-minimal-app debug unknown 5288 5288 0 0.0
FLASH 5051432 5051432 0 0.0
RAM 232936 232936 0 0.0
bridge-app debug unknown 5256 5256 0 0.0
FLASH 4477464 4477464 0 0.0
RAM 212832 212832 0 0.0
chip-tool debug unknown 5728 5728 0 0.0
FLASH 11687735 11688023 288 0.0
RAM 542018 542018 0 0.0
chip-tool-ipv6only arm64 unknown 19992 19992 0 0.0
FLASH 10806460 10806732 272 0.0
RAM 590928 590928 0 0.0
fabric-admin debug unknown 5592 5592 0 0.0
FLASH 10653303 10653303 0 0.0
RAM 535658 535658 0 0.0
fabric-bridge-app debug unknown 5264 5264 0 0.0
FLASH 4348008 4348008 0 0.0
RAM 204960 204960 0 0.0
lighting-app debug+rpc+ui unknown 5936 5936 0 0.0
FLASH 5373058 5373058 0 0.0
RAM 221640 221640 0 0.0
lock-app debug unknown 5192 5192 0 0.0
FLASH 4541016 4541016 0 0.0
RAM 200248 200248 0 0.0
ota-provider-app debug unknown 4576 4576 0 0.0
FLASH 4196904 4196904 0 0.0
RAM 194544 194544 0 0.0
ota-requestor-app debug unknown 4512 4512 0 0.0
FLASH 4322264 4322264 0 0.0
RAM 199168 199168 0 0.0
shell debug unknown 4112 4112 0 0.0
FLASH 2794525 2794525 0 0.0
RAM 150480 150480 0 0.0
thermostat-no-ble arm64 unknown 9184 9184 0 0.0
FLASH 4167580 4167580 0 0.0
RAM 235864 235864 0 0.0
tv-app debug unknown 5472 5472 0 0.0
FLASH 5602984 5602984 0 0.0
RAM 341800 341800 0 0.0
tv-casting-app debug unknown 5096 5096 0 0.0
FLASH 9859646 9859646 0 0.0
RAM 400024 400024 0 0.0
mbed lock-app-release cy8cproto_062_4343w FLASH 1502116 1502116 0 0.0
RAM 226656 226656 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 881088 881088 0 0.0
RAM 139693 139693 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 951688 951688 0 0.0
RAM 138121 138121 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 826644 826644 0 0.0
RAM 138591 138591 0 0.0
nxp contact k32w0+release FLASH 575868 575868 0 0.0
RAM 70024 70024 0 0.0
k32w1+release FLASH 591032 591032 0 0.0
RAM 74056 74056 0 0.0
light k32w0+release FLASH 609960 609960 0 0.0
RAM 69500 69500 0 0.0
k32w1+release FLASH 674536 674536 0 0.0
RAM 82816 82816 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1613436 1613436 0 0.0
RAM 207148 207148 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1534204 1534204 0 0.0
RAM 204052 204052 0 0.0
light cy8ckit_062s2_43012 FLASH 1461076 1461076 0 0.0
RAM 197332 197332 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462932 1462932 0 0.0
RAM 224396 224396 0 0.0
qpg lighting-app qpg6105+debug FLASH 650876 650876 0 0.0
RAM 104564 104564 0 0.0
lock-app qpg6105+debug FLASH 611000 611000 0 0.0
RAM 99240 99240 0 0.0
stm32 light STM32WB5MM-DK FLASH 472272 472272 0 0.0
RAM 141652 141652 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 632372 632372 0 0.0
RAM 50528 50528 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 657052 657052 0 0.0
RAM 145872 145872 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 777346 777346 0 0.0
RAM 110684 110684 0 0.0
bridge-app tlsr9258a FLASH 675364 675364 0 0.0
RAM 95304 95304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 633956 633956 0 0.0
RAM 50572 50572 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 719758 719758 0 0.0
RAM 77148 77148 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 612186 612186 0 0.0
RAM 142104 142104 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 799966 799966 0 0.0
RAM 100508 100508 0 0.0
lock-app-dfu tlsr9528a FLASH 665528 665528 0 0.0
RAM 69860 69860 0 0.0
ota-requestor-app tlsr9258a FLASH 694694 694694 0 0.0
RAM 95028 95028 0 0.0
pump-app tlsr9518adk80d FLASH 616228 616228 0 0.0
RAM 56952 56952 0 0.0
pump-controller-app tlsr9518adk80d FLASH 606612 606612 0 0.0
RAM 56752 56752 0 0.0
shell tlsr9518adk80d FLASH 466192 466192 0 0.0
RAM 72484 72484 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 640316 640316 0 0.0
RAM 52200 52200 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 650438 650438 0 0.0
RAM 60388 60388 0 0.0
thermostat tlsr9518adk80d FLASH 625502 625502 0 0.0
RAM 57084 57084 0 0.0
window-covering tlsr9118bdk40d FLASH 518734 518734 0 0.0
RAM 97800 97800 0 0.0
tizen all-clusters-app arm unknown 1584 1584 0 0.0
FLASH 1633324 1633324 0 0.0
RAM 46012 46012 0 0.0
chip-tool-ubsan arm unknown 2384 2384 0 0.0
FLASH 16109182 16110190 1008 0.0
RAM 7079352 7079696 344 0.0

@mergify mergify bot merged commit 03ae36e into project-chip:master Jun 27, 2024
68 checks passed
@bzbarsky-apple bzbarsky-apple deleted the fix-chip-tool-discriminator-handling branch June 27, 2024 18:54
austina-csa pushed a commit to austina-csa/connectedhomeip that referenced this pull request Jul 10, 2024
…ip#34115)

Not all commands initialize the discriminator value, and the ones that don't should not use it.

Fixes project-chip#34096
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] uninitialized PairingCommand::mDiscriminator leads "chip-tool pairing onnetwork" to die
3 participants