mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icmp: Don't set "port" on destination sockaddr for ping sockets

Browse source 
We set the port to the ICMP id on the sendto() address when using ICMP
ping sockets.  However, this has no effect: the ICMP id the kernel
uses is determined only by the "port" on the socket's *bound* address
(which is constructed inside sock_l4(), using the id we also pass to
it).

For unclear reasons this change triggers cppcheck 2.13.0 to give new
"variable could be const pointer" warnings, so make *ih const as well to
fix that.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-01-16 16:16:08 +11:00 committed by Stefano Brivio
parent 8981a720aa
commit 5dffb99892
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icmp.c
View file

@ -172,7 +172,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
.sin_addr = IN4ADDR_ANY_INIT, .sin_addr = IN4ADDR_ANY_INIT,
}; };
union icmp_epoll_ref iref; union icmp_epoll_ref iref;
struct icmphdr *ih; const struct icmphdr *ih;
int id, s; int id, s;
ih = packet_get(p, 0, 0, sizeof(*ih), &plen); ih = packet_get(p, 0, 0, sizeof(*ih), &plen);
@ -182,8 +182,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
if (ih->type != ICMP_ECHO && ih->type != ICMP_ECHOREPLY) if (ih->type != ICMP_ECHO && ih->type != ICMP_ECHOREPLY)
return 1; return 1;
sa.sin_port = ih->un.echo.id;
iref.id = id = ntohs(ih->un.echo.id); iref.id = id = ntohs(ih->un.echo.id);
if ((s = icmp_id_map[V4][id].sock) <= 0) { if ((s = icmp_id_map[V4][id].sock) <= 0) {
@ -219,7 +217,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
.sin6_scope_id = c->ifi6, .sin6_scope_id = c->ifi6,
}; };
union icmp_epoll_ref iref; union icmp_epoll_ref iref;
struct icmp6hdr *ih; const struct icmp6hdr *ih;
int id, s; int id, s;
ih = packet_get(p, 0, 0, sizeof(struct icmp6hdr), &plen); ih = packet_get(p, 0, 0, sizeof(struct icmp6hdr), &plen);
@ -229,8 +227,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
if (ih->icmp6_type != 128 && ih->icmp6_type != 129) if (ih->icmp6_type != 128 && ih->icmp6_type != 129)
return 1; return 1;
sa.sin6_port = ih->icmp6_identifier;
iref.id = id = ntohs(ih->icmp6_identifier); iref.id = id = ntohs(ih->icmp6_identifier);
if ((s = icmp_id_map[V6][id].sock) <= 0) { if ((s = icmp_id_map[V6][id].sock) <= 0) {
s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6, s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6,