net/tls: Fix return values to avoid ENOTSUPP (4a5cdc60) · Commits · 戴 / test

net/tls/tls_device.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -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);