diff mbox series

[net] sock: fix error in sock_setsockopt()

Message ID 20210702144101.3815601-1-eric.dumazet@gmail.com (mailing list archive)
State Accepted
Commit 81b4a0cc7565b08cadd0d02bae3434f127d1d72a
Delegated to: Netdev Maintainers
Headers show
Series [net] sock: fix error in sock_setsockopt() | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net
netdev/subject_prefix success Link
netdev/cc_maintainers warning 4 maintainers not CCed: yangbo.lu@nxp.com aahringo@redhat.com linmiaohe@huawei.com xiangxia.m.yue@gmail.com
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 5 this patch: 5
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch warning WARNING: Non-standard signature: Bisected-by:
netdev/build_allmodconfig_warn success Errors and warnings before: 5 this patch: 5
netdev/header_inline success Link

Commit Message

Eric Dumazet July 2, 2021, 2:41 p.m. UTC 
From: Eric Dumazet <edumazet@google.com>

Some tests are failing, John bisected the issue to a recent commit.

sock_set_timestamp() parameters should be :

1) sk
2) optname
3) valbool

Fixes: 371087aa476a ("sock: expose so_timestamp options for mptcp")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Bisected-by: John Sperbeck <jsperbeck@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 net/core/sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Florian Westphal July 2, 2021, 2:50 p.m. UTC | #1 
Eric Dumazet <eric.dumazet@gmail.com> wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> Some tests are failing, John bisected the issue to a recent commit.
> 
> sock_set_timestamp() parameters should be :
> 
> 1) sk
> 2) optname
> 3) valbool

Oh, right!

Thanks for fixing this.

Reviewed-by: Florian Westphal <fw@strlen.de>
patchwork-bot+netdevbpf@kernel.org July 2, 2021, 8:40 p.m. UTC | #2 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Fri,  2 Jul 2021 07:41:01 -0700 you wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> Some tests are failing, John bisected the issue to a recent commit.
> 
> sock_set_timestamp() parameters should be :
> 
> 1) sk
> 2) optname
> 3) valbool
> 
> [...]

Here is the summary with links:
  - [net] sock: fix error in sock_setsockopt()
    https://git.kernel.org/netdev/net/c/81b4a0cc7565

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/net/core/sock.c b/net/core/sock.c
index cad1071122043183217387cd99f4bb5c2bbc051d..1c4b0468bc2c301cecde6e8e0ceaab1631232cb7 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1116,7 +1116,7 @@  int sock_setsockopt(struct socket *sock, int level, int optname,
 	case SO_TIMESTAMP_NEW:
 	case SO_TIMESTAMPNS_OLD:
 	case SO_TIMESTAMPNS_NEW:
-		sock_set_timestamp(sk, valbool, optname);
+		sock_set_timestamp(sk, optname, valbool);
 		break;
 
 	case SO_TIMESTAMPING_NEW: