From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:17:14 -0700 [thread overview]
Message-ID: <1438006639-9015-2-git-send-email-stillcompiling@gmail.com> (raw)
In-Reply-To: <1438006639-9015-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
next prev parent reply other threads:[~2015-07-27 14:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 14:17 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
2015-07-27 14:17 ` Joshua Clayton [this message]
2015-07-27 14:17 ` [PATCH V2 2/6] staging: rtl8712: simplify size calculation Joshua Clayton
2015-07-27 14:17 ` [PATCH V2 3/6] staging: rtl8712: fix comment Joshua Clayton
-- strict thread matches above, loose matches on Subject: below --
2015-07-27 14:31 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation Joshua Clayton
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=1438006639-9015-2-git-send-email-stillcompiling@gmail.com \
--to=stillcompiling@gmail.com \
--cc=Julia.Lawall@lip6.fr \
--cc=Larry.Finger@lwfinger.net \
--cc=aysemelikeyurtoglu@gmail.com \
--cc=cristina.opriceana@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=daniel.baluta@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=dogukan.ergun@gmail.com \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hamohammed.sa@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mahfouz.saif.elyazal@gmail.com \
--cc=mperepelitsyn@gmail.com \
--cc=nitinkuppelur@gmail.com \
--cc=rickard_strandqvist@spectrumdigital.se \
--cc=sudipm.mukherjee@gmail.com \
--cc=tapaswenipathak@gmail.com \
--cc=vthakkar1994@gmail.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