aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/122-cp_linux-fix-compilation-warning.patch
blob: 63a530b6c516cc354d0d868668a2178e8982750c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
--- 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;
 }