From: Nam Cao <namcaov@gmail.com>
To: Johan Hovold <johan@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Nam Cao <namcaov@gmail.com>
Subject: [PATCH] USB: serial: whiteheat: use stack instead of heap memory
Date: Sat, 4 Feb 2023 14:46:51 +0100 [thread overview]
Message-ID: <20230204134651.22569-1-namcaov@gmail.com> (raw)
Some buffers in whiteheat_attach() are small and only used locally. Move
them to the stack to avoid complications with heap memory.
Compile-tested only.
Signed-off-by: Nam Cao <namcaov@gmail.com>
---
drivers/usb/serial/whiteheat.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 7f82d40753ee..4ad8915b536b 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -220,22 +220,16 @@ static int whiteheat_attach(struct usb_serial *serial)
int pipe;
int ret;
int alen;
- __u8 *command;
- __u8 *result;
+ __u8 command[2];
+ __u8 result[sizeof(*hw_info) + 1];
command_port = serial->port[COMMAND_PORT];
pipe = usb_sndbulkpipe(serial->dev,
command_port->bulk_out_endpointAddress);
- command = kmalloc(2, GFP_KERNEL);
- if (!command)
- goto no_command_buffer;
+
command[0] = WHITEHEAT_GET_HW_INFO;
command[1] = 0;
-
- result = kmalloc(sizeof(*hw_info) + 1, GFP_KERNEL);
- if (!result)
- goto no_result_buffer;
/*
* When the module is reloaded the firmware is still there and
* the endpoints are still in the usb core unchanged. This is the
@@ -283,7 +277,7 @@ static int whiteheat_attach(struct usb_serial *serial)
command_info = kmalloc(sizeof(struct whiteheat_command_private),
GFP_KERNEL);
if (!command_info)
- goto no_command_private;
+ return -ENOMEM;
mutex_init(&command_info->mutex);
command_info->port_running = 0;
@@ -291,8 +285,6 @@ static int whiteheat_attach(struct usb_serial *serial)
usb_set_serial_port_data(command_port, command_info);
command_port->write_urb->complete = command_port_write_callback;
command_port->read_urb->complete = command_port_read_callback;
- kfree(result);
- kfree(command);
return 0;
@@ -307,16 +299,7 @@ static int whiteheat_attach(struct usb_serial *serial)
dev_err(&serial->dev->dev,
"%s: please contact support@connecttech.com\n",
serial->type->description);
- kfree(result);
- kfree(command);
return -ENODEV;
-
-no_command_private:
- kfree(result);
-no_result_buffer:
- kfree(command);
-no_command_buffer:
- return -ENOMEM;
}
static void whiteheat_release(struct usb_serial *serial)
--
2.34.1
next reply other threads:[~2023-02-04 13:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-04 13:46 Nam Cao [this message]
2023-02-04 13:55 ` Greg Kroah-Hartman
2023-02-04 14:01 ` Nam Cao
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=20230204134651.22569-1-namcaov@gmail.com \
--to=namcaov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/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
all inboxes | Powered by JetHome®