From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BF913EB112 for ; Thu, 25 Jun 2026 17:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782410170; cv=none; b=hyWhrjf9dLNys4PTkbns3jfbmTAZ2NE1NGfFm40oJk0QACltIIcaaqfoxLtrlyu0XWXYIURvDSHf+xjCyGnYjrtlcEDW+DS+jVqwwm5DS2OFHToPSgKFJ7ehPDpAsIIY1RjOUrOlAZFtt6EewFyZNyh8tWdrObCNFUsVSqea338= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782410170; c=relaxed/simple; bh=hvrwqCNSsiTu1trAfUcH4/LOKxhv/AY1CAUa9toNYK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sDGQCTUu7tvkkBiNfWqo21IRcPKCgjmirtJMJPlSEnbkdKL77koZ9uTOhAw1BBZCD0fNGHk3BA3ZVkMNzOk4nBgWFlksTTWKYGS/LLIfoCtuaiZDsAzzwCxMdpIxVN2KyMV2rAoiUnvma0A4dCO44ePmn1PF9kUMwPlEooyO+h0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ijiLuCtJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ijiLuCtJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1897A1F00A3D; Thu, 25 Jun 2026 17:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782410168; bh=NQE20/bAdVsscLwe4rgeM/ekF4SLs11kOiaWCke/ETc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ijiLuCtJWrgE6VaH6wpXFTEcdExrXwgQ/CE24UPwITIKKYzPTCoW1BHfQb03JsaLt QzqwPpOahG4ZHblziZ4L/tH1qBmbGvEFjOg/B/tAh/IVUQ7+YmzNaE3cPqWEF4ePTU s+WQXe+sHlfxWTwSD2F0nGdkkoAualcFiRUC7zNZLwfwbiHVAuvWtK84Du2h4OC4fk HEmCDiClUwZMsdV9YQE03Yt6NHotiVk2ncn0Q2xZ77OLoCpYLum5/KTEE2aJlI0Gyw y3VD0WZU04a6YTxQ6cwOc6v6zw0K1WfWPVAzogB/MTDtyCX8svY7st+akVQyTcJ8jn 73PFt7F5jlV2A== From: Sasha Levin To: stable@vger.kernel.org Cc: Herbert Xu , Thorsten Blum , Giovanni Cabiddu , Sasha Levin Subject: [PATCH 6.1.y 3/4] crypto: qat - Return pointer directly in adf_ctl_alloc_resources Date: Thu, 25 Jun 2026 13:56:03 -0400 Message-ID: <20260625175604.2543972-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260625175604.2543972-1-sashal@kernel.org> References: <2026062533-verdict-shuffle-1baa@gregkh> <20260625175604.2543972-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Herbert Xu [ Upstream commit 5ce9891ea928208a915411ce8227f8c3e37e5ad9 ] Returning values through arguments is confusing and that has upset the compiler with the recent change to memdup_user: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c: In function ‘adf_ctl_ioctl’: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:308:26: warning: ‘ctl_data’ may be used uninitialized [-Wmaybe-uninitialized] 308 | ctl_data->device_id); | ^~ ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:294:39: note: ‘ctl_data’ was declared here 294 | struct adf_user_cfg_ctl_data *ctl_data; | ^~~~~~~~ In function ‘adf_ctl_ioctl_dev_stop’, inlined from ‘adf_ctl_ioctl’ at ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:386:9: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:273:48: warning: ‘ctl_data’ may be used uninitialized [-Wmaybe-uninitialized] 273 | ret = adf_ctl_is_device_in_use(ctl_data->device_id); | ~~~~~~~~^~~~~~~~~~~ ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c: In function ‘adf_ctl_ioctl’: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:261:39: note: ‘ctl_data’ was declared here 261 | struct adf_user_cfg_ctl_data *ctl_data; | ^~~~~~~~ In function ‘adf_ctl_ioctl_dev_config’, inlined from ‘adf_ctl_ioctl’ at ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:382:9: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:192:54: warning: ‘ctl_data’ may be used uninitialized [-Wmaybe-uninitialized] 192 | accel_dev = adf_devmgr_get_dev_by_id(ctl_data->device_id); | ~~~~~~~~^~~~~~~~~~~ ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c: In function ‘adf_ctl_ioctl’: ../drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c:185:39: note: ‘ctl_data’ was declared here 185 | struct adf_user_cfg_ctl_data *ctl_data; | ^~~~~~~~ Fix this by returning the pointer directly. Signed-off-by: Herbert Xu Reviewed-by: Thorsten Blum Acked-by: Giovanni Cabiddu Signed-off-by: Herbert Xu Stable-dep-of: d237230728c5 ("crypto: qat - remove unused character device and IOCTLs") Signed-off-by: Sasha Levin --- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 31 +++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c index c74a92c00a9b4f..28d91b54df0b5c 100644 --- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c +++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c @@ -85,19 +85,14 @@ static int adf_chr_drv_create(void) return -EFAULT; } -static int adf_ctl_alloc_resources(struct adf_user_cfg_ctl_data **ctl_data, - unsigned long arg) +static struct adf_user_cfg_ctl_data *adf_ctl_alloc_resources(unsigned long arg) { struct adf_user_cfg_ctl_data *cfg_data; cfg_data = memdup_user((void __user *)arg, sizeof(*cfg_data)); - if (IS_ERR(cfg_data)) { + if (IS_ERR(cfg_data)) pr_err("QAT: failed to copy from user cfg_data.\n"); - return PTR_ERR(cfg_data); - } - - *ctl_data = cfg_data; - return 0; + return cfg_data; } static int adf_add_key_value_data(struct adf_accel_dev *accel_dev, @@ -177,13 +172,13 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev, static int adf_ctl_ioctl_dev_config(struct file *fp, unsigned int cmd, unsigned long arg) { - int ret; struct adf_user_cfg_ctl_data *ctl_data; struct adf_accel_dev *accel_dev; + int ret = 0; - ret = adf_ctl_alloc_resources(&ctl_data, arg); - if (ret) - return ret; + ctl_data = adf_ctl_alloc_resources(arg); + if (IS_ERR(ctl_data)) + return PTR_ERR(ctl_data); accel_dev = adf_devmgr_get_dev_by_id(ctl_data->device_id); if (!accel_dev) { @@ -258,9 +253,9 @@ static int adf_ctl_ioctl_dev_stop(struct file *fp, unsigned int cmd, int ret; struct adf_user_cfg_ctl_data *ctl_data; - ret = adf_ctl_alloc_resources(&ctl_data, arg); - if (ret) - return ret; + ctl_data = adf_ctl_alloc_resources(arg); + if (IS_ERR(ctl_data)) + return PTR_ERR(ctl_data); if (adf_devmgr_verify_id(ctl_data->device_id)) { pr_err("QAT: Device %d not found\n", ctl_data->device_id); @@ -292,9 +287,9 @@ static int adf_ctl_ioctl_dev_start(struct file *fp, unsigned int cmd, struct adf_user_cfg_ctl_data *ctl_data; struct adf_accel_dev *accel_dev; - ret = adf_ctl_alloc_resources(&ctl_data, arg); - if (ret) - return ret; + ctl_data = adf_ctl_alloc_resources(arg); + if (IS_ERR(ctl_data)) + return PTR_ERR(ctl_data); ret = -ENODEV; accel_dev = adf_devmgr_get_dev_by_id(ctl_data->device_id); -- 2.53.0