netdev - Re: [PATCH v2] tcp: fix regression in urgent data handling

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <Pine.LNX.4.64.1209180959300.27164@lar.bfw.de>
Date:	Tue, 18 Sep 2012 10:00:39 +0200 (MSZ)
From:	Stephan Springl <springl-k@...-online.de>
To:	Eric Dumazet <eric.dumazet@...il.com>
cc:	David Miller <davem@...emloft.net>,
	netdev <netdev@...r.kernel.org>,
	Alexander Duyck <alexander.h.duyck@...el.com>
Subject: Re: [PATCH v2] tcp: fix regression in urgent data handling

Works here on top of 3.5.4, so

Tested-by: Stephan Springl <springl-k@...-online.de>

On Tue, 18 Sep 2012, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@...gle.com>
>
> Stephan Springl found that commit 1402d366019fed "tcp: introduce
> tcp_try_coalesce" introduced a regression for rlogin
>
> It turns out problem comes from TCP urgent data handling and
> a change in behavior in input path.
>
> rlogin sends two one-byte packets with URG ptr set, and when next data
> frame is coalesced, we lack sk_data_ready() calls to wakeup consumer.
>
> Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> Reported-by: Stephan Springl <springl-k@...-online.de>
> Cc: Alexander Duyck <alexander.h.duyck@...el.com>
> ---
> v2: Changed Stephan Springl email address in changelog/CC
>
> net/ipv4/tcp_input.c |    5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 6e38c6c..d377f48 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -4661,7 +4661,7 @@ queue_and_out:
>
> 		if (eaten > 0)
> 			kfree_skb_partial(skb, fragstolen);
> -		else if (!sock_flag(sk, SOCK_DEAD))
> +		if (!sock_flag(sk, SOCK_DEAD))
> 			sk->sk_data_ready(sk, 0);
> 		return;
> 	}
> @@ -5556,8 +5556,7 @@ no_ack:
> #endif
> 			if (eaten)
> 				kfree_skb_partial(skb, fragstolen);
> -			else
> -				sk->sk_data_ready(sk, 0);
> +			sk->sk_data_ready(sk, 0);
> 			return 0;
> 		}
> 	}
>
>
>


Freundliche Grüße

BFW Werner Völk GmbH
ppa. Stephan Springl
-- 
Stephan Springl                           BFW Werner Völk GmbH
Tel.:  +49 89 82917-452                   Energiemesstechnik & Service
Fax:   +49 89 82917-599                   Pasinger Str. 20 - 22
Mail:  springl@...-online.de              D-82166 Gräfelfing
Web:   http://www.novamess.de             Geschäftsführer: Georg F. Völk
                                           HRB 44779 Amtsgericht München
                                           USt.-ID: DE129301566