netdev - Re: [PATCH] mptcp: Fix unsigned 'max_seq' compared with zero in mptcp_data_queue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <5f5aa2608856865a8b3e4dfd4195e2de31ba9762.camel@redhat.com>
Date:   Wed, 16 Sep 2020 10:25:42 +0200
From:   Paolo Abeni <pabeni@...hat.com>
To:     Ye Bin <yebin10@...wei.com>, mathew.j.martineau@...ux.intel.com,
        matthieu.baerts@...sares.net, netdev@...r.kernel.org,
        mptcp@...ts.01.org
Cc:     Hulk Robot <hulkci@...wei.com>
Subject: Re: [PATCH] mptcp: Fix unsigned 'max_seq' compared with zero in
 mptcp_data_queue_ofo

Hi,

On Wed, 2020-09-16 at 11:30 +0800, Ye Bin wrote:
> Fixes make coccicheck warnig:
> net/mptcp/protocol.c:164:11-18: WARNING: Unsigned expression compared with zero: max_seq > 0
> 
> Reported-by: Hulk Robot <hulkci@...wei.com>
> Signed-off-by: Ye Bin <yebin10@...wei.com>
> ---
>  net/mptcp/protocol.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index ef0dd2f23482..3b71f6202524 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -155,13 +155,14 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb)
>  {
>  	struct sock *sk = (struct sock *)msk;
>  	struct rb_node **p, *parent;
> +	int space;
>  	u64 seq, end_seq, max_seq;
>  	struct sk_buff *skb1;
>  
>  	seq = MPTCP_SKB_CB(skb)->map_seq;
>  	end_seq = MPTCP_SKB_CB(skb)->end_seq;
> -	max_seq = tcp_space(sk);
> -	max_seq = max_seq > 0 ? max_seq + msk->ack_seq : msk->ack_seq;
> +	space = tcp_space(sk);
> +	max_seq = space > 0 ? space + msk->ack_seq : msk->ack_seq;
>  
>  	pr_debug("msk=%p seq=%llx limit=%llx empty=%d", msk, seq, max_seq,
>  		 RB_EMPTY_ROOT(&msk->out_of_order_queue));

The patch looks correct, but could you please add an appropriate
'Fixes' tag, and also preserve the reverse x-mas tree order for
variables declaration?

Also, this patch should likely target the net-next tree, the MPTCP OoO
queue is present only there.

Thanks!

Paolo