mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: mptcp@lists.linux.dev, Paolo Abeni <pabeni@redhat.com>,
	 Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [PATCH mptcp-next] mptcp: fix 'masking a bool' warning
Date: Fri, 25 Jun 2021 08:43:42 -0700 (PDT)	[thread overview]
Message-ID: <dfc2322-22bb-9380-4c7a-9ff1b66b8431@linux.intel.com> (raw)
In-Reply-To: <20210625115329.858684-1-matthieu.baerts@tessares.net>


On Fri, 25 Jun 2021, Matthieu Baerts wrote:

> 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 have a 'bool' type but we should keep the 'u8' to allow
            ^^^^^^
         "should not" ??

> 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>

Thanks for catching this Dan!

I'll send to netdev today. Meanwhile, for the mptcp tree:

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> net/mptcp/protocol.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index ddce5b7bbefd..199a36fe4f69 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) &&
> -- 
> 2.31.1
>
>
>

--
Mat Martineau
Intel

  reply	other threads:[~2021-06-25 15:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25 11:53 Matthieu Baerts
2021-06-25 15:43 ` Mat Martineau [this message]
2021-06-25 15:57   ` Matthieu Baerts

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dfc2322-22bb-9380-4c7a-9ff1b66b8431@linux.intel.com \
    --to=mathew.j.martineau@linux.intel.com \
    --cc=dan.carpenter@oracle.com \
    --cc=matthieu.baerts@tessares.net \
    --cc=mptcp@lists.linux.dev \
    --cc=pabeni@redhat.com \
    --subject='Re: [PATCH mptcp-next] mptcp: fix '\''masking a bool'\'' warning' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).