2:43 p.m.
with this series we make
setscokopt(..., IPPROTO_TCP, TCP_ULP, "mptcp", sizeof("mptcp"));
return -1 and set errno to -EOPNOPSUPPORT.
this allows attaching MPTCP ULP only to a TCP socket that has been
created through sock_create_kern().
- Patch 1/2 lets subflow_init() fail with -EOPNOTSUPPORT in case users
try to setsockopt(..., TCP_ULP) on a TCP socket that has been created
by a userspace program. I suggest squashing this patch in "mptcp:
Associate MPTCP context with TCP socket".
- Patch 2/2 includes kselftest code. I suggest squashing it with "mptcp:
add basic kselftest for mptcp".*** SUBJECT HERE ***
Davide Caratti (2):
mptcp: subflow: disallow setsockopt(... TCP_ULP, "mptcp")
selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
net/mptcp/subflow.c | 7 +++
.../selftests/net/mptcp/mptcp_connect.c | 49 +++++++++++++++++--
.../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++
3 files changed, 72 insertions(+), 3 deletions(-)
--
2.21.0
2:43 p.m.
New subject: [PATCH 1/2] mptcp: subflow: disallow setsockopt(... TCP_ULP, "mptcp")
the MPTCP ULP can be attached to a TCP socket only if the socket has been
created with sock_create_kern(): ensure that the value of sk->sk_kern_sock
is 1 in the MPTCP subflow init() function, and let it return -EOPNOTSUPP
otherwise.
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/subflow.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index ebe93525b0aa..b40d927e71ca 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -435,6 +435,13 @@ static int subflow_ulp_init(struct sock *sk)
struct tcp_sock *tp = tcp_sk(sk);
int err = 0;
+ /* disallow attaching ULP to a socket unless it has been
+ * created with sock_create_kern()
+ */
+ if (!sk->sk_kern_sock) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
ctx = subflow_create_ctx(sk, sk->sk_socket, GFP_KERNEL);
if (!ctx) {
err = -ENOMEM;
--
2.21.0
3 p.m.
New subject: [PATCH 1/2] mptcp: subflow: disallow setsockopt(... TCP_ULP, "mptcp")
Hi Davide,
On 08/10/2019 16:43, Davide Caratti wrote:
the MPTCP ULP can be attached to a TCP socket only if the socket has
been
created with sock_create_kern(): ensure that the value of sk->sk_kern_sock
is 1 in the MPTCP subflow init() function, and let it return -EOPNOTSUPP
otherwise.
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/subflow.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index ebe93525b0aa..b40d927e71ca 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -435,6 +435,13 @@ static int subflow_ulp_init(struct sock *sk)
struct tcp_sock *tp = tcp_sk(sk);
int err = 0;
+ /* disallow attaching ULP to a socket unless it has been
+ * created with sock_create_kern()
+ */
+ if (!sk->sk_kern_sock) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
That's good to do that only in MPTCP code!
A very small detail if you have to do a v2: may you add a new line here
to separate your new code from the following?
If you don't need a v2 and OK with you, I can add a new line by applying
the new patch.
ctx = subflow_create_ctx(sk, sk->sk_socket, GFP_KERNEL);
if (!ctx) {
err = -ENOMEM;
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
5:09 p.m.
New subject: [PATCH 1/2] mptcp: subflow: disallow setsockopt(... TCP_ULP, "mptcp")
On Tue, 8 Oct 2019, Davide Caratti wrote:
the MPTCP ULP can be attached to a TCP socket only if the socket has
been
created with sock_create_kern(): ensure that the value of sk->sk_kern_sock
is 1 in the MPTCP subflow init() function, and let it return -EOPNOTSUPP
otherwise.
Looks good to me (with Matthieu's whitespace suggestion). Nice that this
method doesn't require ULP infrastructure changes!
Mat
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/subflow.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index ebe93525b0aa..b40d927e71ca 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -435,6 +435,13 @@ static int subflow_ulp_init(struct sock *sk)
struct tcp_sock *tp = tcp_sk(sk);
int err = 0;
+ /* disallow attaching ULP to a socket unless it has been
+ * created with sock_create_kern()
+ */
+ if (!sk->sk_kern_sock) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
ctx = subflow_create_ctx(sk, sk->sk_socket, GFP_KERNEL);
if (!ctx) {
err = -ENOMEM;
--
2.21.0
_______________________________________________
mptcp mailing list -- mptcp(a)lists.01.org
To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
2:43 p.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
add a selftest to verify that the kernel forbids attaching MPTCP subflows
to userspace TCP sockets with setsockopt(..., IPPROTO_TCP, TCP_ULP, ...).
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
.../selftests/net/mptcp/mptcp_connect.c | 49 +++++++++++++++++--
.../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c
b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index cac71f0ac8f8..12a722e0c527 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -18,7 +18,8 @@
#include <netdb.h>
#include <netinet/in.h>
-#include <netinet/tcp.h>
+
+#include <linux/tcp.h>
extern int optind;
@@ -32,11 +33,12 @@ static int poll_timeout;
static const char *cfg_host;
static const char *cfg_port = "12000";
static int cfg_sock_proto = IPPROTO_MPTCP;
+static bool tcpulp_audit;
static void die_usage(void)
{
- fprintf(stderr, "Usage: mptcp_connect [-s MPTCP|TCP] [-p port] "
+ fprintf(stderr, "Usage: mptcp_connect [-u] [-s MPTCP|TCP] [-p port] "
"[ -l ] [ -t timeout ] connect_address\n");
exit(1);
}
@@ -114,6 +116,41 @@ static int sock_listen_mptcp(const char * const listenaddr,
return sock;
}
+static bool sock_test_tcpulp(const char * const remoteaddr,
+ const char * const port)
+{
+
+ struct addrinfo hints = {
+ .ai_protocol = IPPROTO_TCP,
+ .ai_socktype = SOCK_STREAM,
+ };
+ struct addrinfo *a, *addr;
+ int sock = -1, ret = 0;
+ bool test_pass = false;
+
+ hints.ai_family = AF_INET;
+
+ xgetaddrinfo(remoteaddr, port, &hints, &addr);
+ for (a = addr; a; a = a->ai_next) {
+ sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
+ if (sock < 0) {
+ perror("socket");
+ continue;
+ }
+
+ ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
+ sizeof("mptcp"));
+ close(sock);
+ if (ret == -1) {
+ test_pass = true;
+ break;
+ }
+
+ perror("setsockopt(TCP_ULP)");
+ }
+ return test_pass;
+}
+
static int sock_connect_mptcp(const char * const remoteaddr,
const char * const port, int proto)
{
@@ -362,7 +399,7 @@ static void parse_opts(int argc, char **argv)
{
int c;
- while ((c = getopt(argc, argv, "lp:s:ht:")) != -1) {
+ while ((c = getopt(argc, argv, "lp:s:hut:")) != -1) {
switch (c) {
case 'l':
listen_mode = true;
@@ -376,6 +413,9 @@ static void parse_opts(int argc, char **argv)
case 'h':
die_usage();
break;
+ case 'u':
+ tcpulp_audit = true;
+ break;
case 't':
poll_timeout = atoi(optarg) * 1000;
if (poll_timeout <= 0)
@@ -395,6 +435,9 @@ int main(int argc, char *argv[])
parse_opts(argc, argv);
+ if (tcpulp_audit)
+ return sock_test_tcpulp(cfg_host, cfg_port) ? 0 : 1;
+
if (listen_mode) {
int fd = sock_listen_mptcp(cfg_host, cfg_port);
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 7d312bd9ac77..25f1a181c73e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -134,6 +134,23 @@ check_mptcp_disabled()
return 0
}
+check_mptcp_ulp_setsockopt()
+{
+ local t="ns_ulp" retval=
+
+ ip netns add ${t} || exit $ksft_skip
+ if ! ip netns exec ${t} ./mptcp_connect -u -p 10000 -s TCP 127.0.0.1 >/dev/null
2>&1; then
+ printf "setsockopt(..., TCP_ULP, \"mptcp\", ...) allowed\t[ FAIL
]\n"
+ retval=1
+ ret=$retval
+ else
+ printf "setsockopt(..., TCP_ULP, \"mptcp\", ...) blocked\t[ OK
]\n"
+ retval=0
+ fi
+ ip netns del ${t}
+ return $retval
+}
+
do_ping()
{
listener_ns="$1"
@@ -271,6 +288,8 @@ make_file "$sin" "server"
check_mptcp_disabled
+check_mptcp_ulp_setsockopt
+
for sender in 1 2 3 4;do
do_ping ns1 ns$sender 10.0.1.1
--
2.21.0
3 p.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
Hi Davide,
On 08/10/2019 16:43, Davide Caratti wrote:
add a selftest to verify that the kernel forbids attaching MPTCP
subflows
to userspace TCP sockets with setsockopt(..., IPPROTO_TCP, TCP_ULP, ...).
Good idea to have a test for that!
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
.../selftests/net/mptcp/mptcp_connect.c | 49 +++++++++++++++++--
.../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c
b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index cac71f0ac8f8..12a722e0c527 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
[...]
@@ -114,6 +116,41 @@ static int sock_listen_mptcp(const char * const
listenaddr,
return sock;
}
+static bool sock_test_tcpulp(const char * const remoteaddr,
+ const char * const port)
+{
+
+ struct addrinfo hints = {
+ .ai_protocol = IPPROTO_TCP,
+ .ai_socktype = SOCK_STREAM,
+ };
+ struct addrinfo *a, *addr;
+ int sock = -1, ret = 0;
+ bool test_pass = false;
+
+ hints.ai_family = AF_INET;
+
+ xgetaddrinfo(remoteaddr, port, &hints, &addr);
+ for (a = addr; a; a = a->ai_next) {
+ sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
+ if (sock < 0) {
+ perror("socket");
Why could we have an error here? It is just to avoid error message in
the output for something we don't consider as an error.
+ continue;
+ }
+
+ ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
+ sizeof("mptcp"));
+ close(sock);
+ if (ret == -1) {
Should we check errno as well? Just to be sure we are not "blocked" for
another reason.
+ test_pass = true;
+ break;
+ }
+
+ perror("setsockopt(TCP_ULP)");
+ }
+ return test_pass;
+}
+
static int sock_connect_mptcp(const char * const remoteaddr,
const char * const port, int proto)
{
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
8:21 p.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
On Tue, 2019-10-08 at 17:00 +0200, Matthieu Baerts wrote:
Hi Davide,
On 08/10/2019 16:43, Davide Caratti wrote:
> add a selftest to verify that the kernel forbids attaching MPTCP subflows
> to userspace TCP sockets with setsockopt(..., IPPROTO_TCP, TCP_ULP, ...).
Good idea to have a test for that!
> Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
> ---
> .../selftests/net/mptcp/mptcp_connect.c | 49 +++++++++++++++++--
> .../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++
> 2 files changed, 65 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c
b/tools/testing/selftests/net/mptcp/mptcp_connect.c
> index cac71f0ac8f8..12a722e0c527 100644
> --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
> +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
[...]
> @@ -114,6 +116,41 @@ static int sock_listen_mptcp(const char * const listenaddr,
> return sock;
> }
>
> +static bool sock_test_tcpulp(const char * const remoteaddr,
> + const char * const port)
> +{
> +
> + struct addrinfo hints = {
> + .ai_protocol = IPPROTO_TCP,
> + .ai_socktype = SOCK_STREAM,
> + };
> + struct addrinfo *a, *addr;
> + int sock = -1, ret = 0;
> + bool test_pass = false;
> +
> + hints.ai_family = AF_INET;
> +
> + xgetaddrinfo(remoteaddr, port, &hints, &addr);
> + for (a = addr; a; a = a->ai_next) {
> + sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
> + if (sock < 0) {
> + perror("socket");
Why could we have an error here? It is just to avoid error message in
the output for something we don't consider as an error.
It can fail e.g. due to memory pressure, or ulimits. Should never
happen in normal circumstances, but I think it's better to catch this
up, as this patch does.
> + continue;
> + }
> +
> + ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
> + sizeof("mptcp"));
> + close(sock);
> + if (ret == -1) {
Should we check errno as well? Just to be sure we are not "blocked" for
another reason.
I agree additionally checking errno == -EOPNOTSUPP would be better.
Otherwise LGTM.
In the longer run we may consider moving this test and ev. diag, MIB,
etc to a separate, functional-test binary/script, but I think this is
good for now.
Cheers,
Paolo
7:52 a.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
Hi Paolo,
On 08/10/2019 22:21, Paolo Abeni wrote:
On Tue, 2019-10-08 at 17:00 +0200, Matthieu Baerts wrote:
> Hi Davide,
>
> On 08/10/2019 16:43, Davide Caratti wrote:
>> add a selftest to verify that the kernel forbids attaching MPTCP subflows
>> to userspace TCP sockets with setsockopt(..., IPPROTO_TCP, TCP_ULP, ...).
>
> Good idea to have a test for that!
>
>> Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
>> ---
>> .../selftests/net/mptcp/mptcp_connect.c | 49 +++++++++++++++++--
>> .../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++
>> 2 files changed, 65 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c
b/tools/testing/selftests/net/mptcp/mptcp_connect.c
>> index cac71f0ac8f8..12a722e0c527 100644
>> --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
>> +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
>
> [...]
>
>> @@ -114,6 +116,41 @@ static int sock_listen_mptcp(const char * const listenaddr,
>> return sock;
>> }
>>
>> +static bool sock_test_tcpulp(const char * const remoteaddr,
>> + const char * const port)
>> +{
>> +
>> + struct addrinfo hints = {
>> + .ai_protocol = IPPROTO_TCP,
>> + .ai_socktype = SOCK_STREAM,
>> + };
>> + struct addrinfo *a, *addr;
>> + int sock = -1, ret = 0;
>> + bool test_pass = false;
>> +
>> + hints.ai_family = AF_INET;
>> +
>> + xgetaddrinfo(remoteaddr, port, &hints, &addr);
>> + for (a = addr; a; a = a->ai_next) {
>> + sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
>> + if (sock < 0) {
>> + perror("socket");
>
> Why could we have an error here? It is just to avoid error message in
> the output for something we don't consider as an error.
It can fail e.g. due to memory pressure, or ulimits. Should never
happen in normal circumstances, but I think it's better to catch this
up, as this patch does.
Sorry, I should have added my comment at the next line. My question was
also: should we not "break" here in case of error?
But if should never fail, I guess we can still go to the next address.
As long as we don't have "useless" error messages each time we execute
the tests, I am then fine with both "break" and "continue" here.
>> + continue;
>> + }
>> +
>> + ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
>> + sizeof("mptcp"));
>> + close(sock);
>> + if (ret == -1) {
>
> Should we check errno as well? Just to be sure we are not "blocked" for
> another reason.
I agree additionally checking errno == -EOPNOTSUPP would be better.
Otherwise LGTM.
In the longer run we may consider moving this test and ev. diag, MIB,
etc to a separate, functional-test binary/script, but I think this is
good for now.
Good idea, I was thinking about the same thing yesterday. I can have a
look at this in the future if needed.
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
4:07 p.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
On Wed, 2019-10-09 at 09:52 +0200, Matthieu Baerts wrote:
Hi Paolo,
On 08/10/2019 22:21, Paolo Abeni wrote:
> On Tue, 2019-10-08 at 17:00 +0200, Matthieu Baerts wrote:
> > Hi Davide,
> >
> > On 08/10/2019 16:43, Davide Caratti wrote:
> > > add a selftest to verify that the kernel forbids attaching MPTCP subflows
> > > to userspace TCP sockets with setsockopt(..., IPPROTO_TCP, TCP_ULP, ...).
[...]
> > > + xgetaddrinfo(remoteaddr, port, &hints,
&addr);
> > > + for (a = addr; a; a = a->ai_next) {
> > > + sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
> > > + if (sock < 0) {
> > > + perror("socket");
> >
> > Why could we have an error here? It is just to avoid error message in
> > the output for something we don't consider as an error.
>
> It can fail e.g. due to memory pressure, or ulimits. Should never
> happen in normal circumstances, but I think it's better to catch this
> up, as this patch does.
Sorry, I should have added my comment at the next line. My question was
also: should we not "break" here in case of error?
But if should never fail, I guess we can still go to the next address.
As long as we don't have "useless" error messages each time we execute
the tests, I am then fine with both "break" and "continue" here.
speaking of this, I see that I redirected the standard error of the test
to /dev/null. This makes both "perror()" useless. Unless you object,
I will remove redirections from the shellscript.
> > > + continue;
> > > + }
> > > +
> > > + ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
> > > + sizeof("mptcp"));
> > > + close(sock);
> > > + if (ret == -1) {
> >
> > Should we check errno as well? Just to be sure we are not "blocked"
for
> > another reason.
>
> I agree additionally checking errno == -EOPNOTSUPP would be better.
sure, will do that in v2.
--
davide
5:58 p.m.
New subject: [PATCH 2/2] selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
Hi Davide,
On 09/10/2019 18:07, Davide Caratti wrote:
On Wed, 2019-10-09 at 09:52 +0200, Matthieu Baerts wrote:
> On 08/10/2019 22:21, Paolo Abeni wrote:
>> On Tue, 2019-10-08 at 17:00 +0200, Matthieu Baerts wrote:
>>> On 08/10/2019 16:43, Davide Caratti wrote:
[...]
>>>> + xgetaddrinfo(remoteaddr, port, &hints,
&addr);
>>>> + for (a = addr; a; a = a->ai_next) {
>>>> + sock = socket(a->ai_family, a->ai_socktype, IPPROTO_TCP);
>>>> + if (sock < 0) {
>>>> + perror("socket");
>>>
>>> Why could we have an error here? It is just to avoid error message in
>>> the output for something we don't consider as an error.
>>
>> It can fail e.g. due to memory pressure, or ulimits. Should never
>> happen in normal circumstances, but I think it's better to catch this
>> up, as this patch does.
>
> Sorry, I should have added my comment at the next line. My question was
> also: should we not "break" here in case of error?
> But if should never fail, I guess we can still go to the next address.
> As long as we don't have "useless" error messages each time we execute
> the tests, I am then fine with both "break" and "continue" here.
speaking of this, I see that I redirected the standard error of the test
to /dev/null. This makes both "perror()" useless. Unless you object,
I will remove redirections from the shellscript.
Good catch and good idea!
>>>> + continue;
>>>> + }
>>>> +
>>>> + ret = setsockopt(sock, IPPROTO_TCP, TCP_ULP, "mptcp",
>>>> + sizeof("mptcp"));
>>>> + close(sock);
>>>> + if (ret == -1) {
>>>
>>> Should we check errno as well? Just to be sure we are not "blocked"
for
>>> another reason.
>>
>> I agree additionally checking errno == -EOPNOTSUPP would be better.
sure, will do that in v2.
Thank you!
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
2:59 p.m.
Hi Davide,
On 08/10/2019 16:43, Davide Caratti wrote:
with this series we make
setscokopt(..., IPPROTO_TCP, TCP_ULP, "mptcp", sizeof("mptcp"));
return -1 and set errno to -EOPNOPSUPPORT.
this allows attaching MPTCP ULP only to a TCP socket that has been
created through sock_create_kern().
- Patch 1/2 lets subflow_init() fail with -EOPNOTSUPPORT in case users
try to setsockopt(..., TCP_ULP) on a TCP socket that has been created
by a userspace program. I suggest squashing this patch in "mptcp:
Associate MPTCP context with TCP socket".
- Patch 2/2 includes kselftest code. I suggest squashing it with "mptcp:
add basic kselftest for mptcp".*** SUBJECT HERE ***
Davide Caratti (2):
mptcp: subflow: disallow setsockopt(... TCP_ULP, "mptcp")
selftests: test setsockopt(..., TCP_ULP, "mptcp", ...)
Thank you for these two patches!
I just have a few questions, see my answers in my two other emails,
nothing blocking!
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
1042
days inactive
1043
days old
10 comments
4 participants
participants (4)
-
Davide Caratti -
Mat Martineau -
Matthieu Baerts -
Paolo Abeni