[<prev] [next>] [day] [month] [year] [list]
Message-ID: <925355aa-c98b-4fa7-8e49-b97f6d551a86@stanley.mountain>
Date: Wed, 19 Mar 2025 10:06:29 +0300
From: Dan Carpenter <dan.carpenter@...aro.org>
To: Brett Creeley <brett.creeley@....com>
Cc: Shannon Nelson <shannon.nelson@....com>,
Dave Jiang <dave.jiang@...el.com>, Jason Gunthorpe <jgg@...pe.ca>,
Saeed Mahameed <saeedm@...dia.com>,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
Leon Romanovsky <leon@...nel.org>, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [PATCH next] pds_fwctl: Fix a NULL vs IS_ERR() check in
pdsfc_validate_rpc()
The pdsfc_get_operations() function returns error pointers, it doesn't
return NULL. However, the "ep_info->operations" pointer should be set
to either a valid pointer or NULL because the rest of the driver checks
for that.
Fixes: 804294d75ac5 ("pds_fwctl: add rpc and query support")
Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>
---
---
drivers/fwctl/pds/main.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/fwctl/pds/main.c b/drivers/fwctl/pds/main.c
index c0266fc76797..a097fdde0b55 100644
--- a/drivers/fwctl/pds/main.c
+++ b/drivers/fwctl/pds/main.c
@@ -255,6 +255,7 @@ static int pdsfc_validate_rpc(struct pdsfc_dev *pdsfc,
{
struct pds_fwctl_query_data_operation *op_entry;
struct pdsfc_rpc_endpoint_info *ep_info = NULL;
+ struct pds_fwctl_query_data *operations;
struct device *dev = &pdsfc->fwctl.dev;
int i;
@@ -287,13 +288,14 @@ static int pdsfc_validate_rpc(struct pdsfc_dev *pdsfc,
/* query and cache this endpoint's operations */
mutex_lock(&ep_info->lock);
if (!ep_info->operations) {
- ep_info->operations = pdsfc_get_operations(pdsfc,
- &ep_info->operations_pa,
- rpc->in.ep);
- if (!ep_info->operations) {
+ operations = pdsfc_get_operations(pdsfc,
+ &ep_info->operations_pa,
+ rpc->in.ep);
+ if (IS_ERR(operations)) {
mutex_unlock(&ep_info->lock);
- return -ENOMEM;
+ return PTR_ERR(operations);
}
+ ep_info->operations = operations;
}
mutex_unlock(&ep_info->lock);
--
2.47.2
Powered by blists - more mailing lists