fix(socket-util): remove unnecessary variable and ensure NUL termination#69
Open
deepin-ci-robot wants to merge 1 commit into
Open
Conversation
…ion in getpeersec() socket-util: remove unnecessary variable (fccad706) socket-util: make sure SO_PEERSEC returned string is always NUL terminated (989740eb) Changes: - Add debian/patches/fix-socket-util-remove-variable-ensure-nul-termination.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd#30563 Generated-By: glm-5-turbo Co-Authored-By: deepin-ci-robot <packages@deepin.org>
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot TAG: 255.2-4deepin37 |
Contributor
|
Patch 1/2 — getpeersec NUL 终止 SO_PEERSEC 返回的是 LSM（如 SELinux）的安全标签字符串。getsockopt 不保证一定会在字符串末尾写入 \0，这取决于具体的 LSM 实现。加上 s[n] = 0 是防御性编程，确保字符串一定以 NUL 结尾，避免后续字符串操作越界读。 Patch 2/2 — getpeercred 删除多余变量 |
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.
Summary
Backport upstream PR systemd/systemd#30563 (two minor tweaks to socket-util.c):
ringetpeercred(), directly inline thegetsockoptcall.getsockopt(fd, SOL_SOCKET, SO_PEERSEC, ...)to be safe against LSMs that may not NUL-terminate the returned string.Changes
debian/patches/fix-socket-util-remove-variable-ensure-nul-termination.patchdebian/patches/seriesdebian/changelogUpstream
systemd/systemd#30563
Generated-By: glm-5-turbo