* [PATCH][next] can: fix resource leak of skb on error return paths
@ 2019-09-18 10:11 Colin King
2019-10-01 10:44 ` Oleksij Rempel
2019-10-01 20:04 ` Marc Kleine-Budde
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2019-09-18 10:11 UTC (permalink / raw)
To: Robin van der Gracht, Oleksij Rempel, Pengutronix Kernel Team,
Oliver Hartkopp, Marc Kleine-Budde, David S . Miller, linux-can,
netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently the error return paths do not free skb and this results
in a memory leak. Fix this by freeing them before the return.
Addresses-Coverity: ("Resource leak")
Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/can/j1939/socket.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
index 37c1040bcb9c..5c6eabcb5df1 100644
--- a/net/can/j1939/socket.c
+++ b/net/can/j1939/socket.c
@@ -909,8 +909,10 @@ void j1939_sk_errqueue(struct j1939_session *session,
memset(serr, 0, sizeof(*serr));
switch (type) {
case J1939_ERRQUEUE_ACK:
- if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK))
+ if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)) {
+ kfree_skb(skb);
return;
+ }
serr->ee.ee_errno = ENOMSG;
serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
@@ -918,8 +920,10 @@ void j1939_sk_errqueue(struct j1939_session *session,
state = "ACK";
break;
case J1939_ERRQUEUE_SCHED:
- if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED))
+ if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) {
+ kfree_skb(skb);
return;
+ }
serr->ee.ee_errno = ENOMSG;
serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] can: fix resource leak of skb on error return paths
2019-09-18 10:11 [PATCH][next] can: fix resource leak of skb on error return paths Colin King
@ 2019-10-01 10:44 ` Oleksij Rempel
2019-10-01 20:04 ` Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Oleksij Rempel @ 2019-10-01 10:44 UTC (permalink / raw)
To: Colin King
Cc: Robin van der Gracht, Oleksij Rempel, Pengutronix Kernel Team,
Oliver Hartkopp, Marc Kleine-Budde, David S . Miller, linux-can,
netdev, kernel-janitors, linux-kernel
On Wed, Sep 18, 2019 at 11:11:56AM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the error return paths do not free skb and this results
> in a memory leak. Fix this by freeing them before the return.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> net/can/j1939/socket.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
> index 37c1040bcb9c..5c6eabcb5df1 100644
> --- a/net/can/j1939/socket.c
> +++ b/net/can/j1939/socket.c
> @@ -909,8 +909,10 @@ void j1939_sk_errqueue(struct j1939_session *session,
> memset(serr, 0, sizeof(*serr));
> switch (type) {
> case J1939_ERRQUEUE_ACK:
> - if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK))
> + if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)) {
> + kfree_skb(skb);
> return;
> + }
>
> serr->ee.ee_errno = ENOMSG;
> serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
> @@ -918,8 +920,10 @@ void j1939_sk_errqueue(struct j1939_session *session,
> state = "ACK";
> break;
> case J1939_ERRQUEUE_SCHED:
> - if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED))
> + if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) {
> + kfree_skb(skb);
> return;
> + }
>
> serr->ee.ee_errno = ENOMSG;
> serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
> --
> 2.20.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] can: fix resource leak of skb on error return paths
2019-09-18 10:11 [PATCH][next] can: fix resource leak of skb on error return paths Colin King
2019-10-01 10:44 ` Oleksij Rempel
@ 2019-10-01 20:04 ` Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2019-10-01 20:04 UTC (permalink / raw)
To: Colin King, Robin van der Gracht, Oleksij Rempel,
Pengutronix Kernel Team, Oliver Hartkopp, David S . Miller,
linux-can, netdev
Cc: kernel-janitors, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 708 bytes --]
On 9/18/19 12:11 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the error return paths do not free skb and this results
> in a memory leak. Fix this by freeing them before the return.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Added to can.
tnx.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-02 6:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-18 10:11 [PATCH][next] can: fix resource leak of skb on error return paths Colin King
2019-10-01 10:44 ` Oleksij Rempel
2019-10-01 20:04 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).