[Bluetooth] Store remote modem status for RFCOMM TTY

[pandora-kernel.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 1163eb2..0133b5e 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -284,8 +284,10 @@ static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr)
 {
        struct ethtool_eeprom eeprom;
        const struct ethtool_ops *ops = dev->ethtool_ops;
+       void __user *userbuf = useraddr + sizeof(eeprom);
+       u32 bytes_remaining;
        u8 *data;
-       int ret;
+       int ret = 0;
 
        if (!ops->get_eeprom || !ops->get_eeprom_len)
                return -EOPNOTSUPP;
@@ -301,26 +303,31 @@ static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr)
        if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
                return -EINVAL;
 
-       data = kmalloc(eeprom.len, GFP_USER);
+       data = kmalloc(PAGE_SIZE, GFP_USER);
        if (!data)
                return -ENOMEM;
 
-       ret = -EFAULT;
-       if (copy_from_user(data, useraddr + sizeof(eeprom), eeprom.len))
-               goto out;
+       bytes_remaining = eeprom.len;
+       while (bytes_remaining > 0) {
+               eeprom.len = min(bytes_remaining, (u32)PAGE_SIZE);
 
-       ret = ops->get_eeprom(dev, &eeprom, data);
-       if (ret)
-               goto out;
+               ret = ops->get_eeprom(dev, &eeprom, data);
+               if (ret)
+                       break;
+               if (copy_to_user(userbuf, data, eeprom.len)) {
+                       ret = -EFAULT;
+                       break;
+               }
+               userbuf += eeprom.len;
+               eeprom.offset += eeprom.len;
+               bytes_remaining -= eeprom.len;
+       }
 
-       ret = -EFAULT;
+       eeprom.len = userbuf - (useraddr + sizeof(eeprom));
+       eeprom.offset -= eeprom.len;
        if (copy_to_user(useraddr, &eeprom, sizeof(eeprom)))
-               goto out;
-       if (copy_to_user(useraddr + sizeof(eeprom), data, eeprom.len))
-               goto out;
-       ret = 0;
+               ret = -EFAULT;
 
- out:
        kfree(data);
        return ret;
 }
@@ -329,8 +336,10 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)
 {
        struct ethtool_eeprom eeprom;
        const struct ethtool_ops *ops = dev->ethtool_ops;
+       void __user *userbuf = useraddr + sizeof(eeprom);
+       u32 bytes_remaining;
        u8 *data;
-       int ret;
+       int ret = 0;
 
        if (!ops->set_eeprom || !ops->get_eeprom_len)
                return -EOPNOTSUPP;
@@ -346,22 +355,26 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)
        if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
                return -EINVAL;
 
-       data = kmalloc(eeprom.len, GFP_USER);
+       data = kmalloc(PAGE_SIZE, GFP_USER);
        if (!data)
                return -ENOMEM;
 
-       ret = -EFAULT;
-       if (copy_from_user(data, useraddr + sizeof(eeprom), eeprom.len))
-               goto out;
-
-       ret = ops->set_eeprom(dev, &eeprom, data);
-       if (ret)
-               goto out;
+       bytes_remaining = eeprom.len;
+       while (bytes_remaining > 0) {
+               eeprom.len = min(bytes_remaining, (u32)PAGE_SIZE);
 
-       if (copy_to_user(useraddr + sizeof(eeprom), data, eeprom.len))
-               ret = -EFAULT;
+               if (copy_from_user(data, userbuf, eeprom.len)) {
+                       ret = -EFAULT;
+                       break;
+               }
+               ret = ops->set_eeprom(dev, &eeprom, data);
+               if (ret)
+                       break;
+               userbuf += eeprom.len;
+               eeprom.offset += eeprom.len;
+               bytes_remaining -= eeprom.len;
+       }
 
- out:
        kfree(data);
        return ret;
 }