lkml.org 
[lkml]   [2019]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3] net/tls: Fix return values to avoid ENOTSUPP
On Thu,  5 Dec 2019 07:41:18 +0100, Valentin Vidic wrote:
> ENOTSUPP is not available in userspace, for example:
>
> setsockopt failed, 524, Unknown error 524
>
> Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr>

> diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
> index 0683788bbef0..cd91ad812291 100644
> --- 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;

Perhaps the flag checks should return EINVAL? Willem any opinions?

> 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 bdca31ffe6da..5830b8e02a36 100644
> --- a/net/tls/tls_main.c
> +++ b/net/tls/tls_main.c
> @@ -496,7 +496,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;

This one I think Willem asked to be EOPNOTSUPP OTOH.

> goto err_crypto_info;
> }
>
> @@ -723,7 +723,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 da9f9ce51e7b..2969dc30e4e0 100644
> --- a/net/tls/tls_sw.c
> +++ b/net/tls/tls_sw.c
> @@ -900,7 +900,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);
> @@ -1215,7 +1215,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);
> }
> @@ -1228,7 +1228,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;

Same suggestion for flags checks in tls_sw.c

>
> mutex_lock(&tls_ctx->tx_lock);
> lock_sock(sk);
> @@ -1927,7 +1927,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;
> }
>

\
 
 \ /
  Last update: 2019-12-05 20:34    [W:0.059 / U:4.908 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site