diff options
| author | Pavel Machek <pavel@ucw.cz> | 2020-09-20 11:01:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:05:41 +0100 |
| commit | 13713d69e951824fc4882d75a1e791c78e9a3f2b (patch) | |
| tree | f2c44dd36547999aeaf8887766034fa12217b06d | |
| parent | 60f4aa0b9f820e69936c8295e2e28ed9f142fbba (diff) | |
| download | linux-13713d69e951824fc4882d75a1e791c78e9a3f2b.tar.gz linux-13713d69e951824fc4882d75a1e791c78e9a3f2b.tar.bz2 linux-13713d69e951824fc4882d75a1e791c78e9a3f2b.zip | |
media: firewire: fix memory leak
[ Upstream commit b28e32798c78a346788d412f1958f36bb760ec03 ]
Fix memory leak in node_probe.
Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/media/firewire/firedtv-fw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c index 5d634706a7ea..382f290c3f4d 100644 --- a/drivers/media/firewire/firedtv-fw.c +++ b/drivers/media/firewire/firedtv-fw.c @@ -271,8 +271,10 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id) name_len = fw_csr_string(unit->directory, CSR_MODEL, name, sizeof(name)); - if (name_len < 0) - return name_len; + if (name_len < 0) { + err = name_len; + goto fail_free; + } for (i = ARRAY_SIZE(model_names); --i; ) if (strlen(model_names[i]) <= name_len && strncmp(name, model_names[i], name_len) == 0) |