| From c4512c63b1193c73b3f09c598a6d0a7f88da1dd8 Mon Sep 17 00:00:00 2001 |
| From: Matthieu Baerts <matthieu.baerts@tessares.net> |
| Date: Fri, 25 Jun 2021 14:25:22 -0700 |
| Subject: mptcp: fix 'masking a bool' warning |
| |
| From: Matthieu Baerts <matthieu.baerts@tessares.net> |
| |
| commit c4512c63b1193c73b3f09c598a6d0a7f88da1dd8 upstream. |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/mptcp/protocol.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/mptcp/protocol.c |
| +++ b/net/mptcp/protocol.c |
| @@ -446,7 +446,7 @@ static void mptcp_subflow_cleanup_rbuf(s |
| 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) && |
