* [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-11 0:35 ` Pierre-Louis Bossart
0 siblings, 0 replies; 17+ messages in thread
From: Pierre-Louis Bossart @ 2021-03-11 0:35 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, Pierre-Louis Bossart, stable, broonie, Krzysztof Kozlowski
cppcheck warning:
sound/soc/samsung/tm2_wm5110.c:605:6: style: Variable 'ret' is
reassigned a value before the old one has been
used. [redundantAssignment]
ret = devm_snd_soc_register_component(dev, &tm2_component,
^
sound/soc/samsung/tm2_wm5110.c:554:7: note: ret is assigned
ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
^
sound/soc/samsung/tm2_wm5110.c:605:6: note: ret is overwritten
ret = devm_snd_soc_register_component(dev, &tm2_component,
^
The args is a stack variable, so it could have junk (uninitialized)
therefore args.np could have a non-NULL and random value even though
property was missing. Later could trigger invalid pointer dereference.
There's no need to check for args.np because args.np won't be
initialized on errors.
Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
Cc: <stable@vger.kernel.org>
Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/samsung/tm2_wm5110.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index 9300fef9bf26..125e07f65d2b 100644
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -553,7 +553,7 @@ static int tm2_probe(struct platform_device *pdev)
ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
cells_name, i, &args);
- if (!args.np) {
+ if (ret) {
dev_err(dev, "i2s-controller property parse error: %d\n", i);
ret = -EINVAL;
goto dai_node_put;
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
2021-03-11 0:35 ` Pierre-Louis Bossart
@ 2021-03-12 10:43 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2021-03-12 10:43 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, Sylwester Nawrocki, stable
On 11/03/2021 01:35, Pierre-Louis Bossart wrote:
> cppcheck warning:
>
> sound/soc/samsung/tm2_wm5110.c:605:6: style: Variable 'ret' is
> reassigned a value before the old one has been
> used. [redundantAssignment]
> ret = devm_snd_soc_register_component(dev, &tm2_component,
> ^
> sound/soc/samsung/tm2_wm5110.c:554:7: note: ret is assigned
> ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
> ^
> sound/soc/samsung/tm2_wm5110.c:605:6: note: ret is overwritten
> ret = devm_snd_soc_register_component(dev, &tm2_component,
> ^
>
> The args is a stack variable, so it could have junk (uninitialized)
> therefore args.np could have a non-NULL and random value even though
> property was missing. Later could trigger invalid pointer dereference.
>
> There's no need to check for args.np because args.np won't be
> initialized on errors.
>
> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Cc: <stable@vger.kernel.org>
> Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/samsung/tm2_wm5110.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-12 10:43 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2021-03-12 10:43 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel; +Cc: tiwai, broonie, stable
On 11/03/2021 01:35, Pierre-Louis Bossart wrote:
> cppcheck warning:
>
> sound/soc/samsung/tm2_wm5110.c:605:6: style: Variable 'ret' is
> reassigned a value before the old one has been
> used. [redundantAssignment]
> ret = devm_snd_soc_register_component(dev, &tm2_component,
> ^
> sound/soc/samsung/tm2_wm5110.c:554:7: note: ret is assigned
> ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
> ^
> sound/soc/samsung/tm2_wm5110.c:605:6: note: ret is overwritten
> ret = devm_snd_soc_register_component(dev, &tm2_component,
> ^
>
> The args is a stack variable, so it could have junk (uninitialized)
> therefore args.np could have a non-NULL and random value even though
> property was missing. Later could trigger invalid pointer dereference.
>
> There's no need to check for args.np because args.np won't be
> initialized on errors.
>
> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Cc: <stable@vger.kernel.org>
> Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/samsung/tm2_wm5110.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
2021-03-11 0:35 ` Pierre-Louis Bossart
@ 2021-03-12 14:28 ` Mark Brown
-1 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2021-03-12 14:28 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: alsa-devel, tiwai, stable, Krzysztof Kozlowski
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
On Wed, Mar 10, 2021 at 06:35:15PM -0600, Pierre-Louis Bossart wrote:
> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Cc: <stable@vger.kernel.org>
Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
Has these problem(s):
- Subject does not match target commit subject
Just use
git log -1 --format='Fixes: %h ("%s")'
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-12 14:28 ` Mark Brown
0 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2021-03-12 14:28 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: tiwai, alsa-devel, Krzysztof Kozlowski, stable
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
On Wed, Mar 10, 2021 at 06:35:15PM -0600, Pierre-Louis Bossart wrote:
> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Cc: <stable@vger.kernel.org>
Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
Has these problem(s):
- Subject does not match target commit subject
Just use
git log -1 --format='Fixes: %h ("%s")'
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
2021-03-12 14:28 ` Mark Brown
@ 2021-03-12 16:30 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 17+ messages in thread
From: Pierre-Louis Bossart @ 2021-03-12 16:30 UTC (permalink / raw)
To: Mark Brown; +Cc: tiwai, alsa-devel, Krzysztof Kozlowski, stable
On 3/12/21 8:28 AM, Mark Brown wrote:
> On Wed, Mar 10, 2021 at 06:35:15PM -0600, Pierre-Louis Bossart wrote:
>
>> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
>> Cc: <stable@vger.kernel.org>
>
> Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
> Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Has these problem(s):
> - Subject does not match target commit subject
> Just use
> git log -1 --format='Fixes: %h ("%s")'
>
Sorry, I don't know what to make of this. I don't see this commit
11bc3bb24003
Something odd happened, there was an initial merge and it seems to have
disappeared, it's no longer in the for-next branch?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-12 16:30 ` Pierre-Louis Bossart
0 siblings, 0 replies; 17+ messages in thread
From: Pierre-Louis Bossart @ 2021-03-12 16:30 UTC (permalink / raw)
To: Mark Brown; +Cc: tiwai, alsa-devel, stable, Krzysztof Kozlowski
On 3/12/21 8:28 AM, Mark Brown wrote:
> On Wed, Mar 10, 2021 at 06:35:15PM -0600, Pierre-Louis Bossart wrote:
>
>> Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
>> Cc: <stable@vger.kernel.org>
>
> Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
> Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> Has these problem(s):
> - Subject does not match target commit subject
> Just use
> git log -1 --format='Fixes: %h ("%s")'
>
Sorry, I don't know what to make of this. I don't see this commit
11bc3bb24003
Something odd happened, there was an initial merge and it seems to have
disappeared, it's no longer in the for-next branch?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
2021-03-12 16:30 ` Pierre-Louis Bossart
@ 2021-03-12 16:31 ` Mark Brown
-1 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2021-03-12 16:31 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: tiwai, alsa-devel, Krzysztof Kozlowski, stable
[-- Attachment #1: Type: text/plain, Size: 740 bytes --]
On Fri, Mar 12, 2021 at 10:30:32AM -0600, Pierre-Louis Bossart wrote:
> On 3/12/21 8:28 AM, Mark Brown wrote:
> > Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
> > Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> > Has these problem(s):
> > - Subject does not match target commit subject
> > Just use
> > git log -1 --format='Fixes: %h ("%s")'
> Sorry, I don't know what to make of this. I don't see this commit
> 11bc3bb24003
> Something odd happened, there was an initial merge and it seems to have
> disappeared, it's no longer in the for-next branch?
That commit is your patch being applied, which I've dropped because of
the error reported.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-12 16:31 ` Mark Brown
0 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2021-03-12 16:31 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: tiwai, alsa-devel, stable, Krzysztof Kozlowski
[-- Attachment #1: Type: text/plain, Size: 740 bytes --]
On Fri, Mar 12, 2021 at 10:30:32AM -0600, Pierre-Louis Bossart wrote:
> On 3/12/21 8:28 AM, Mark Brown wrote:
> > Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
> > Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
> > Has these problem(s):
> > - Subject does not match target commit subject
> > Just use
> > git log -1 --format='Fixes: %h ("%s")'
> Sorry, I don't know what to make of this. I don't see this commit
> 11bc3bb24003
> Something odd happened, there was an initial merge and it seems to have
> disappeared, it's no longer in the for-next branch?
That commit is your patch being applied, which I've dropped because of
the error reported.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
2021-03-12 16:31 ` Mark Brown
@ 2021-03-12 16:39 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 17+ messages in thread
From: Pierre-Louis Bossart @ 2021-03-12 16:39 UTC (permalink / raw)
To: Mark Brown; +Cc: tiwai, alsa-devel, Krzysztof Kozlowski, stable
On 3/12/21 10:31 AM, Mark Brown wrote:
> On Fri, Mar 12, 2021 at 10:30:32AM -0600, Pierre-Louis Bossart wrote:
>> On 3/12/21 8:28 AM, Mark Brown wrote:
>
>>> Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
>>> Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
>>> Has these problem(s):
>>> - Subject does not match target commit subject
>>> Just use
>>> git log -1 --format='Fixes: %h ("%s")'
>
>> Sorry, I don't know what to make of this. I don't see this commit
>> 11bc3bb24003
>
>> Something odd happened, there was an initial merge and it seems to have
>> disappeared, it's no longer in the for-next branch?
>
> That commit is your patch being applied, which I've dropped because of
> the error reported.
ack, not sure why there's a missing space.
git log -1 --format='Fixes: %h ("%s")' 8d1513cef51a
Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2
board")
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/2] ASoC: samsung: tm2_wm5110: check of of_parse return value
@ 2021-03-12 16:39 ` Pierre-Louis Bossart
0 siblings, 0 replies; 17+ messages in thread
From: Pierre-Louis Bossart @ 2021-03-12 16:39 UTC (permalink / raw)
To: Mark Brown; +Cc: tiwai, alsa-devel, stable, Krzysztof Kozlowski
On 3/12/21 10:31 AM, Mark Brown wrote:
> On Fri, Mar 12, 2021 at 10:30:32AM -0600, Pierre-Louis Bossart wrote:
>> On 3/12/21 8:28 AM, Mark Brown wrote:
>
>>> Commit: 11bc3bb24003 ("ASoC: samsung: tm2_wm5110: check of of_parse return value")
>>> Fixes tag: Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
>>> Has these problem(s):
>>> - Subject does not match target commit subject
>>> Just use
>>> git log -1 --format='Fixes: %h ("%s")'
>
>> Sorry, I don't know what to make of this. I don't see this commit
>> 11bc3bb24003
>
>> Something odd happened, there was an initial merge and it seems to have
>> disappeared, it's no longer in the for-next branch?
>
> That commit is your patch being applied, which I've dropped because of
> the error reported.
ack, not sure why there's a missing space.
git log -1 --format='Fixes: %h ("%s")' 8d1513cef51a
Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2
board")
^ permalink raw reply [flat|nested] 17+ messages in thread