From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: Valentin Vidic <vvidic@valentin-vidic.from.hr>
Cc: Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Boris Pismenny <borisp@mellanox.com>,
Aviad Yehezkel <aviadye@mellanox.com>,
John Fastabend <john.fastabend@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] net/tls: Fix return values to avoid ENOTSUPP
Date: Thu, 5 Dec 2019 11:34:11 -0800 [thread overview]
Message-ID: <20191205113411.5e672807@cakuba.netronome.com> (raw)
In-Reply-To: <20191205064118.8299-1-vvidic@valentin-vidic.from.hr>
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;
> }
>
next prev parent reply other threads:[~2019-12-05 19:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 22:44 [PATCH] net/tls: Fix return values for setsockopt Valentin Vidic
2019-12-03 22:55 ` Jakub Kicinski
2019-12-04 18:29 ` [PATCH v2] " Valentin Vidic
2019-12-04 19:22 ` [PATCH] " Willem de Bruijn
2019-12-04 19:35 ` Jakub Kicinski
2019-12-04 20:43 ` Willem de Bruijn
2019-12-04 20:51 ` David Miller
2019-12-04 23:01 ` Jakub Kicinski
2019-12-05 0:55 ` David Miller
2019-12-05 6:41 ` [PATCH v3] net/tls: Fix return values to avoid ENOTSUPP Valentin Vidic
2019-12-05 19:34 ` Jakub Kicinski [this message]
2019-12-05 20:06 ` Willem de Bruijn
2019-12-05 20:43 ` Valentin Vidić
2019-12-05 20:45 ` Jakub Kicinski
2019-12-05 21:26 ` Willem de Bruijn
2019-12-05 23:08 ` Valentin Vidić
2019-12-07 4:17 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191205113411.5e672807@cakuba.netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=aviadye@mellanox.com \
--cc=borisp@mellanox.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vvidic@valentin-vidic.from.hr \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®