Skip to content

[action] [PR:17764] [systemd-sonic-generator] Fix handling service files with additional fields under [Install] section (#17764)#18341

Merged
mssonicbld merged 1 commit intosonic-net:202311from
mssonicbld:cherry/202311/17764
Mar 15, 2024
Merged

[action] [PR:17764] [systemd-sonic-generator] Fix handling service files with additional fields under [Install] section (#17764)#18341
mssonicbld merged 1 commit intosonic-net:202311from
mssonicbld:cherry/202311/17764

Conversation

@mssonicbld
Copy link
Collaborator

If encountered a line without RequiredBy or WantedBy the code passes uninitialized pointer to get_install_targets_from_line(). Where it can fail with segfault or silently pass randomly.

  • Why I did it
    Uninitialized target_suffix is passed to get_install_targets_from_line() when other fields are present in [Install] section, like this:

root@sonic:/home/admin# systemctl cat ntpsec
...
[Install]
Alias=ntp.service
Alias=ntpd.service
WantedBy=multi-user.target

  • How I did it
    Initialize target_suffix with NULL, put an assert in get_install_targets_from_line(). Edited test to cover this scenario.

  • How to verify it
    UT and on the switch.

Signed-off-by: Stepan Blyschak stepanb@nvidia.com

…fields under [Install] section (sonic-net#17764)

If encountered a line without RequiredBy or WantedBy the code passes uninitialized pointer to get_install_targets_from_line(). Where it can fail with segfault or silently pass randomly.

- Why I did it
Uninitialized target_suffix is passed to get_install_targets_from_line() when other fields are present in [Install] section, like this:

root@sonic:/home/admin# systemctl cat ntpsec
...
[Install]
Alias=ntp.service
Alias=ntpd.service
WantedBy=multi-user.target

- How I did it
Initialize target_suffix with NULL, put an assert in get_install_targets_from_line(). Edited test to cover this scenario.

- How to verify it
UT and on the switch.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@mssonicbld
Copy link
Collaborator Author

Original PR: #17764

@mssonicbld
Copy link
Collaborator Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator Author

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit 31d52aa into sonic-net:202311 Mar 15, 2024
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.

2 participants