[PATCH net-next v19 14/26] ovpn: add support for MSG_NOSIGNAL in tcp_sendmsg

[Antonio Quartulli]

Userspace may want to pass the MSG_NOSIGNAL flag to
tcp_sendmsg() in order to avoid generating a SIGPIPE.

To pass this flag down the TCP stack a new skb sending API
accepting a flags argument is introduced.

Cc: Eric Dumazet <eduma...@google.com>
Cc: Paolo Abeni <pab...@redhat.com>
Signed-off-by: Antonio Quartulli <anto...@openvpn.net>
---
 drivers/net/ovpn/skb.h |  1 +
 drivers/net/ovpn/tcp.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ovpn/skb.h b/drivers/net/ovpn/skb.h
index 
6a256684d68682bd4dfab93dbff092d238192316..e4df039f959e8af945844b2bbcd9ea416e1bcec9
 100644
--- a/drivers/net/ovpn/skb.h
+++ b/drivers/net/ovpn/skb.h
@@ -25,6 +25,7 @@ struct ovpn_cb {
        struct scatterlist *sg;
        u8 *iv;
        unsigned int payload_offset;
+       bool nosignal;
 };
 
 static inline struct ovpn_cb *ovpn_skb_cb(struct sk_buff *skb)
diff --git a/drivers/net/ovpn/tcp.c b/drivers/net/ovpn/tcp.c
index 
c7eb96d79e0229d178e1cf090cea45361730685e..c4d90cfeaaf7d032270fa2c9cb78f4ca7745750f
 100644
--- a/drivers/net/ovpn/tcp.c
+++ b/drivers/net/ovpn/tcp.c
@@ -210,6 +210,7 @@ void ovpn_tcp_socket_detach(struct ovpn_socket *ovpn_sock)
 static void ovpn_tcp_send_sock(struct ovpn_peer *peer, struct sock *sk)
 {
        struct sk_buff *skb = peer->tcp.out_msg.skb;
+       int ret, flags;
 
        if (!skb)
                return;
@@ -220,9 +221,11 @@ static void ovpn_tcp_send_sock(struct ovpn_peer *peer, 
struct sock *sk)
        peer->tcp.tx_in_progress = true;
 
        do {
-               int ret = skb_send_sock_locked(sk, skb,
-                                              peer->tcp.out_msg.offset,
-                                              peer->tcp.out_msg.len);
+               flags = ovpn_skb_cb(skb)->nosignal ? MSG_NOSIGNAL : 0;
+               ret = skb_send_sock_locked_with_flags(sk, skb,
+                                                     peer->tcp.out_msg.offset,
+                                                     peer->tcp.out_msg.len,
+                                                     flags);
                if (unlikely(ret < 0)) {
                        if (ret == -EAGAIN)
                                goto out;
@@ -363,7 +366,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msghdr 
*msg, size_t size)
 
        lock_sock(sk);
 
-       if (msg->msg_flags & ~MSG_DONTWAIT) {
+       if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL)) {
                ret = -EOPNOTSUPP;
                goto peer_free;
        }
@@ -396,6 +399,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msghdr 
*msg, size_t size)
                goto peer_free;
        }
 
+       ovpn_skb_cb(skb)->nosignal = msg->msg_flags & MSG_NOSIGNAL;
        ovpn_tcp_send_sock_skb(peer, sk, skb);
        ret = size;
 peer_free:

-- 
2.45.3