net/tls: Fix return values to avoid ENOTSUPP

ENOTSUPP is not available in userspace, for example:

  setsockopt failed, 524, Unknown error 524

Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 0683788bbef07adec1e60b0e5545e904edfa9dcf..cd91ad8122915f007e046729e7d1dec7dbb0d322 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -429,7 +429,7 @@ static int tls_push_data(struct sock *sk,
 
        if (flags &
            ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SENDPAGE_NOTLAST))
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
 
        if (unlikely(sk->sk_err))
                return -sk->sk_err;
@@ -571,7 +571,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page,
        lock_sock(sk);
 
        if (flags & MSG_OOB) {
-               rc = -ENOTSUPP;
+               rc = -EOPNOTSUPP;
                goto out;
        }
 
@@ -1023,7 +1023,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
        }
 
        if (!(netdev->features & NETIF_F_HW_TLS_TX)) {
-               rc = -ENOTSUPP;
+               rc = -EOPNOTSUPP;
                goto release_netdev;
        }
 
@@ -1098,7 +1098,7 @@ int tls_set_device_offload_rx(struct sock *sk, struct tls_context *ctx)
        }
 
        if (!(netdev->features & NETIF_F_HW_TLS_RX)) {
-               rc = -ENOTSUPP;
+               rc = -EOPNOTSUPP;
                goto release_netdev;
        }
 

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index b3da6c5ab999b844b50fb98fc9c7f39173b89b2d..dac24c7aa7d4bb45b3188dae3fb1f6030cd3c299 100644 (file)
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -487,7 +487,7 @@ static int do_tls_setsockopt_conf(struct sock *sk, char __user *optval,
        /* check version */
        if (crypto_info->version != TLS_1_2_VERSION &&
            crypto_info->version != TLS_1_3_VERSION) {
-               rc = -ENOTSUPP;
+               rc = -EINVAL;
                goto err_crypto_info;
        }
 
@@ -714,7 +714,7 @@ static int tls_init(struct sock *sk)
         * share the ulp context.
         */
        if (sk->sk_state != TCP_ESTABLISHED)
-               return -ENOTSUPP;
+               return -ENOTCONN;
 
        /* allocate tls context */
        write_lock_bh(&sk->sk_callback_lock);

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 2b2d0bae14a911ccbac63777a22ea8f9ad40f9c3..c6803a82b769b15a117fc444ad98861a25c16f28 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -905,7 +905,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
        int ret = 0;
 
        if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL))
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
 
        mutex_lock(&tls_ctx->tx_lock);
        lock_sock(sk);
@@ -1220,7 +1220,7 @@ int tls_sw_sendpage_locked(struct sock *sk, struct page *page,
        if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
                      MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY |
                      MSG_NO_SHARED_FRAGS))
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
 
        return tls_sw_do_sendpage(sk, page, offset, size, flags);
 }
@@ -1233,7 +1233,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
 
        if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
                      MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY))
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
 
        mutex_lock(&tls_ctx->tx_lock);
        lock_sock(sk);
@@ -1932,7 +1932,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff_t *ppos,
 
                /* splice does not support reading control messages */
                if (ctx->control != TLS_RECORD_TYPE_DATA) {
-                       err = -ENOTSUPP;
+                       err = -EINVAL;
                        goto splice_read_end;
                }
 

diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 46abcae47dee317494960fd7a45c4beb40b28e98..13e5ef615026f5d87b885a6b4da39299906ec994 100644 (file)
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -25,10 +25,6 @@
 #define TLS_PAYLOAD_MAX_LEN 16384
 #define SOL_TLS 282
 
-#ifndef ENOTSUPP
-#define ENOTSUPP 524
-#endif
-
 FIXTURE(tls_basic)
 {
        int fd, cfd;
@@ -1205,11 +1201,11 @@ TEST(non_established) {
        /* TLS ULP not supported */
        if (errno == ENOENT)
                return;
-       EXPECT_EQ(errno, ENOTSUPP);
+       EXPECT_EQ(errno, ENOTCONN);
 
        ret = setsockopt(sfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
        EXPECT_EQ(ret, -1);
-       EXPECT_EQ(errno, ENOTSUPP);
+       EXPECT_EQ(errno, ENOTCONN);
 
        ret = getsockname(sfd, &addr, &len);
        ASSERT_EQ(ret, 0);