* [PATCH net V2] net: ping6: Fix ping -6 with interface name
@ 2022-05-29 11:50 Tariq Toukan
2022-05-30 15:00 ` David Ahern
0 siblings, 1 reply; 2+ messages in thread
From: Tariq Toukan @ 2022-05-29 11:50 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Eric Dumazet, David Ahern
Cc: netdev, Aya Levin, Gal Pressman, Saeed Mahameed, Tariq Toukan
From: Aya Levin <ayal@nvidia.com>
When passing interface parameter to ping -6:
$ ping -6 ::11:141:84:9 -I eth2
Results in:
PING ::11:141:84:10(::11:141:84:10) from ::11:141:84:9 eth2: 56 data bytes
ping: sendmsg: Invalid argument
ping: sendmsg: Invalid argument
Initialize the fl6's outgoing interface (OIF) before triggering
ip6_datagram_send_ctl. Don't wipe fl6 after ip6_datagram_send_ctl() as
changes in fl6 that may happen in the function are overwritten explicitly.
Update comment accordingly.
Fixes: 13651224c00b ("net: ping6: support setting basic SOL_IPV6 options via cmsg")
Signed-off-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
net/ipv6/ping.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
V2:
Per David Ahern's comment, moved memset before if (msg->msg_controllen),
and updated the code comment accordingly.
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index ff033d16549e..2a5f3337d488 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -101,24 +101,25 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
ipc6.sockc.tsflags = sk->sk_tsflags;
ipc6.sockc.mark = sk->sk_mark;
+ memset(&fl6, 0, sizeof(fl6));
+
if (msg->msg_controllen) {
struct ipv6_txoptions opt = {};
opt.tot_len = sizeof(opt);
ipc6.opt = &opt;
+ fl6.flowi6_oif = oif;
err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, &ipc6);
if (err < 0)
return err;
/* Changes to txoptions and flow info are not implemented, yet.
- * Drop the options, fl6 is wiped below.
+ * Drop the options.
*/
ipc6.opt = NULL;
}
- memset(&fl6, 0, sizeof(fl6));
-
fl6.flowi6_proto = IPPROTO_ICMPV6;
fl6.saddr = np->saddr;
fl6.daddr = *daddr;
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net V2] net: ping6: Fix ping -6 with interface name
2022-05-29 11:50 [PATCH net V2] net: ping6: Fix ping -6 with interface name Tariq Toukan
@ 2022-05-30 15:00 ` David Ahern
0 siblings, 0 replies; 2+ messages in thread
From: David Ahern @ 2022-05-30 15:00 UTC (permalink / raw)
To: Tariq Toukan, David S. Miller, Jakub Kicinski, Eric Dumazet
Cc: netdev, Aya Levin, Gal Pressman, Saeed Mahameed
On 5/29/22 5:50 AM, Tariq Toukan wrote:
> From: Aya Levin <ayal@nvidia.com>
>
> When passing interface parameter to ping -6:
> $ ping -6 ::11:141:84:9 -I eth2
> Results in:
> PING ::11:141:84:10(::11:141:84:10) from ::11:141:84:9 eth2: 56 data bytes
> ping: sendmsg: Invalid argument
> ping: sendmsg: Invalid argument
>
> Initialize the fl6's outgoing interface (OIF) before triggering
> ip6_datagram_send_ctl. Don't wipe fl6 after ip6_datagram_send_ctl() as
> changes in fl6 that may happen in the function are overwritten explicitly.
> Update comment accordingly.
>
> Fixes: 13651224c00b ("net: ping6: support setting basic SOL_IPV6 options via cmsg")
> Signed-off-by: Aya Levin <ayal@nvidia.com>
> Reviewed-by: Gal Pressman <gal@nvidia.com>
> Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
> Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
> ---
> net/ipv6/ping.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> V2:
> Per David Ahern's comment, moved memset before if (msg->msg_controllen),
> and updated the code comment accordingly.
>
> diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
> index ff033d16549e..2a5f3337d488 100644
> --- a/net/ipv6/ping.c
> +++ b/net/ipv6/ping.c
> @@ -101,24 +101,25 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
> ipc6.sockc.tsflags = sk->sk_tsflags;
> ipc6.sockc.mark = sk->sk_mark;
>
> + memset(&fl6, 0, sizeof(fl6));
> +
> if (msg->msg_controllen) {
> struct ipv6_txoptions opt = {};
>
> opt.tot_len = sizeof(opt);
> ipc6.opt = &opt;
> + fl6.flowi6_oif = oif;
This should be moved up to after the memset since it is currently done
after "fl6.daddr = *daddr;" below (remove that one). That's how it is
done in rawv6_sendmsg and udpv6_sendmsg.
>
> err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, &ipc6);
> if (err < 0)
> return err;
>
> /* Changes to txoptions and flow info are not implemented, yet.
> - * Drop the options, fl6 is wiped below.
> + * Drop the options.
> */
> ipc6.opt = NULL;
> }
>
> - memset(&fl6, 0, sizeof(fl6));
> -
> fl6.flowi6_proto = IPPROTO_ICMPV6;
> fl6.saddr = np->saddr;
> fl6.daddr = *daddr;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-30 15:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-29 11:50 [PATCH net V2] net: ping6: Fix ping -6 with interface name Tariq Toukan
2022-05-30 15:00 ` David Ahern
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.