Changeset 3438

Timestamp:

01/24/00 22:41:19 (13 years ago)

Author:

frodo

Message:

Russell King's warnings about faults integrated

Location:

i2c/trunk/kernel

Files:

• i2c-core.c (modified) (1 diff)
• i2c-dev.c (modified) (2 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -500 +500 @@
                                         if (len < 0) 
                                                 len = 0;
-                                        copy_to_user (buf,kbuf+file->f_pos,len);
+                                        if (copy_to_user (buf,kbuf+file->f_pos,
+                                            len)) {
+                                                kfree(kbuf);
+                                                return -EFAULT;
+                                        }
                                         file->f_pos += len;
                                         kfree(kbuf);

i2c/trunk/kernel/i2c-dev.c

@@ -149 +149 @@
         ret = i2c_master_recv(client,tmp,count);
         if (! ret)
-                copy_to_user(buf,tmp,count);
+                ret = copy_to_user(buf,tmp,count)?-EFAULT:0;
         kfree(tmp);
         return ret;
@@ -169 +169 @@
         if (tmp==NULL)
                 return -ENOMEM;
-        copy_from_user(tmp,buf,count);
+        if (copy_from_user(tmp,buf,count)) {
+                kfree(tmp);
+                return -EFAULT;
+        }
 
 #ifdef DEBUG