2023-07-12 14:07:16

by Colin Ian King

[permalink] [raw]
Subject: [PATCH][next] selftests: ALSA: Fix fclose on an already fclosed file pointer

In the case where a sysfs file cannot be opened the error return path
fcloses file pointer fpl, however, fpl has already been closed in the
previous stanza. Fix the double fclose by removing it.

Fixes: 10b98a4db11a ("selftests: ALSA: Add test for the 'pcmtest' driver")
Signed-off-by: Colin Ian King <[email protected]>
---
tools/testing/selftests/alsa/test-pcmtest-driver.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/testing/selftests/alsa/test-pcmtest-driver.c b/tools/testing/selftests/alsa/test-pcmtest-driver.c
index 71931b240a83..357adc722cba 100644
--- a/tools/testing/selftests/alsa/test-pcmtest-driver.c
+++ b/tools/testing/selftests/alsa/test-pcmtest-driver.c
@@ -47,10 +47,8 @@ static int read_patterns(void)

sprintf(pf, "/sys/kernel/debug/pcmtest/fill_pattern%d", i);
fp = fopen(pf, "r");
- if (!fp) {
- fclose(fpl);
+ if (!fp)
return -1;
- }
fread(patterns[i].buf, 1, patterns[i].len, fp);
fclose(fp);
}
--
2.39.2



2023-07-12 16:29:39

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH][next] selftests: ALSA: Fix fclose on an already fclosed file pointer

On Wed, Jul 12, 2023 at 03:01:22PM +0100, Colin Ian King wrote:
> In the case where a sysfs file cannot be opened the error return path
> fcloses file pointer fpl, however, fpl has already been closed in the
> previous stanza. Fix the double fclose by removing it.

Reviewed-by: Mark Brown <[email protected]>

Attachments:
(No filename) (317.00 B)
 signature.asc (499.00 B)
 Download all attachments

2023-07-13 06:53:03

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH][next] selftests: ALSA: Fix fclose on an already fclosed file pointer

On Wed, 12 Jul 2023 16:01:22 +0200,
Colin Ian King wrote:
>
> In the case where a sysfs file cannot be opened the error return path
> fcloses file pointer fpl, however, fpl has already been closed in the
> previous stanza. Fix the double fclose by removing it.
>
> Fixes: 10b98a4db11a ("selftests: ALSA: Add test for the 'pcmtest' driver")
> Signed-off-by: Colin Ian King <[email protected]>

Thanks, applied.


Takashi