netdev - RE: [PATCH bpf-next 1/3] bpf, sk_msg: Let ULP restore sk_proto and write

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]

Date:   Tue, 18 Feb 2020 22:09:29 -0800
From:   John Fastabend <john.fastabend@...il.com>
To:     Jakub Sitnicki <jakub@...udflare.com>, bpf@...r.kernel.org
Cc:     netdev@...r.kernel.org, kernel-team@...udflare.com,
        Daniel Borkmann <daniel@...earbox.net>,
        John Fastabend <john.fastabend@...il.com>
Subject: RE: [PATCH bpf-next 1/3] bpf, sk_msg: Let ULP restore sk_proto and
 write_space callback

Jakub Sitnicki wrote:
> We don't need a fallback for when the socket is not using ULP.
> tcp_update_ulp handles this case exactly the same as we do in
> sk_psock_restore_proto. Get rid of the duplicated code.
> 
> Signed-off-by: Jakub Sitnicki <jakub@...udflare.com>
> ---
>  include/linux/skmsg.h | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
> index 14d61bba0b79..8605947d6c08 100644
> --- a/include/linux/skmsg.h
> +++ b/include/linux/skmsg.h
> @@ -361,16 +361,7 @@ static inline void sk_psock_restore_proto(struct sock *sk,
>  	sk->sk_prot->unhash = psock->saved_unhash;
>  
>  	if (psock->sk_proto) {
> -		struct inet_connection_sock *icsk = inet_csk(sk);
> -		bool has_ulp = !!icsk->icsk_ulp_data;
> -
> -		if (has_ulp) {
> -			tcp_update_ulp(sk, psock->sk_proto,
> -				       psock->saved_write_space);
> -		} else {
> -			sk->sk_prot = psock->sk_proto;
> -			sk->sk_write_space = psock->saved_write_space;
> -		}
> +		tcp_update_ulp(sk, psock->sk_proto, psock->saved_write_space);
>  		psock->sk_proto = NULL;
>  	} else {
>  		sk->sk_write_space = psock->saved_write_space;
> -- 
> 2.24.1
> 

Acked-by: John Fastabend <john.fastabend@...il.com>