netdev - Re: [PATCH] mptcp: Fix build with PROC

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: <64021ac4-2c13-09d2-5167-0b3fea2bfc4f@infradead.org>
Date:   Wed, 29 Jan 2020 09:05:51 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Cc:     mathew.j.martineau@...ux.intel.com, matthieu.baerts@...sares.net
Subject: Re: [PATCH] mptcp: Fix build with PROC_FS disabled.

On 1/29/20 1:40 AM, David Miller wrote:
> 
> net/mptcp/subflow.c: In function ‘mptcp_subflow_create_socket’:
> net/mptcp/subflow.c:624:25: error: ‘struct netns_core’ has no member named ‘sock_inuse’
> 
> Reported-by: Randy Dunlap <rdunlap@...radead.org>
> Signed-off-by: David S. Miller <davem@...emloft.net>

Acked-by: Randy Dunlap <rdunlap@...radead.org> # build-tested

Thanks.

> ---
> 
> Applied to 'net'.
> 
>  net/mptcp/subflow.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index 1662e1178949..205dca1c30b7 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -621,7 +621,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock)
>  	 */
>  	sf->sk->sk_net_refcnt = 1;
>  	get_net(net);
> +#ifdef CONFIG_PROC_FS
>  	this_cpu_add(*net->core.sock_inuse, 1);
> +#endif
>  	err = tcp_set_ulp(sf->sk, "mptcp");
>  	release_sock(sf->sk);
>  
> 


-- 
~Randy
Reported-by: Randy Dunlap <rdunlap@...radead.org>