mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
mptcp: Avoid unsequenced accesses to jiffies in mptcp_reset_tout_timer()
After a recent improvement in clang to warn on unsequenced accesses to
volatile variables [1], an instance appears in mptcp_reset_tout_timer(),
which can break the build with CONFIG_WERROR=y / W=e:
net/mptcp/protocol.c:3044:20: error: unsequenced accesses to volatile qualified 'jiffies' [-Werror,-Wunsequenced]
3044 | tcp_jiffies32 + jiffies + mptcp_close_timeout(sk);
| ~~~~~~~~~~~~~ ^
Per C11 5.1.2.3.2, accessing a volatile object is a side effect. Per C11
6.5.2, unsequenced side effects on the same scalar object are undefined
behavior. Per C11 6.5.3, unless otherwise specified, side effects and
value computations of subexpressions are unsequenced within expressions.
Add an explicit sequence point by splitting the addition expression in
half, eliminating the undefined behavior and clearing up the warning.
Cc: [email protected]
Fixes: 76a13b3157 ("mptcp: invoke MP_FAIL response when needed")
Closes: https://github.com/ClangBuiltLinux/linux/issues/2193
Link: https://github.com/llvm/llvm-project/commit/955715460eaf9188c241c74750637fc82dfcc423 [1]
Signed-off-by: Nathan Chancellor <[email protected]>
Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
This commit is contained in:
committed by
Jakub Kicinski
parent
c5e5ac57b5
commit
728a2abd15
@@ -3041,7 +3041,8 @@ void mptcp_reset_tout_timer(struct mptcp_sock *msk, unsigned long fail_tout)
|
||||
return;
|
||||
|
||||
close_timeout = (unsigned long)inet_csk(sk)->icsk_mtup.probe_timestamp -
|
||||
tcp_jiffies32 + jiffies + mptcp_close_timeout(sk);
|
||||
tcp_jiffies32;
|
||||
close_timeout += jiffies + mptcp_close_timeout(sk);
|
||||
|
||||
/* the close timeout takes precedence on the fail one, and here at least one of
|
||||
* them is active
|
||||
|
||||
Reference in New Issue
Block a user