2021-02-01 12:33:55

by Dan Carpenter

Subject: [PATCH] bus: fsl-mc: Fix test for end of loop

The "desc" pointer can't possibly be NULL here. If we can't find the
correct "desc" then tt points to the last element of the
fsl_mc_accepted_cmds[] array. Fix this by testing if
"i == FSL_MC_NUM_ACCEPTED_CMDS" instead.

Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/bus/fsl-mc/fsl-mc-uapi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
index eeb988c9f4bb..bdcd9d983a78 100644
--- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
@@ -338,7 +338,7 @@ static int fsl_mc_command_check(struct fsl_mc_device *mc_dev,
if ((cmdid & desc->cmdid_mask) == desc->cmdid_value)
break;
}
- if (!desc) {
+ if (i == FSL_MC_NUM_ACCEPTED_CMDS) {
dev_err(&mc_dev->dev, "MC command 0x%04x: cmdid not accepted\n", cmdid);
return -EACCES;
}
--
2.29.2

2021-02-02 21:26:00

by Ioana Ciornei

Subject: Re: [PATCH] bus: fsl-mc: Fix test for end of loop

On Mon, Feb 01, 2021 at 03:28:54PM +0300, Dan Carpenter wrote:
> The "desc" pointer can't possibly be NULL here. If we can't find the
> correct "desc" then tt points to the last element of the
> fsl_mc_accepted_cmds[] array. Fix this by testing if
> "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
>
> Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Ioana Ciornei <[email protected]>

Thanks!

> ---
> drivers/bus/fsl-mc/fsl-mc-uapi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
> index eeb988c9f4bb..bdcd9d983a78 100644
> --- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
> +++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
> @@ -338,7 +338,7 @@ static int fsl_mc_command_check(struct fsl_mc_device *mc_dev,
> if ((cmdid & desc->cmdid_mask) == desc->cmdid_value)
> break;
> }
> - if (!desc) {
> + if (i == FSL_MC_NUM_ACCEPTED_CMDS) {
> dev_err(&mc_dev->dev, "MC command 0x%04x: cmdid not accepted\n", cmdid);
> return -EACCES;
> }
> --
> 2.29.2
>

2021-02-08 14:49:40

by Ioana Ciornei

Subject: Re: [PATCH] bus: fsl-mc: Fix test for end of loop

On Mon, Feb 01, 2021 at 03:28:54PM +0300, Dan Carpenter wrote:
> The "desc" pointer can't possibly be NULL here. If we can't find the
> correct "desc" then tt points to the last element of the
> fsl_mc_accepted_cmds[] array. Fix this by testing if
> "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
>
> Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> Signed-off-by: Dan Carpenter <[email protected]>

Hi,

I just noticed that Greg wasn't copied on the initial email.

If you don't mind I will re-submit your patch along with other updates
to the fsl-mc bus so that you don't have to bother.

Ioana

> ---
> drivers/bus/fsl-mc/fsl-mc-uapi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
> index eeb988c9f4bb..bdcd9d983a78 100644
> --- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
> +++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
> @@ -338,7 +338,7 @@ static int fsl_mc_command_check(struct fsl_mc_device *mc_dev,
> if ((cmdid & desc->cmdid_mask) == desc->cmdid_value)
> break;
> }
> - if (!desc) {
> + if (i == FSL_MC_NUM_ACCEPTED_CMDS) {
> dev_err(&mc_dev->dev, "MC command 0x%04x: cmdid not accepted\n", cmdid);
> return -EACCES;
> }
> --
> 2.29.2
>

2021-02-08 16:23:11

by Dan Carpenter

Subject: Re: [PATCH] bus: fsl-mc: Fix test for end of loop

On Mon, Feb 08, 2021 at 02:18:04PM +0000, Ioana Ciornei wrote:
> On Mon, Feb 01, 2021 at 03:28:54PM +0300, Dan Carpenter wrote:
> > The "desc" pointer can't possibly be NULL here. If we can't find the
> > correct "desc" then tt points to the last element of the
> > fsl_mc_accepted_cmds[] array. Fix this by testing if
> > "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
> >
> > Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> > Signed-off-by: Dan Carpenter <[email protected]>
>
> Hi,
>
> I just noticed that Greg wasn't copied on the initial email.
>
> If you don't mind I will re-submit your patch along with other updates
> to the fsl-mc bus so that you don't have to bother.
>

Thanks for doing that!

Was Greg supposed to have been copied, though? He's not listed in the
./scripts/get_maintainer.pl output.

regards,
dan carpenter

2021-02-08 18:26:23

by Ioana Ciornei

Subject: Re: [PATCH] bus: fsl-mc: Fix test for end of loop

On Mon, Feb 08, 2021 at 06:11:29PM +0300, Dan Carpenter wrote:
> On Mon, Feb 08, 2021 at 02:18:04PM +0000, Ioana Ciornei wrote:
> > On Mon, Feb 01, 2021 at 03:28:54PM +0300, Dan Carpenter wrote:
> > > The "desc" pointer can't possibly be NULL here. If we can't find the
> > > correct "desc" then tt points to the last element of the
> > > fsl_mc_accepted_cmds[] array. Fix this by testing if
> > > "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
> > >
> > > Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> > > Signed-off-by: Dan Carpenter <[email protected]>
> >
> > Hi,
> >
> > I just noticed that Greg wasn't copied on the initial email.
> >
> > If you don't mind I will re-submit your patch along with other updates
> > to the fsl-mc bus so that you don't have to bother.
> >
>
> Thanks for doing that!
>
> Was Greg supposed to have been copied, though? He's not listed in the
> ./scripts/get_maintainer.pl output.
>

Huh, he's not listed indeed. I didn't check this before since the fsl-mc
bus changes have always been pushed through Greg's char-misc tree.