From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Pavel Skripkin <paskripkin@gmail.com>,
syzbot+91adee8d9ebb9193d22d@syzkaller.appspotmail.com,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 07/23] drivers: net: fix memory leak in peak_usb_create_dev
Date: Mon, 12 Apr 2021 12:26:48 -0400 [thread overview]
Message-ID: <20210412162704.315783-7-sashal@kernel.org> (raw)
In-Reply-To: <20210412162704.315783-1-sashal@kernel.org>
From: Pavel Skripkin <paskripkin@gmail.com>
[ Upstream commit a0b96b4a62745397aee662670cfc2157bac03f55 ]
syzbot reported memory leak in peak_usb.
The problem was in case of failure after calling
->dev_init()[2] in peak_usb_create_dev()[1]. The data
allocated int dev_init() wasn't freed, so simple
->dev_free() call fix this problem.
backtrace:
[<0000000079d6542a>] kmalloc include/linux/slab.h:552 [inline]
[<0000000079d6542a>] kzalloc include/linux/slab.h:682 [inline]
[<0000000079d6542a>] pcan_usb_fd_init+0x156/0x210 drivers/net/can/usb/peak_usb/pcan_usb_fd.c:868 [2]
[<00000000c09f9057>] peak_usb_create_dev drivers/net/can/usb/peak_usb/pcan_usb_core.c:851 [inline] [1]
[<00000000c09f9057>] peak_usb_probe+0x389/0x490 drivers/net/can/usb/peak_usb/pcan_usb_core.c:949
Reported-by: syzbot+91adee8d9ebb9193d22d@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 2e316228aa1e..c8502bd8e3dc 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -880,7 +880,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
if (dev->adapter->dev_set_bus) {
err = dev->adapter->dev_set_bus(dev, 0);
if (err)
- goto lbl_unregister_candev;
+ goto adap_dev_free;
}
/* get device number early */
@@ -892,6 +892,10 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
return 0;
+adap_dev_free:
+ if (dev->adapter->dev_free)
+ dev->adapter->dev_free(dev);
+
lbl_unregister_candev:
unregister_candev(netdev);
--
2.30.2
next prev parent reply other threads:[~2021-04-12 16:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 16:26 [PATCH AUTOSEL 4.9 01/23] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 04/23] neighbour: Disregard DEAD dst in neigh_update Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 06/23] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:26 ` Sasha Levin [this message]
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 09/23] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 10/23] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 11/23] net: ieee802154: stop dump llsec devs " Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 12/23] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 13/23] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 14/23] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 15/23] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 16/23] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 17/23] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 18/23] net: ieee802154: stop dump llsec params for monitors Sasha Levin
2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 19/23] net: mac802154: Fix general protection fault Sasha Levin
2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 20/23] pcnet32: Use pci_resource_len to validate PCI resource Sasha Levin
2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 21/23] net/rds: Avoid potential use after free in rds_send_remove_from_sock Sasha Levin
2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 22/23] net: tipc: Fix spelling errors in net/tipc module Sasha Levin
2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 23/23] cfg80211: remove WARN_ON() in cfg80211_sme_connect Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412162704.315783-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paskripkin@gmail.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+91adee8d9ebb9193d22d@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).