linux-kernel - Re: [PATCH net-next] ipvs: Use struct

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: <20190208095648.la4ushbjxkqgqzb6@verge.net.au>
Date:   Fri, 8 Feb 2019 10:56:48 +0100
From:   Simon Horman <horms@...ge.net.au>
To:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>
Cc:     Wensong Zhang <wensong@...ux-vs.org>, Julian Anastasov <ja@....bg>,
        Pablo Neira Ayuso <pablo@...filter.org>,
        Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>,
        Florian Westphal <fw@...len.de>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
        lvs-devel@...r.kernel.org, netfilter-devel@...r.kernel.org,
        coreteam@...filter.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next] ipvs: Use struct_size() helper

On Thu, Feb 07, 2019 at 06:44:56PM -0600, Gustavo A. R. Silva wrote:
> One of the more common cases of allocation size calculations is finding
> the size of a structure that has a zero-sized array at the end, along
> with memory for some number of elements for that array. For example:
> 
> struct foo {
>     int stuff;
>     struct boo entry[];
> };
> 
> size = sizeof(struct foo) + count * sizeof(struct boo);
> instance = alloc(size, GFP_KERNEL)
> 
> Instead of leaving these open-coded and prone to type mistakes, we can
> now use the new struct_size() helper:
> 
> size = struct_size(instance, entry, count);
> 
> This code was detected with the help of Coccinelle.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@...eddedor.com>

Acked-by: Simon Horman <horms+renesas@...ge.net.au>

Pablo, could you consider applying this?

> ---
>  net/netfilter/ipvs/ip_vs_ctl.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 7d6318664eb2..bcd9112f47d9 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -2734,8 +2734,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
>  		int size;
>  
>  		get = (struct ip_vs_get_services *)arg;
> -		size = sizeof(*get) +
> -			sizeof(struct ip_vs_service_entry) * get->num_services;
> +		size = struct_size(get, entrytable, get->num_services);
>  		if (*len != size) {
>  			pr_err("length: %u != %u\n", *len, size);
>  			ret = -EINVAL;
> @@ -2776,8 +2775,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
>  		int size;
>  
>  		get = (struct ip_vs_get_dests *)arg;
> -		size = sizeof(*get) +
> -			sizeof(struct ip_vs_dest_entry) * get->num_dests;
> +		size = struct_size(get, entrytable, get->num_dests);
>  		if (*len != size) {
>  			pr_err("length: %u != %u\n", *len, size);
>  			ret = -EINVAL;
> -- 
> 2.20.1
>