From: "Mario J. Rugiero" <mrugiero@gmail.com>
To: devel@driverdev.osuosl.org
Cc: mrugiero@gmail.com, gregkh@linuxfoundation.org,
linux-wireless@vger.kernel.org, johnny.kim@atmel.com,
austin.shin@atmel.com, chris.park@atmel.com, tony.cho@atmel.com,
glen.lee@atmel.com, leo.kim@atmel.com
Subject: [PATCH 1/1] staging: Fix bitshifts by wrong offsets in wilc1000/host_interface.c
Date: Tue, 1 Dec 2015 23:49:55 -0300 [thread overview]
Message-ID: <1449024595-20290-1-git-send-email-mrugiero@gmail.com> (raw)
struct set_multicast uses (implicitly) sizeof(bool) to determine how many bytes to copy in
Handle_SetMulticastFilter. Since that is implementation defined, it triggered sparse to
rightfully complain about shifting a bigger value than supported.
Since it was used as if assuming it was 32 bits, I replaced the bool member by a u32.
Also, time_out and buf_size members of ba_session_info are u16, but while copying their
bytes into ptr in Handle_AddBASession shift 16 bits for the second byte instead of 8 bits.
This patch fixes those two issues.
Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0c87f6c..fcfd70a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -142,7 +142,7 @@ struct beacon_attr {
};
struct set_multicast {
- bool enabled;
+ u32 enabled;
u32 cnt;
};
@@ -2752,9 +2752,9 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv,
*ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 1;
*ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->buf_size >> 16) & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->buf_size >> 8) & 0xFF);
*ptr++ = (strHostIfBASessionInfo->time_out & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->time_out >> 16) & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->time_out >> 8) & 0xFF);
*ptr++ = (AddbaTimeout & 0xFF);
*ptr++ = ((AddbaTimeout >> 16) & 0xFF);
*ptr++ = 8;
@@ -2777,7 +2777,7 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv,
*ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 8;
*ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->time_out >> 16) & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->time_out >> 8) & 0xFF);
*ptr++ = 3;
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
--
2.6.2
next reply other threads:[~2015-12-02 2:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 2:49 Mario J. Rugiero [this message]
2015-12-18 22:50 ` [PATCH 1/1] staging: Fix bitshifts by wrong offsets in wilc1000/host_interface.c Greg KH
2015-12-19 1:16 ` Mario J. Rugiero
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=1449024595-20290-1-git-send-email-mrugiero@gmail.com \
--to=mrugiero@gmail.com \
--cc=austin.shin@atmel.com \
--cc=chris.park@atmel.com \
--cc=devel@driverdev.osuosl.org \
--cc=glen.lee@atmel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johnny.kim@atmel.com \
--cc=leo.kim@atmel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=tony.cho@atmel.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).