Skip to contentSkip to conversation

staging: rtl8192u: Remove an unnecessary NULL check

PATCH In review Nathan Chancellor 3 participants 6 messages May 21, 2019 – May 22, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8192u: Remove an unnecessary NULL check

Clang warns:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:47: warning:
address of array 'param->u.wpa_ie.data' will always evaluate to 'true' [-Wpointer-bool-conversion]

            (param->u.wpa_ie.len && !param->u.wpa_ie.data))
                                    ~~~~~~~~~~~~~~~~~^~~~

This was exposed by commit deabe03523a7 ("Staging: rtl8192u: ieee80211:
Use !x in place of NULL comparisons") because we disable the warning that would have pointed out the comparison against NULL is also false:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:46: warning:
comparison of array 'param->u.wpa_ie.data' equal to a null pointer is always false [-Wtautological-pointer-compare]

            (param->u.wpa_ie.len && param->u.wpa_ie.data == NULL))
                                    ~~~~~~~~~~~~~~~~^~~~    ~~~~

Remove it so clang no longer warns.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +1 -2
index f38f9d8b78bb..e0da0900a4f7 100644
@@ -2659,8 +2659,7 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
 {
 	u8 *buf;
 
-	if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
-	    (param->u.wpa_ie.len && !param->u.wpa_ie.data))
+	if (param->u.wpa_ie.len > MAX_WPA_IE_LEN)
 		return -EINVAL;
 
 	if (param->u.wpa_ie.len) {
Signature · 1 line
2.22.0.rc1
#1 lore raw
Quoted 32 lines · Nathan Chancellor

Clang warns:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:47: warning:
address of array 'param->u.wpa_ie.data' will always evaluate to 'true' [-Wpointer-bool-conversion]

            (param->u.wpa_ie.len && !param->u.wpa_ie.data))
                                    ~~~~~~~~~~~~~~~~~^~~~

This was exposed by commit deabe03523a7 ("Staging: rtl8192u: ieee80211:
Use !x in place of NULL comparisons") because we disable the warning that would have pointed out the comparison against NULL is also false:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:46: warning:
comparison of array 'param->u.wpa_ie.data' equal to a null pointer is always false [-Wtautological-pointer-compare]

            (param->u.wpa_ie.len && param->u.wpa_ie.data == NULL))
                                    ~~~~~~~~~~~~~~~~^~~~    ~~~~

Remove it so clang no longer warns.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index f38f9d8b78bb..e0da0900a4f7 100644

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee, · line 2663

Quoted 5 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -2
@@ -2659,8 +2659,7 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
 {
        u8 *buf;
 
-       if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
-           (param->u.wpa_ie.len && !param->u.wpa_ie.data))

Right so, the types in this expression:

param: struct ieee_param*
param->u: *anonymous union*
param->u.wpa_ie: *anonymous struct* param->u.wpa_ie.len: u32
param->u.wpa_ie.data: u8 [0]
as defined in drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295
https://github.com/ClangBuiltLinux/linux/blob/9c7db5004280767566e91a33445bf93aa479ef02/drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295-L322

so this is a tricky case, because in general array members can never themselves be NULL, and usually I trust -Wpointer-bool-conversion, but this is a special case because of the flexible array member:
https://en.wikipedia.org/wiki/Flexible_array_member. (It seems that having the 0 in the length explicitly was pre-c99 GNU extension:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html). I wonder if -Wtautological-pointer-compare applies to Flexible Array Members or not (Richard, do you know)? In general, you'd be setting param->u.wpa_ie to the return value of a dynamic memory allocation, not param->u.wpa_ie.data, so this check is fishy to me.

Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +1 -1
+       if (param->u.wpa_ie.len > MAX_WPA_IE_LEN)
                return -EINVAL;
 
        if (param->u.wpa_ie.len) {
--

2.22.0.rc1

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw

+ Richard for real this time.

Quoted 74 lines · Nick Desaulniers
Quoted 32 lines · Nathan Chancellor

Clang warns:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:47: warning:
address of array 'param->u.wpa_ie.data' will always evaluate to 'true' [-Wpointer-bool-conversion]

            (param->u.wpa_ie.len && !param->u.wpa_ie.data))
                                    ~~~~~~~~~~~~~~~~~^~~~

This was exposed by commit deabe03523a7 ("Staging: rtl8192u: ieee80211:
Use !x in place of NULL comparisons") because we disable the warning that would have pointed out the comparison against NULL is also false:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:46: warning:
comparison of array 'param->u.wpa_ie.data' equal to a null pointer is always false [-Wtautological-pointer-compare]

            (param->u.wpa_ie.len && param->u.wpa_ie.data == NULL))
                                    ~~~~~~~~~~~~~~~~^~~~    ~~~~

Remove it so clang no longer warns.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index f38f9d8b78bb..e0da0900a4f7 100644

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee, · line 2663

Quoted 5 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -2
@@ -2659,8 +2659,7 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
 {
        u8 *buf;
 
-       if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
-           (param->u.wpa_ie.len && !param->u.wpa_ie.data))

Right so, the types in this expression:

param: struct ieee_param*
param->u: *anonymous union*
param->u.wpa_ie: *anonymous struct* param->u.wpa_ie.len: u32
param->u.wpa_ie.data: u8 [0]
as defined in drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295
https://github.com/ClangBuiltLinux/linux/blob/9c7db5004280767566e91a33445bf93aa479ef02/drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295-L322

so this is a tricky case, because in general array members can never themselves be NULL, and usually I trust -Wpointer-bool-conversion, but this is a special case because of the flexible array member:
https://en.wikipedia.org/wiki/Flexible_array_member. (It seems that having the 0 in the length explicitly was pre-c99 GNU extension:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html). I wonder if -Wtautological-pointer-compare applies to Flexible Array Members or not (Richard, do you know)? In general, you'd be setting param->u.wpa_ie to the return value of a dynamic memory allocation, not param->u.wpa_ie.data, so this check is fishy to me.

Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +1 -1
+       if (param->u.wpa_ie.len > MAX_WPA_IE_LEN)
                return -EINVAL;
 
        if (param->u.wpa_ie.len) {
--

2.22.0.rc1

--
Thanks,
~Nick Desaulniers

Signature · 2 lines
Thanks,
~Nick Desaulniers
#3 lore raw
Quoted 13 lines · Nick Desaulniers
Quoted 13 lines

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee, · line 2663

Quoted 2 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -2
-       if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
-           (param->u.wpa_ie.len && !param->u.wpa_ie.data))

Right so, the types in this expression:

param: struct ieee_param*
param->u: *anonymous union*
param->u.wpa_ie: *anonymous struct* param->u.wpa_ie.len: u32
param->u.wpa_ie.data: u8 [0]
as defined in drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295
https://github.com/ClangBuiltLinux/linux/blob/9c7db5004280767566e91a33445bf93aa479ef02/drivers/staging/rtl8192u/ieee80211/ieee80211.h#L295-L322

Quoted 2 lines
Quoted 2 lines

so this is a tricky case, because in general array members can never themselves be NULL,

Unless they array was the first struct member, obviously.

Quoted 2 lines
Quoted 2 lines

and usually I trust -Wpointer-bool-conversion, but
this is a special case because of the flexible array member:

Nah. It's the same thing. That patch is fine.

regards,
dan carpenter

#4 lore raw
In reply to Nathan Chancellor
Quoted 5 lines · Nathan Chancellor

Clang warns:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:47: warning:
address of array 'param->u.wpa_ie.data' will always evaluate to 'true' [-Wpointer-bool-conversion]

Quoted 7 lines
            (param->u.wpa_ie.len && !param->u.wpa_ie.data))
                                    ~~~~~~~~~~~~~~~~~^~~~

This was exposed by commit deabe03523a7 ("Staging: rtl8192u: ieee80211:
Use !x in place of NULL comparisons") because we disable the warning that would have pointed out the comparison against NULL is also false:

Heh. Weird. Why would people disable one and not the other?

regards,
dan carpenter

#5 lore raw
Quoted 14 lines · Dan Carpenter
Quoted 5 lines · Nathan Chancellor

Clang warns:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2663:47: warning:
address of array 'param->u.wpa_ie.data' will always evaluate to 'true' [-Wpointer-bool-conversion]

Quoted 7 lines
            (param->u.wpa_ie.len && !param->u.wpa_ie.data))
                                    ~~~~~~~~~~~~~~~~~^~~~

This was exposed by commit deabe03523a7 ("Staging: rtl8192u: ieee80211:
Use !x in place of NULL comparisons") because we disable the warning that would have pointed out the comparison against NULL is also false:

Quoted 5 lines

Heh. Weird. Why would people disable one and not the other?

regards,
dan carpenter

-Wtautological-compare has a lot of different sub-warnings under it, one of which is the one shown. -Wno-tautological-compare turns off all of those other sub-warnings. The reason that was done is there are quite a few of them:

https://gist.github.com/nathanchance/3336adc6e796b57eadd53b106b96c569

https://clang.llvm.org/docs/DiagnosticsReference.html#wtautological-compare

It is probably worth looking into turning that on, I'm going to try to do that as I have time.

Cheers,
Nathan