From: Changming <charley.ashbringer@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, thomas@winischhofer.net,
Changming Liu <liu.changm@northeastern.edu>
Subject: [PATCH 2/6] USB: sisusbvga: change sisusb_write_mem_bulk
Date: Fri, 29 May 2020 21:48:16 -0400 [thread overview]
Message-ID: <20200530014820.9967-3-liu.changm@northeastern.edu> (raw)
In-Reply-To: <20200530014820.9967-1-liu.changm@northeastern.edu>
From: Changming Liu <liu.changm@northeastern.edu>
isusb_write_mem_bulk calls sisusb_send_bulk_msg and
is called by sisusb_write.
Changed their parameters accordingly.
Also change the local buf[4] of sisusb_write_mem_bulk
to u8. This fixed a potential undefined behavior.
Signed-off-by: Changming Liu <liu.changm@northeastern.edu>
---
drivers/usb/misc/sisusbvga/sisusb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 88c4975e303d..f800a9c7feec 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -327,7 +327,7 @@ static int sisusb_bulkin_msg(struct sisusb_usb_data *sisusb,
*/
static int sisusb_send_bulk_msg(struct sisusb_usb_data *sisusb, int ep, int len,
- char *kernbuffer, const char __user *userbuffer, int index,
+ u8 *kernbuffer, const u8 __user *userbuffer, int index,
ssize_t *bytes_written, unsigned int tflags, int async)
{
int result = 0, retry, count = len;
@@ -543,7 +543,7 @@ static int sisusb_send_packet(struct sisusb_usb_data *sisusb, int len,
/* 1. send the packet */
ret = sisusb_send_bulk_msg(sisusb, SISUSB_EP_GFX_OUT, len,
- (char *)packet, NULL, 0, &bytes_transferred, 0, 0);
+ (u8 *)packet, NULL, 0, &bytes_transferred, 0, 0);
if ((ret == 0) && (len == 6)) {
@@ -579,7 +579,7 @@ static int sisusb_send_bridge_packet(struct sisusb_usb_data *sisusb, int len,
/* 1. send the packet */
ret = sisusb_send_bulk_msg(sisusb, SISUSB_EP_BRIDGE_OUT, len,
- (char *)packet, NULL, 0, &bytes_transferred, tflags, 0);
+ (u8 *)packet, NULL, 0, &bytes_transferred, tflags, 0);
if ((ret == 0) && (len == 6)) {
@@ -752,7 +752,7 @@ static int sisusb_write_memio_long(struct sisusb_usb_data *sisusb, int type,
*/
static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr,
- char *kernbuffer, int length, const char __user *userbuffer,
+ u8 *kernbuffer, int length, const u8 __user *userbuffer,
int index, ssize_t *bytes_written)
{
struct sisusb_packet packet;
@@ -761,7 +761,7 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr,
u8 swap8, fromkern = kernbuffer ? 1 : 0;
u16 swap16;
u32 swap32, flag = (length >> 28) & 1;
- char buf[4];
+ u8 buf[4];
/* if neither kernbuffer not userbuffer are given, assume
* data in obuf
@@ -2615,7 +2615,7 @@ static ssize_t sisusb_read(struct file *file, char __user *buffer,
return errno ? errno : bytes_read;
}
-static ssize_t sisusb_write(struct file *file, const char __user *buffer,
+static ssize_t sisusb_write(struct file *file, const u8 __user *buffer,
size_t count, loff_t *ppos)
{
struct sisusb_usb_data *sisusb;
--
2.17.1
next prev parent reply other threads:[~2020-05-30 1:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-30 1:48 [PATCH 0/6] USB: sisusbvga: series of changes char to u8 Changming
2020-05-30 1:48 ` [PATCH 1/6] USB: sisusbvga: change char to u8 for sisusb_copy_memory Changming
2020-05-30 1:48 ` Changming [this message]
2020-05-31 21:14 ` [PATCH 2/6] USB: sisusbvga: change sisusb_write_mem_bulk kbuild test robot
2020-05-31 21:14 ` kbuild test robot
2020-05-31 21:35 ` kbuild test robot
2020-05-31 21:35 ` kbuild test robot
2020-05-31 21:37 ` kbuild test robot
2020-05-31 21:37 ` kbuild test robot
2020-05-30 1:48 ` [PATCH 3/6] USB: sisusbvga: change sisusb->ibuf,obuf,font_backup Changming
2020-05-30 1:48 ` [PATCH 4/6] USB: sisusbvga: change userbuffer for sisusb_recv_bulk_msg to u8 Changming
2020-05-30 1:48 ` [PATCH 5/6] USB: sisusbvga: change sisusb_read_mem_bulk Changming
2020-05-31 22:26 ` kbuild test robot
2020-05-31 22:26 ` kbuild test robot
2020-05-31 22:43 ` kbuild test robot
2020-05-31 22:43 ` kbuild test robot
2020-05-31 22:47 ` kbuild test robot
2020-05-31 22:47 ` kbuild test robot
2020-05-30 1:48 ` [PATCH 6/6] USB: sisusbvga: change the local char array to u8 array Changming
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=20200530014820.9967-3-liu.changm@northeastern.edu \
--to=charley.ashbringer@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=liu.changm@northeastern.edu \
--cc=thomas@winischhofer.net \
/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.