| Message ID | 20210625212522.264000-1-mathew.j.martineau@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next] mptcp: fix 'masking a bool' warning | expand |
On Fri, 2021-06-25 at 14:25 -0700, Mat Martineau wrote: > From: Matthieu Baerts <matthieu.baerts@tessares.net> > > Dan Carpenter reported an issue introduced in > commit fde56eea01f9 ("mptcp: refine mptcp_cleanup_rbuf") where a new > boolean (ack_pending) is masked with 0x9. > > This is not the intention to ignore values by using a boolean. This > variable should not have a 'bool' type: we should keep the 'u8' to allow > this comparison. > > Fixes: fde56eea01f9 ("mptcp: refine mptcp_cleanup_rbuf") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Acked-by: Paolo Abeni <pabeni@redhat.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Fri, 25 Jun 2021 14:25:22 -0700 you wrote: > From: Matthieu Baerts <matthieu.baerts@tessares.net> > > Dan Carpenter reported an issue introduced in > commit fde56eea01f9 ("mptcp: refine mptcp_cleanup_rbuf") where a new > boolean (ack_pending) is masked with 0x9. > > This is not the intention to ignore values by using a boolean. This > variable should not have a 'bool' type: we should keep the 'u8' to allow > this comparison. > > [...] Here is the summary with links: - [net-next] mptcp: fix 'masking a bool' warning https://git.kernel.org/netdev/net-next/c/c4512c63b119 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ce0c45dfb79e..7bb82424e551 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -455,7 +455,7 @@ static void mptcp_subflow_cleanup_rbuf(struct sock *ssk) static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_empty) { const struct inet_connection_sock *icsk = inet_csk(ssk); - bool ack_pending = READ_ONCE(icsk->icsk_ack.pending); + u8 ack_pending = READ_ONCE(icsk->icsk_ack.pending); const struct tcp_sock *tp = tcp_sk(ssk); return (ack_pending & ICSK_ACK_SCHED) &&