From: Dongliang Mu <mudongliangabcd@gmail.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
YueHaibing <yuehaibing@huawei.com>,
Anirudh Rayabharam <mail@anirudhrb.com>,
Oliver Neukum <oneukum@suse.com>,
Jakub Kicinski <kuba@kernel.org>,
syzbot+44d53c7255bb1aea22d2@syzkaller.appspotmail.com,
Zheng Yongjun <zhengyongjun3@huawei.com>,
Emil Renner Berthing <kernel@esmil.dk>,
linux-usb@vger.kernel.org,
"open list:NETWORKING [GENERAL]" <netdev@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Johan Hovold <johan@kernel.org>
Subject: Re: [PATCH 1/2] usb: hso: fix error handling code of hso_create_net_device
Date: Wed, 14 Jul 2021 16:14:18 +0800 [thread overview]
Message-ID: <CAD-N9QXRRipmyOiUFDx9OdM47c37Y+oAa+T-ntZAGZXrd8MTrA@mail.gmail.com> (raw)
In-Reply-To: <20210714081127.675743-1-mudongliangabcd@gmail.com>
On Wed, Jul 14, 2021 at 4:11 PM Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>
> The current error handling code of hso_create_net_device is
> hso_free_net_device, no matter which errors lead to. For example,
> WARNING in hso_free_net_device [1].
>
> Fix this by refactoring the error handling code of
> hso_create_net_device by handling different errors by different code.
>
Hi Dan,
Please take a look at this version. I forget about the changelog about
this patch. I will send a version v3 with your further comment if you
have.
> [1] https://syzkaller.appspot.com/bug?id=66eff8d49af1b28370ad342787413e35bbe76efe
>
> Reported-by: syzbot+44d53c7255bb1aea22d2@syzkaller.appspotmail.com
> Fixes: 5fcfb6d0bfcd ("hso: fix bailout in error case of probe")
> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
> ---
> drivers/net/usb/hso.c | 33 +++++++++++++++++++++++----------
> 1 file changed, 23 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
> index 54ef8492ca01..39c4e88eab62 100644
> --- a/drivers/net/usb/hso.c
> +++ b/drivers/net/usb/hso.c
> @@ -2495,7 +2495,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
> hso_net_init);
> if (!net) {
> dev_err(&interface->dev, "Unable to create ethernet device\n");
> - goto exit;
> + goto err_hso_dev;
> }
>
> hso_net = netdev_priv(net);
> @@ -2508,13 +2508,13 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
> USB_DIR_IN);
> if (!hso_net->in_endp) {
> dev_err(&interface->dev, "Can't find BULK IN endpoint\n");
> - goto exit;
> + goto err_net;
> }
> hso_net->out_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
> USB_DIR_OUT);
> if (!hso_net->out_endp) {
> dev_err(&interface->dev, "Can't find BULK OUT endpoint\n");
> - goto exit;
> + goto err_net;
> }
> SET_NETDEV_DEV(net, &interface->dev);
> SET_NETDEV_DEVTYPE(net, &hso_type);
> @@ -2523,18 +2523,18 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
> for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
> hso_net->mux_bulk_rx_urb_pool[i] = usb_alloc_urb(0, GFP_KERNEL);
> if (!hso_net->mux_bulk_rx_urb_pool[i])
> - goto exit;
> + goto err_mux_bulk_rx;
> hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
> GFP_KERNEL);
> if (!hso_net->mux_bulk_rx_buf_pool[i])
> - goto exit;
> + goto err_mux_bulk_rx;
> }
> hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
> if (!hso_net->mux_bulk_tx_urb)
> - goto exit;
> + goto err_mux_bulk_rx;
> hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
> if (!hso_net->mux_bulk_tx_buf)
> - goto exit;
> + goto err_mux_bulk_tx;
>
> add_net_device(hso_dev);
>
> @@ -2542,7 +2542,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
> result = register_netdev(net);
> if (result) {
> dev_err(&interface->dev, "Failed to register device\n");
> - goto exit;
> + goto err_register;
> }
>
> hso_log_port(hso_dev);
> @@ -2550,8 +2550,21 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
> hso_create_rfkill(hso_dev, interface);
>
> return hso_dev;
> -exit:
> - hso_free_net_device(hso_dev, true);
> +
> +err_register:
> + remove_net_device(hso_dev);
> + kfree(hso_net->mux_bulk_tx_buf);
> +err_mux_bulk_tx:
> + usb_free_urb(hso_net->mux_bulk_tx_urb);
> +err_mux_bulk_rx:
> + for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
> + usb_free_urb(hso_net->mux_bulk_rx_urb_pool[i]);
> + kfree(hso_net->mux_bulk_rx_buf_pool[i]);
> + }
> +err_net:
> + free_netdev(net);
> +err_hso_dev:
> + kfree(hso_dev);
> return NULL;
> }
>
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-07-14 8:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 8:11 [PATCH 1/2] usb: hso: fix error handling code of hso_create_net_device Dongliang Mu
2021-07-14 8:14 ` Dongliang Mu [this message]
2021-07-14 8:30 ` Dan Carpenter
-- strict thread matches above, loose matches on Subject: below --
2021-07-14 7:15 Dongliang Mu
2021-07-14 7:22 ` Dongliang Mu
2021-07-14 7:36 ` Dan Carpenter
2021-07-14 7:59 ` Dongliang Mu
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=CAD-N9QXRRipmyOiUFDx9OdM47c37Y+oAa+T-ntZAGZXrd8MTrA@mail.gmail.com \
--to=mudongliangabcd@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kernel@esmil.dk \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mail@anirudhrb.com \
--cc=netdev@vger.kernel.org \
--cc=oneukum@suse.com \
--cc=syzbot+44d53c7255bb1aea22d2@syzkaller.appspotmail.com \
--cc=yuehaibing@huawei.com \
--cc=zhengyongjun3@huawei.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).