linux-kernel - Re: linux-next: Tree for Apr 23 (netlink)

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: <5176EEA8.1010507@infradead.org>
Date:	Tue, 23 Apr 2013 13:27:20 -0700
From:	Randy Dunlap <rdunlap@...radead.org>
To:	David Miller <davem@...emloft.net>
CC:	sfr@...b.auug.org.au, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: linux-next: Tree for Apr 23 (netlink)

On 04/23/13 12:19, David Miller wrote:
> From: Randy Dunlap <rdunlap@...radead.org>
> Date: Tue, 23 Apr 2013 11:04:18 -0700
> 
>> On 04/23/13 01:00, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20130422:
>>>
>>> The net-next tree lost its build failure but gained another for which I
>>> applied a patch.
>>>
>>
>>
>> when CONFIG_NETLINK_MMAP is not enabled:
>>
>> net/netlink/diag.c: In function 'sk_diag_put_rings_cfg':
>> net/netlink/diag.c:28:17: error: 'struct netlink_sock' has no member named 'pg_vec_lock'
>> net/netlink/diag.c:29:29: error: 'struct netlink_sock' has no member named 'rx_ring'
>> net/netlink/diag.c:31:30: error: 'struct netlink_sock' has no member named 'tx_ring'
>> net/netlink/diag.c:33:19: error: 'struct netlink_sock' has no member named 'pg_vec_lock'
> 
> Thanks Randy, I'm testing out the following fix:
> 

Works for me.  Thanks.

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


> diff --git a/net/netlink/diag.c b/net/netlink/diag.c
> index 4e4aa47..1af2962 100644
> --- a/net/netlink/diag.c
> +++ b/net/netlink/diag.c
> @@ -7,6 +7,7 @@
>  
>  #include "af_netlink.h"
>  
> +#ifdef CONFIG_NETLINK_MMAP
>  static int sk_diag_put_ring(struct netlink_ring *ring, int nl_type,
>  			    struct sk_buff *nlskb)
>  {
> @@ -34,6 +35,12 @@ static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
>  
>  	return ret;
>  }
> +#else
> +static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
> +{
> +	return 0;
> +}
> +#endif
>  
>  static int sk_diag_dump_groups(struct sock *sk, struct sk_buff *nlskb)
>  {
> --


-- 
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/