summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorXiang Yang <xiangyang3@huawei.com>2023-08-03 10:24:38 +0300
committerJakub Kicinski <kuba@kernel.org>2023-08-05 01:22:13 +0300
commit17ebf8a4c38b5481c29623f5e003fdf7583947f9 (patch)
treeb0f539d4f974d45ca0a2995d04f556929abb2061 /net
parent1733d0be68ab1b89358a3b0471ef425fd61de7c5 (diff)
downloadlinux-17ebf8a4c38b5481c29623f5e003fdf7583947f9.tar.xz
mptcp: fix the incorrect judgment for msk->cb_flags
Coccicheck reports the error below: net/mptcp/protocol.c:3330:15-28: ERROR: test of a variable/field address Since the address of msk->cb_flags is used in __test_and_clear_bit, the address should not be NULL. The judgment for if (unlikely(msk->cb_flags)) will always be true, we should check the real value of msk->cb_flags here. Fixes: 65a569b03ca8 ("mptcp: optimize release_cb for the common case") Signed-off-by: Xiang Yang <xiangyang3@huawei.com> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Link: https://lore.kernel.org/r/20230803072438.1847500-1-xiangyang3@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/mptcp/protocol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 3317d1cca156..be5f6f4b94c7 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3328,7 +3328,7 @@ static void mptcp_release_cb(struct sock *sk)
if (__test_and_clear_bit(MPTCP_CLEAN_UNA, &msk->cb_flags))
__mptcp_clean_una_wakeup(sk);
- if (unlikely(&msk->cb_flags)) {
+ if (unlikely(msk->cb_flags)) {
/* be sure to set the current sk state before tacking actions
* depending on sk_state, that is processing MPTCP_ERROR_REPORT
*/