From: Dan Carpenter <dan.carpenter@oracle.com>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] USB: serial: mos7720: Fix error code in mos7720_write()
Date: Thu, 28 Jan 2021 09:35:23 +0000 [thread overview]
Message-ID: <YBKFW60qMJbtjvum@mwanda> (raw)
This code should return -ENOMEM if the kmalloc() fails but instead
it returns success.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
The first error path is probably wrong as well?
drivers/usb/serial/mos7720.c
1077 /* try to find a free urb in the list */
1078 urb = NULL;
1079
1080 for (i = 0; i < NUM_URBS; ++i) {
1081 if (mos7720_port->write_urb_pool[i] &&
1082 mos7720_port->write_urb_pool[i]->status != -EINPROGRESS) {
1083 urb = mos7720_port->write_urb_pool[i];
1084 dev_dbg(&port->dev, "URB:%d\n", i);
1085 break;
1086 }
1087 }
1088
1089 if (urb = NULL) {
1090 dev_dbg(&port->dev, "%s - no more free urbs\n", __func__);
1091 goto exit;
Should return -ENODEV?
1092 }
drivers/usb/serial/mos7720.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index ed347a6d50ba..aa55169796a3 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1094,8 +1094,10 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
if (urb->transfer_buffer = NULL) {
urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
GFP_ATOMIC);
- if (!urb->transfer_buffer)
+ if (!urb->transfer_buffer) {
+ bytes_sent = -ENOMEM;
goto exit;
+ }
}
transfer_size = min(count, URB_TRANSFER_BUFFER_SIZE);
--
2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] USB: serial: mos7720: Fix error code in mos7720_write()
Date: Thu, 28 Jan 2021 12:35:23 +0300 [thread overview]
Message-ID: <YBKFW60qMJbtjvum@mwanda> (raw)
This code should return -ENOMEM if the kmalloc() fails but instead
it returns success.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
The first error path is probably wrong as well?
drivers/usb/serial/mos7720.c
1077 /* try to find a free urb in the list */
1078 urb = NULL;
1079
1080 for (i = 0; i < NUM_URBS; ++i) {
1081 if (mos7720_port->write_urb_pool[i] &&
1082 mos7720_port->write_urb_pool[i]->status != -EINPROGRESS) {
1083 urb = mos7720_port->write_urb_pool[i];
1084 dev_dbg(&port->dev, "URB:%d\n", i);
1085 break;
1086 }
1087 }
1088
1089 if (urb == NULL) {
1090 dev_dbg(&port->dev, "%s - no more free urbs\n", __func__);
1091 goto exit;
Should return -ENODEV?
1092 }
drivers/usb/serial/mos7720.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index ed347a6d50ba..aa55169796a3 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1094,8 +1094,10 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
if (urb->transfer_buffer == NULL) {
urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
GFP_ATOMIC);
- if (!urb->transfer_buffer)
+ if (!urb->transfer_buffer) {
+ bytes_sent = -ENOMEM;
goto exit;
+ }
}
transfer_size = min(count, URB_TRANSFER_BUFFER_SIZE);
--
2.29.2
next reply other threads:[~2021-01-28 9:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 9:35 Dan Carpenter [this message]
2021-01-28 9:35 ` [PATCH] USB: serial: mos7720: Fix error code in mos7720_write() Dan Carpenter
2021-01-28 9:56 ` Johan Hovold
2021-01-28 9:56 ` Johan Hovold
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=YBKFW60qMJbtjvum@mwanda \
--to=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kernel-janitors@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.