122-cp_linux-fix-compilation-warning.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. --- a/src/drv_mei_cpe_linux.c
  2. +++ b/src/drv_mei_cpe_linux.c
  3. @@ -1267,7 +1267,9 @@ static long MEI_Ioctl( struct file *filp
  4. MEI_IOCTL_RETURN:
  5. local_args.drv_ioctl.retCode = ret;
  6. - copy_to_user( ((IOCTL_MEI_arg_t *)nArgument), &local_args, retSize);
  7. + if (copy_to_user( ((IOCTL_MEI_arg_t *)nArgument), &local_args, retSize))
  8. + PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
  9. + ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
  10. return (ret < 0) ? -1 : 0;
  11. }
  12. @@ -3571,9 +3573,11 @@ static int MEI_IoctlMeiDbgAccessWr_Wrap(
  13. ret = MEI_IoctlMeiDbgAccessWr( pMeiDynCntrl, pLocalArgument);
  14. /* return arguments - count */
  15. - copy_to_user( (void *)&pUserArgument->count,
  16. + if (copy_to_user( (void *)&pUserArgument->count,
  17. (void *)&pLocalArgument->count,
  18. - sizeof(pUserArgument->count) ) ;
  19. + sizeof(pUserArgument->count) ))
  20. + PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
  21. + ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
  22. return ret;
  23. }
  24. @@ -3600,16 +3604,20 @@ static int MEI_IoctlMeiDbgAccessRd_Wrap(
  25. if ( pLocalArgument->count )
  26. {
  27. /* return the buffer */
  28. - copy_to_user( pUserBuf,
  29. + if (copy_to_user( pUserBuf,
  30. pLocalArgument->pData_32,
  31. - pLocalArgument->count * sizeof(IFX_uint32_t) ) ;
  32. + pLocalArgument->count * sizeof(IFX_uint32_t) ))
  33. + PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
  34. + ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
  35. }
  36. /* return count argument */
  37. - copy_to_user( (void *)&pUserArgument->count,
  38. + if (copy_to_user( (void *)&pUserArgument->count,
  39. (void *)&pLocalArgument->count,
  40. - sizeof(pUserArgument->count) ) ;
  41. + sizeof(pUserArgument->count) ))
  42. + PRN_ERR_USR_NL( MEI_DRV, MEI_DRV_PRN_LEVEL_ERR,
  43. + ("MEI_DRV[??] Error ioctl - copy_to_user failed!" MEI_DRV_CRLF));
  44. return ret;
  45. }