diff options
| author | Soheil Hassas Yeganeh <soheil@google.com> | 2016-04-02 23:08:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-04 15:50:30 -0400 |
| commit | ad1e46a837163a3e7160a1250825bcfafd2e714b (patch) | |
| tree | f02d47ab7df711de7a6794fe54eae6768eb7b30f /net/ipv6/ip6_flowlabel.c | |
| parent | 24025c465f77c3585f73450bab19501b2edd6fba (diff) | |
| download | linux-stable-ad1e46a837163a3e7160a1250825bcfafd2e714b.tar.gz linux-stable-ad1e46a837163a3e7160a1250825bcfafd2e714b.tar.bz2 linux-stable-ad1e46a837163a3e7160a1250825bcfafd2e714b.zip | |
ipv6: process socket-level control messages in IPv6
Process socket-level control messages by invoking
__sock_cmsg_send in ip6_datagram_send_ctl for control messages on
the SOL_SOCKET layer.
This makes sure whenever ip6_datagram_send_ctl is called for
udp and raw, we also process socket-level control messages.
This is a bit uglier than IPv4, since IPv6 does not have
something like ipcm_cookie. Perhaps we can later create
a control message cookie for IPv6?
Note that this commit interprets new control messages that
were ignored before. As such, this commit does not change
the behavior of IPv6 control messages.
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index dc2db4f7b182..35d3ddc328f8 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -372,6 +372,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, if (olen > 0) { struct msghdr msg; struct flowi6 flowi6; + struct sockcm_cookie sockc_junk; int junk; err = -ENOMEM; @@ -390,7 +391,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, memset(&flowi6, 0, sizeof(flowi6)); err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt, - &junk, &junk, &junk); + &junk, &junk, &junk, &sockc_junk); if (err) goto done; err = -EINVAL; |