2020-11-10 14:45:42

by Wang Hai

[permalink] [raw]
Subject: [PATCH net] cosa: Add missing kfree in error path of cosa_write

If memory allocation for 'kbuf' succeed, cosa_write() doesn't have a
corresponding kfree() in exception handling. Thus add kfree() for this
function implementation.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wang Hai <[email protected]>
---
drivers/net/wan/cosa.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index f8aed0696d77..2369ca250cd6 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -889,6 +889,7 @@ static ssize_t cosa_write(struct file *file,
chan->tx_status = 1;
spin_unlock_irqrestore(&cosa->lock, flags);
up(&chan->wsem);
+ kfree(kbuf);
return -ERESTARTSYS;
}
}
--
2.17.1


2020-11-10 16:45:25

by Jan Kasprzak

[permalink] [raw]
Subject: Re: [PATCH net] cosa: Add missing kfree in error path of cosa_write

Wang Hai wrote:
: If memory allocation for 'kbuf' succeed, cosa_write() doesn't have a
: corresponding kfree() in exception handling. Thus add kfree() for this
: function implementation.

Acked-By: Jan "Yenya" Kasprzak <[email protected]>

Looks correct, thanks.

That said, COSA is an ancient ISA bus device designed in late 1990s,
I doubt anybody is still using it. I still do have one or two of these
cards myself, but no computer with ISA bus to use them.

-Yenya

:
: Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
: Reported-by: Hulk Robot <[email protected]>
: Signed-off-by: Wang Hai <[email protected]>
: ---
: drivers/net/wan/cosa.c | 1 +
: 1 file changed, 1 insertion(+)
:
: diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
: index f8aed0696d77..2369ca250cd6 100644
: --- a/drivers/net/wan/cosa.c
: +++ b/drivers/net/wan/cosa.c
: @@ -889,6 +889,7 @@ static ssize_t cosa_write(struct file *file,
: chan->tx_status = 1;
: spin_unlock_irqrestore(&cosa->lock, flags);
: up(&chan->wsem);
: + kfree(kbuf);
: return -ERESTARTSYS;
: }
: }
: --
: 2.17.1

--
| Jan "Yenya" Kasprzak <kas at {fi.muni.cz - work | yenya.net - private}> |
| http://www.fi.muni.cz/~kas/ GPG: 4096R/A45477D5 |
We all agree on the necessity of compromise. We just can't agree on
when it's necessary to compromise. --Larry Wall

2020-11-12 05:37:32

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH net] cosa: Add missing kfree in error path of cosa_write

On Tue, 10 Nov 2020 17:38:09 +0100 Jan Kasprzak wrote:
> Wang Hai wrote:
> : If memory allocation for 'kbuf' succeed, cosa_write() doesn't have a
> : corresponding kfree() in exception handling. Thus add kfree() for this
> : function implementation.
>
> Acked-By: Jan "Yenya" Kasprzak <[email protected]>

Applied, thanks!

> That said, COSA is an ancient ISA bus device designed in late 1990s,
> I doubt anybody is still using it. I still do have one or two of these
> cards myself, but no computer with ISA bus to use them.

Maybe we can move it out to staging or just remove it?