diff options
| author | Matthieu Baerts <matthieu.baerts@tessares.net> | 2023-07-04 22:44:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-23 13:49:46 +0200 |
| commit | c118baa05fb9a9f6acd806bb45e0c9c0e41aaf16 (patch) | |
| tree | ceca33eaa02b2b93aa5490e8e1405f2e4f4449a4 | |
| parent | 671486793f729fa8d79f5bd1f6224a2af00c2d63 (diff) | |
| download | linux-c118baa05fb9a9f6acd806bb45e0c9c0e41aaf16.tar.gz linux-c118baa05fb9a9f6acd806bb45e0c9c0e41aaf16.tar.bz2 linux-c118baa05fb9a9f6acd806bb45e0c9c0e41aaf16.zip | |
selftests: mptcp: sockopt: return error if wrong mark
commit 9ac4c28eb70cd5ea5472a5e1c495dcdd597d4597 upstream.
When an error was detected when checking the marks, a message was
correctly printed mentioning the error but followed by another one
saying everything was OK and the selftest was not marked as failed as
expected.
Now the 'ret' variable is directly set to 1 in order to make sure the
exit is done with an error, similar to what is done in other functions.
While at it, the error is correctly propagated to the caller.
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: dc65fe82fb07 ("selftests: mptcp: add packet mark test case")
Cc: stable@vger.kernel.org
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh index a493eaf8633f..af4fccd4f5cc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -121,6 +121,7 @@ check_mark() for v in $values; do if [ $v -ne 0 ]; then echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected packets marked" 1>&2 + ret=1 return 1 fi done @@ -220,11 +221,11 @@ do_transfer() fi if [ $local_addr = "::" ];then - check_mark $listener_ns 6 - check_mark $connector_ns 6 + check_mark $listener_ns 6 || retc=1 + check_mark $connector_ns 6 || retc=1 else - check_mark $listener_ns 4 - check_mark $connector_ns 4 + check_mark $listener_ns 4 || retc=1 + check_mark $connector_ns 4 || retc=1 fi check_transfer $cin $sout "file received by server" |