* [PATCH] wcn36xx: use struct_size over open coded arithmetic
@ 2022-01-28 8:04 cgel.zte
2022-01-28 11:38 ` kernel test robot
0 siblings, 1 reply; 2+ messages in thread
From: cgel.zte @ 2022-01-28 8:04 UTC (permalink / raw)
To: kvalo
Cc: davem, kuba, wcn36xx, linux-wireless, netdev, linux-kernel,
Minghao Chi, Zeal Robot
From: Minghao Chi (CGEL ZTE) <chi.minghao@zte.com.cn>
Replace zero-length array with flexible-array member and make use
of the struct_size() helper in kmalloc(). For example:
struct wcn36xx_hal_ind_msg {
struct list_head list;
size_t msg_len;
u8 msg[];
};
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi (CGEL ZTE) <chi.minghao@zte.com.cn>
---
drivers/net/wireless/ath/wcn36xx/smd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index caeb68901326..16036881542f 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -3347,7 +3347,7 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,
case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:
case WCN36XX_HAL_PRINT_REG_INFO_IND:
case WCN36XX_HAL_SCAN_OFFLOAD_IND:
- msg_ind = kmalloc(sizeof(*msg_ind) + len, GFP_ATOMIC);
+ msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
if (!msg_ind) {
wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",
msg_header->msg_type);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] wcn36xx: use struct_size over open coded arithmetic
2022-01-28 8:04 [PATCH] wcn36xx: use struct_size over open coded arithmetic cgel.zte
@ 2022-01-28 11:38 ` kernel test robot
0 siblings, 0 replies; 2+ messages in thread
From: kernel test robot @ 2022-01-28 11:38 UTC (permalink / raw)
To: cgel.zte, kvalo
Cc: kbuild-all, davem, kuba, wcn36xx, linux-wireless, netdev,
linux-kernel, Minghao Chi, Zeal Robot
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kvalo-wireless-drivers-next/master]
[also build test ERROR on kvalo-wireless-drivers/master v5.17-rc1 next-20220128]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/cgel-zte-gmail-com/wcn36xx-use-struct_size-over-open-coded-arithmetic/20220128-160610
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: arm-randconfig-c002-20220124 (https://download.01.org/0day-ci/archive/20220128/202201281936.Qhf4hXej-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/b6c0d24562c28f1e9a037c1aa7818c76854559e4
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review cgel-zte-gmail-com/wcn36xx-use-struct_size-over-open-coded-arithmetic/20220128-160610
git checkout b6c0d24562c28f1e9a037c1aa7818c76854559e4
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash drivers/firewire/ drivers/net/wireless/ath/wcn36xx/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from include/linux/mm.h:30,
from arch/arm/include/asm/cacheflush.h:10,
from include/linux/cacheflush.h:5,
from include/linux/highmem.h:8,
from include/linux/bvec.h:10,
from include/linux/skbuff.h:17,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/wireless/ath/wcn36xx/smd.c:20:
drivers/net/wireless/ath/wcn36xx/smd.c: In function 'wcn36xx_smd_rsp_process':
>> include/linux/overflow.h:194:32: error: invalid type argument of '->' (have 'struct wcn36xx_hal_ind_msg')
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~
drivers/net/wireless/ath/wcn36xx/smd.c:3350:35: note: in expansion of macro 'struct_size'
3350 | msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
| ^~~~~~~~~~~
In file included from include/linux/bitfield.h:10,
from drivers/net/wireless/ath/wcn36xx/smd.c:19:
include/linux/overflow.h:194:63: error: invalid type argument of '->' (have 'struct wcn36xx_hal_ind_msg')
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~
include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:258:51: note: in expansion of macro '__same_type'
258 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~
include/linux/overflow.h:194:44: note: in expansion of macro '__must_be_array'
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~~~~~~~~~~~~~~
drivers/net/wireless/ath/wcn36xx/smd.c:3350:35: note: in expansion of macro 'struct_size'
3350 | msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
| ^~~~~~~~~~~
include/linux/overflow.h:194:63: error: invalid type argument of '->' (have 'struct wcn36xx_hal_ind_msg')
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~
include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:258:51: note: in expansion of macro '__same_type'
258 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~
include/linux/overflow.h:194:44: note: in expansion of macro '__must_be_array'
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~~~~~~~~~~~~~~
drivers/net/wireless/ath/wcn36xx/smd.c:3350:35: note: in expansion of macro 'struct_size'
3350 | msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
| ^~~~~~~~~~~
include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:258:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
258 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~~~~~~~
include/linux/overflow.h:194:44: note: in expansion of macro '__must_be_array'
194 | sizeof(*(p)->member) + __must_be_array((p)->member),\
| ^~~~~~~~~~~~~~~
drivers/net/wireless/ath/wcn36xx/smd.c:3350:35: note: in expansion of macro 'struct_size'
3350 | msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
| ^~~~~~~~~~~
In file included from include/linux/mm.h:30,
from arch/arm/include/asm/cacheflush.h:10,
from include/linux/cacheflush.h:5,
from include/linux/highmem.h:8,
from include/linux/bvec.h:10,
from include/linux/skbuff.h:17,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/wireless/ath/wcn36xx/smd.c:20:
>> include/linux/overflow.h:195:28: error: invalid type argument of unary '*' (have 'struct wcn36xx_hal_ind_msg')
195 | sizeof(*(p)))
| ^~~~
drivers/net/wireless/ath/wcn36xx/smd.c:3350:35: note: in expansion of macro 'struct_size'
3350 | msg_ind = kmalloc(struct_size(*msg_ind, msg, len), GFP_ATOMIC);
| ^~~~~~~~~~~
vim +194 include/linux/overflow.h
610b15c50e86eb Kees Cook 2018-05-07 180
610b15c50e86eb Kees Cook 2018-05-07 181 /**
610b15c50e86eb Kees Cook 2018-05-07 182 * struct_size() - Calculate size of structure with trailing array.
610b15c50e86eb Kees Cook 2018-05-07 183 * @p: Pointer to the structure.
610b15c50e86eb Kees Cook 2018-05-07 184 * @member: Name of the array member.
b19d57d0f3cc6f Gustavo A. R. Silva 2020-06-08 185 * @count: Number of elements in the array.
610b15c50e86eb Kees Cook 2018-05-07 186 *
610b15c50e86eb Kees Cook 2018-05-07 187 * Calculates size of memory needed for structure @p followed by an
b19d57d0f3cc6f Gustavo A. R. Silva 2020-06-08 188 * array of @count number of @member elements.
610b15c50e86eb Kees Cook 2018-05-07 189 *
610b15c50e86eb Kees Cook 2018-05-07 190 * Return: number of bytes needed or SIZE_MAX on overflow.
610b15c50e86eb Kees Cook 2018-05-07 191 */
b19d57d0f3cc6f Gustavo A. R. Silva 2020-06-08 192 #define struct_size(p, member, count) \
b19d57d0f3cc6f Gustavo A. R. Silva 2020-06-08 193 __ab_c_size(count, \
610b15c50e86eb Kees Cook 2018-05-07 @194 sizeof(*(p)->member) + __must_be_array((p)->member),\
610b15c50e86eb Kees Cook 2018-05-07 @195 sizeof(*(p)))
610b15c50e86eb Kees Cook 2018-05-07 196
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-28 11:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-28 8:04 [PATCH] wcn36xx: use struct_size over open coded arithmetic cgel.zte
2022-01-28 11:38 ` kernel test robot
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).