[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <8d62104c-ac1f-447a-8b53-cad4e66a6c8d@stanley.mountain>
Date: Tue, 27 Aug 2024 11:40:59 +0300
From: Dan Carpenter <dan.carpenter@...aro.org>
To: Riyan Dhiman <riyandhiman14@...il.com>
Cc: gregkh@...uxfoundation.org, linux-kernel@...r.kernel.org,
linux-staging@...ts.linux.dev
Subject: Re: [PATCH] staging: vme_user: added bound check to geoid
On Tue, Aug 27, 2024 at 11:25:55AM +0530, Riyan Dhiman wrote:
> diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c
> index 7f84d1c86f29..d93a5d428ab9 100644
> --- a/drivers/staging/vme_user/vme_fake.c
> +++ b/drivers/staging/vme_user/vme_fake.c
> @@ -1059,6 +1059,13 @@ static int __init fake_init(void)
> struct vme_slave_resource *slave_image;
> struct vme_lm_resource *lm;
>
> + /* If geoid provided, validate it is positive and less than VME_MAX_SLOTS */
> + if ((geoid) && (geoid < 0 || geoid >= VME_MAX_SLOTS)) {
^^^^^^^
Too many parentheses, but really there is no need for this. Just write:
if (geoid < 0 || geoid >= VME_MAX_SLOTS) {
> + pr_err("VME geographical address must be between 0 and %d (exclusive), but got %d\n",
> + VME_MAX_SLOTS, geoid);
> + return -EINVAL;
> + }
> +
> /* We need a fake parent device */
> vme_root = root_device_register("vme");
> if (IS_ERR(vme_root))
> diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c
> index d81be8e4ceba..97323b5563e8 100644
> --- a/drivers/staging/vme_user/vme_tsi148.c
> +++ b/drivers/staging/vme_user/vme_tsi148.c
> @@ -2252,6 +2252,13 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> struct vme_dma_resource *dma_ctrlr;
> struct vme_lm_resource *lm;
>
> + /* If geoid provided, validate it is positive and less than VME_MAX_SLOTS */
> + if ((geoid) && (geoid < 0 || geoid >= VME_MAX_SLOTS)) {
> + pr_err("VME geographical address must be between 0 and %d (exclusive), but got %d\n",
> + VME_MAX_SLOTS, geoid);
Here you have a device pointer so can use dev_err(&pdev->dev, ... instead of
pr_err().
regards,
dan carpenter
> + return -EINVAL;
> + }
Powered by blists - more mailing lists