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:   Mon, 21 Jun 2021 12:04:32 +0200
From:   Halil Pasic <pasic@linux.ibm.com>
To:     "Jason J. Herne" <jjherne@linux.ibm.com>
Cc:     linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
        akrowiak@linux.ibm.com, jgg@nvidia.com
Subject: Re: [PATCH v2] s390/vfio-ap: Fix module unload memory leak of
 matrix_dev
Message-ID: <20210621120432.0e6d2839.pasic@linux.ibm.com>
In-Reply-To: <20210618171255.2025-1-jjherne@linux.ibm.com>
References: <20210618171255.2025-1-jjherne@linux.ibm.com>
Organization: IBM
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Fri, 18 Jun 2021 13:12:55 -0400
"Jason J. Herne" <jjherne@linux.ibm.com> wrote:

> vfio_ap_matrix_dev_release is shadowing the global matrix_dev with a NULL
> pointer. Driver data for the matrix device is never set and so
> dev_get_drvdata() always returns NULL. When release is called we end up
> not freeing matrix_dev. The fix is to remove the shadow variable and get
> the correct pointer from the device using container_of. We'll also NULL
> the global to prevent any future use.
> 
> Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>
> ---
>  drivers/s390/crypto/vfio_ap_drv.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/s390/crypto/vfio_ap_drv.c b/drivers/s390/crypto/vfio_ap_drv.c
> index 7dc72cb718b0..40e66cb363d1 100644
> --- a/drivers/s390/crypto/vfio_ap_drv.c
> +++ b/drivers/s390/crypto/vfio_ap_drv.c
> @@ -82,9 +82,8 @@ static void vfio_ap_queue_dev_remove(struct ap_device *apdev)
>  
>  static void vfio_ap_matrix_dev_release(struct device *dev)
>  {
> -	struct ap_matrix_dev *matrix_dev = dev_get_drvdata(dev);
> -
> -	kfree(matrix_dev);
> +	kfree(container_of(dev, struct ap_matrix_dev, device));
> +	matrix_dev = NULL;

Reviewed-by: Halil Pasic <pasic@linux.ibm.com>

I'm not sure nulling the global here buys us anything (especially after
the kfree()). But it does not hurt either, so I'm fine with it. Style
wise I think vfio_ap_matrix_dev_destroy() is a better place for the
nulling IMHO, as it is dealing with module global state.

Regards,
Halil


>  }
>  
>  static int matrix_bus_match(struct device *dev, struct device_driver *drv)