lkml.org 
[lkml]   [2015]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
From
Subject[PATCH V3 1/8] staging: rtl8712: fix buggy size calculation
Date
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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)

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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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
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 V3 1/8] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 21:41:10 -0700
Message-Id: <305999598d7738feabdc8e5df5400b3e7be7f5ed.1438057939.git.stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438057939.git.stillcompiling@gmail.com>
References: <cover.1438057939.git.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>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
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


\
 
 \ /
  Last update: 2015-07-28 07:21    [W:0.421 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site