* [patch 1/3] brcmfmac: cleanup casts in brcmf_c_mkiovar_bsscfg()
@ 2012-10-03 6:05 Dan Carpenter
2012-10-03 7:07 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-10-03 6:05 UTC (permalink / raw)
To: Brett Rudley
Cc: Roland Vossen, Arend van Spriel, Franky (Zhenhui) Lin, Kan Yan,
John W. Linville, Pieter-Paul Giesberts, Alwin Beukers,
linux-wireless, brcm80211-dev-list, kernel-janitors
Remove some pointless casts from the return value of strlen(). The
"buflen" variable is already an unsigned int so it's never less than
zero and doesn't need to be casted to u32.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 15c5db5..ae0978c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -102,11 +102,11 @@ brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen,
if (bssidx == 0)
return brcmf_c_mkiovar(name, data, datalen, buf, buflen);
- prefixlen = (u32) strlen(prefix); /* lengh of bsscfg prefix */
- namelen = (u32) strlen(name) + 1; /* lengh of iovar name + null */
+ prefixlen = strlen(prefix); /* lengh of bsscfg prefix */
+ namelen = strlen(name) + 1; /* lengh of iovar name + null */
iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen;
- if (buflen < 0 || iolen > (u32)buflen) {
+ if (buflen < iolen) {
brcmf_dbg(ERROR, "buffer is too short\n");
return 0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [patch 1/3] brcmfmac: cleanup casts in brcmf_c_mkiovar_bsscfg()
2012-10-03 6:05 [patch 1/3] brcmfmac: cleanup casts in brcmf_c_mkiovar_bsscfg() Dan Carpenter
@ 2012-10-03 7:07 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2012-10-03 7:07 UTC (permalink / raw)
To: Dan Carpenter
Cc: Brett Rudley, Roland Vossen, Franky (Zhenhui) Lin, Kan Yan,
John W. Linville, Pieter-Paul Giesberts, Alwin Beukers,
linux-wireless, brcm80211-dev-list, kernel-janitors
On 10/03/2012 08:05 AM, Dan Carpenter wrote:
> Remove some pointless casts from the return value of strlen(). The
> "buflen" variable is already an unsigned int so it's never less than
> zero and doesn't need to be casted to u32.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> index 15c5db5..ae0978c 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> @@ -102,11 +102,11 @@ brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen,
Internally we reworked this code and moved the function to another file.
The casts are no longer there.
> if (bssidx == 0)
> return brcmf_c_mkiovar(name, data, datalen, buf, buflen);
>
> - prefixlen = (u32) strlen(prefix); /* lengh of bsscfg prefix */
> - namelen = (u32) strlen(name) + 1; /* lengh of iovar name + null */
> + prefixlen = strlen(prefix); /* lengh of bsscfg prefix */
> + namelen = strlen(name) + 1; /* lengh of iovar name + null */
> iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen;
>
> - if (buflen < 0 || iolen > (u32)buflen) {
> + if (buflen < iolen) {
This is still wrong internally so we will fix this with the appropriate
credits ;-)
> brcmf_dbg(ERROR, "buffer is too short\n");
> return 0;
> }
>
Thanks.
Gr. AvS
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-03 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-03 6:05 [patch 1/3] brcmfmac: cleanup casts in brcmf_c_mkiovar_bsscfg() Dan Carpenter
2012-10-03 7:07 ` Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).