mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
717d482cd0
Fix compilation warning in variable length array msg and ret value not
handled.
Fix compilation warning:
/__w/openwrt/openwrt/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_chromium/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_api_intern.c: In function 'MEI_Internal_DumpMessage':
/__w/openwrt/openwrt/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_chromium/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_api_intern.c:441:4: error: ISO C90 forbids variable length array 'msg' [-Werror=vla]
441 | char msg[nMsgSize];
| ^~~~
/__w/openwrt/openwrt/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_chromium/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_api_intern.c:442:4: error: ISO C90 forbids array 'buf' whose size cannot be evaluated [-Werror=vla]
442 | char buf[nBufSize];
| ^~~~
cc1: all warnings being treated as errors
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c: In function 'MEI_Ioctl':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c:1270:4: error: ignoring return value of 'copy_to_user' declared with attribute 'warn_unused_result' [-Werror=unused-result]
1270 | copy_to_user( ((IOCTL_MEI_arg_t *)nArgument), &local_args, retSize);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c: In function 'MEI_IoctlMeiDbgAccessWr_Wrap':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c:3574:4: error: ignoring return value of 'copy_to_user' declared with attribute 'warn_unused_result' [-Werror=unused-result]
3574 | copy_to_user( (void *)&pUserArgument->count,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3575 | (void *)&pLocalArgument->count,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3576 | sizeof(pUserArgument->count) ) ;
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c: In function 'MEI_IoctlMeiDbgAccessRd_Wrap':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c:3603:7: error: ignoring return value of 'copy_to_user' declared with attribute 'warn_unused_result' [-Werror=unused-result]
3603 | copy_to_user( pUserBuf,
| ^~~~~~~~~~~~~~~~~~~~~~~
3604 | pLocalArgument->pData_32,
| ~~~~~~~~~~~~~~~~~~~~~~~~~
3605 | pLocalArgument->count * sizeof(IFX_uint32_t) ) ;
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-arm-openwrt-linux-muslgnueabi_musl/linux-ipq40xx_generic/dsl_cpe_mei-ugw_8.5.2.10/src/drv_mei_cpe_linux.c:3610:4: error: ignoring return value of 'copy_to_user' declared with attribute 'warn_unused_result' [-Werror=unused-result]
3610 | copy_to_user( (void *)&pUserArgument->count,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3611 | (void *)&pLocalArgument->count,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3612 | sizeof(pUserArgument->count) ) ;
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
--- a/src/drv_mei_cpe_linux.c
|
|
+++ b/src/drv_mei_cpe_linux.c
|
|
@@ -1267,7 +1267,9 @@ static long MEI_Ioctl( struct file *filp,
|
|
MEI_IOCTL_RETURN:
|
|
|
|
local_args.drv_ioctl.retCode = ret;
|
|
- copy_to_user( ((IOCTL_MEI_arg_t *)nArgument), &local_args, retSize);
|
|
+ if (copy_to_user( ((IOCTL_MEI_arg_t *)nArgument), &local_args, retSize))
|
|
+ PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
|
|
+ ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
|
|
|
|
return (ret < 0) ? -1 : 0;
|
|
}
|
|
@@ -3571,9 +3573,11 @@ static int MEI_IoctlMeiDbgAccessWr_Wrap(
|
|
ret = MEI_IoctlMeiDbgAccessWr( pMeiDynCntrl, pLocalArgument);
|
|
|
|
/* return arguments - count */
|
|
- copy_to_user( (void *)&pUserArgument->count,
|
|
+ if (copy_to_user( (void *)&pUserArgument->count,
|
|
(void *)&pLocalArgument->count,
|
|
- sizeof(pUserArgument->count) ) ;
|
|
+ sizeof(pUserArgument->count) ))
|
|
+ PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
|
|
+ ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
|
|
|
|
return ret;
|
|
}
|
|
@@ -3600,16 +3604,20 @@ static int MEI_IoctlMeiDbgAccessRd_Wrap(
|
|
if ( pLocalArgument->count )
|
|
{
|
|
/* return the buffer */
|
|
- copy_to_user( pUserBuf,
|
|
+ if (copy_to_user( pUserBuf,
|
|
pLocalArgument->pData_32,
|
|
- pLocalArgument->count * sizeof(IFX_uint32_t) ) ;
|
|
+ pLocalArgument->count * sizeof(IFX_uint32_t) ))
|
|
+ PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
|
|
+ ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
|
|
|
|
}
|
|
|
|
/* return count argument */
|
|
- copy_to_user( (void *)&pUserArgument->count,
|
|
+ if (copy_to_user( (void *)&pUserArgument->count,
|
|
(void *)&pLocalArgument->count,
|
|
- sizeof(pUserArgument->count) ) ;
|
|
+ sizeof(pUserArgument->count) ))
|
|
+ PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
|
|
+ ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
|
|
|
|
return ret;
|
|
}
|