malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cfg80211: Use const more consistently in for_each_element macros

Browse Source 
commit 7388afe09143210f555bdd6c75035e9acc1fab96 upstream.

Enforce the first argument to be a correct type of a pointer to struct
element and avoid unnecessary typecasts from const to non-const pointers
(the change in validate_ie_attr() is needed to make this part work). In
addition, avoid signed/unsigned comparison within for_each_element() and
mark struct element packed just in case.

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jouni Malinen 2019-02-11 16:29:04 +02:00 committed by Greg Kroah-Hartman
parent 1b1e2db029
commit cd813e524a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/linux/ieee80211.h
View File

@ -2747,16 +2747,16 @@ struct element {
u8 id;
u8 datalen;
u8 data[];
};
} __packed;
/* element iteration helpers */
#define for_each_element(element, _data, _datalen) \
for (element = (void *)(_data); \
(u8 *)(_data) + (_datalen) - (u8 *)element >= \
sizeof(*element) && \
(u8 *)(_data) + (_datalen) - (u8 *)element >= \
sizeof(*element) + element->datalen; \
element = (void *)(element->data + element->datalen))
#define for_each_element(_elem, _data, _datalen) \
for (_elem = (const struct element *)(_data); \
(const u8 *)(_data) + (_datalen) - (const u8 *)_elem >= \
(int)sizeof(*_elem) && \
(const u8 *)(_data) + (_datalen) - (const u8 *)_elem >= \
(int)sizeof(*_elem) + _elem->datalen; \
_elem = (const struct element *)(_elem->data + _elem->datalen))
#define for_each_element_id(element, _id, data, datalen) \
for_each_element(element, data, datalen) \
@ -2793,7 +2793,7 @@ struct element {
static inline bool for_each_element_completed(const struct element *element,
const void *data, size_t datalen)
{
return (u8 *)element == (u8 *)data + datalen;
return (const u8 *)element == (const u8 *)data + datalen;
}
#endif /* LINUX_IEEE80211_H */