Fix panic when running ICMPv4 probe with DontFragment #686
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
|
this is running this change with capabilities set: and this is running this code without capabilities set: the case that fails (last line) is the one that requires privileges, so the failure is expected. |
|
@dgl could you please take a look? |
|
Thanks for finding, and fixing this. This looks like the right fix to me, @dgl do you have any comments before I merge? |
dgl
reviewed
Aug 28, 2020
prober/icmp.go
Outdated
| rc, err := ipv4.NewRawConn(icmpConn) | ||
| if err != nil { | ||
| level.Error(logger).Log("msg", "Error creating raw connection", "err", err) | ||
| return | ||
| } | ||
| socket = &v4Conn{c: rc, df: true} | ||
| } else { | ||
| var icmpConn *icmp.PacketConn | ||
| // If the user has set the don't fragment option we cannot use unprivileged |
There was a problem hiding this comment.
Move comment to the other branch of the if, probably update it to say something like "Need to use RawConn rather than ICMP socket in order to set IP header level options."
|
LGTM, aside from my comment about the comment. |
A recent change modified the way an IPv4 raw socket is created and BBE is panicing when ICMPv4 is used with DontFragment set. golang.org/x/net doesn't seem to have a way to create the necessary socket, so fall back to the previous method for that case in particular (ICMP, IPv4, DontFragment=true). Fixes prometheus#685 Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
|
Thanks! |
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.
A recent change modified the way an IPv4 raw socket is created and BBE
is panicing when ICMPv4 is used with DontFragment set.
golang.org/x/net doesn't seem to have a way to create the necessary
socket, so fall back to the previous method for that case in particular
(ICMP, IPv4, DontFragment=true).
Fixes #685
Signed-off-by: Marcelo E. Magallon marcelo.magallon@grafana.com