Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 18 Sep 2020 19:09:25 -0500
From:   "Gustavo A. R. Silva" <gustavoars@kernel.org>
To:     Rustam Kovhaev <rkovhaev@gmail.com>
Cc:     pbonzini@redhat.com, vkuznets@redhat.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
        stable@vger.kernel.org
Subject: Re: [PATCH] KVM: use struct_size() and flex_array_size() helpers in
 kvm_io_bus_unregister_dev()
Message-ID: <20200919000925.GA23967@embeddedor>
References: <20200918120500.954436-1-rkovhaev@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200918120500.954436-1-rkovhaev@gmail.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
Precedence: bulk

On Fri, Sep 18, 2020 at 05:05:00AM -0700, Rustam Kovhaev wrote:
> Make use of the struct_size() helper to avoid any potential type
> mistakes and protect against potential integer overflows
> Make use of the flex_array_size() helper to calculate the size of a
> flexible array member within an enclosing structure
> 
> Cc: stable@vger.kernel.org

I don't think this change applies for -stable.

> Suggested-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com>

Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>

Thanks!
--
Gustavo

> ---
>  virt/kvm/kvm_main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index cf88233b819a..68edd25dcb11 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -4350,10 +4350,10 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
>  	new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1),
>  			  GFP_KERNEL_ACCOUNT);
>  	if (new_bus) {
> -		memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range));
> +		memcpy(new_bus, bus, struct_size(bus, range, i));
>  		new_bus->dev_count--;
>  		memcpy(new_bus->range + i, bus->range + i + 1,
> -		       (new_bus->dev_count - i) * sizeof(struct kvm_io_range));
> +				flex_array_size(new_bus, range, new_bus->dev_count - i));
>  	} else {
>  		pr_err("kvm: failed to shrink bus, removing it completely\n");
>  		for (j = 0; j < bus->dev_count; j++) {
> -- 
> 2.28.0
>