bugtool: fix IP route debug gathering commands #18059
Merged
Conversation
This file contains 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
Commit 8bcc4e5 ("bugtool: avoid allocation on conversion of execCommand result to string") broke the `ip route show` commands because the change from `[]byte` to `string` causes the `%v` formatting verb to emit the raw byte slice, not the string. Fix this by using the `%s` formatting verb to make sure the argument gets interpreted as a string. Also fix another instance in `writeCmdToFile` where `fmt.Fprint` is now invoked with a byte slice. Grepping for `%v` in bugtool sources and manually inspecting all changes from commit 8bcc4e5 showed no other instances where a byte slice could potentially end up being formatted in a wrong way. Fixes: 8bcc4e5 ("bugtool: avoid allocation on conversion of execCommand result to string") Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
added
release-note/bug
|
Marked for backport to 1.9, 1.10 and 1.11 because #17546 introducing the regression was backported as well. |
2 tasks
borkmann
approved these changes
Nov 30, 2021
twpayne
approved these changes
Nov 30, 2021
borkmann
added
the
ready-to-merge
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.10
in 1.10.6
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.9
in 1.9.12
nathanjsweet
added
backport-done/1.11
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport done to v1.11
in 1.11.0
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport done to v1.11
in 1.11.0
maintainer-s-little-helper
bot
moved this from Backport pending to v1.9
to Backport done to v1.9
in 1.9.12
maintainer-s-little-helper
bot
moved this from Backport pending to v1.10
to Backport done to v1.10
in 1.10.6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Commit 8bcc4e5 ("bugtool: avoid allocation on conversion of
execCommand result to string") broke the
ip route showcommandsbecause the change from
[]bytetostringcauses the%vformattingverb to emit the raw byte slice, not the string. Fix this by using the
%sformatting verb to make sure the argument gets interpreted as astring.
Also fix another instance in
writeCmdToFilewherefmt.Fprintis nowinvoked with a byte slice.
Grepping for
%vin bugtool sources and manually inspecting all changesfrom commit 8bcc4e5 showed no other instances where a byte slice
could potentially end up being formatted in a wrong way.
Fixes: 8bcc4e5 ("bugtool: avoid allocation on conversion of execCommand result to string")
Fixes: #17546
Closes: #17896