5 files changed, 28 insertions, 31 deletions

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 99a642d2a1fe..1849b176cf18 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -172,7 +172,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
         input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);
         input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);
         input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
-        input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
+        input_set_abs_params(input_dev, ABS_HAT0Y, -1, 1, 0, 0);
 
         serio_set_drvdata(serio, warrior);
 
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index a248664b5d1d..fd48e74e78ed 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -159,7 +159,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
         input_dev->mscbit[0] |= BIT(MSC_SERIAL);
         input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
-        input_set_abs_params(input_dev, ABS_X, 0, 0x1750, 4, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index aea1cfae34cc..dc099bbe12bf 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -854,7 +854,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
-        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->y_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->x_max, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, wacom->features->y_max, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
 
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index b638fb500743..72b431d0a0a4 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -54,6 +54,18 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes,
         ssize_t n, count;
         char    *start;
         struct proc_dir_entry * dp;
+        unsigned long long pos;
+
+        /*
+         * Gaah, please just use "seq_file" instead. The legacy /proc
+         * interfaces cut loff_t down to off_t for reads, and ignore
+         * the offset entirely for writes..
+         */
+        pos = *ppos;
+        if (pos > MAX_NON_LFS)
+                return 0;
+        if (nbytes > MAX_NON_LFS - pos)
+                nbytes = MAX_NON_LFS - pos;
 
         dp = PDE(inode);
         if (!(page = (char*) __get_free_page(GFP_KERNEL)))
@@ -202,30 +214,17 @@ proc_file_write(struct file *file, const char __user *buffer,
 static loff_t
 proc_file_lseek(struct file *file, loff_t offset, int orig)
 {
-    lock_kernel();
-
-    switch (orig) {
-    case 0:
-        if (offset < 0)
-            goto out;
-        file->f_pos = offset;
-        unlock_kernel();
-        return(file->f_pos);
-    case 1:
-        if (offset + file->f_pos < 0)
-            goto out;
-        file->f_pos += offset;
-        unlock_kernel();
-        return(file->f_pos);
-    case 2:
-        goto out;
-    default:
-        goto out;
-    }
-
-out:
-    unlock_kernel();
-    return -EINVAL;
+        loff_t retval = -EINVAL;
+        switch (orig) {
+        case 1:
+                offset += file->f_pos;
+        /* fallthrough */
+        case 0:
+                if (offset < 0 || offset > MAX_NON_LFS)
+                        break;
+                file->f_pos = retval = offset;
+        }
+        return retval;
 }
 
 static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9990e10192e8..e5102ea6e104 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2201,14 +2201,12 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                 if (get_user(len, oldlenp))
                         return -EFAULT;
                 if (len) {
-                        l = strlen(table->data);
+                        l = strlen(table->data)+1;
                         if (len > l) len = l;
                         if (len >= table->maxlen)
                                 len = table->maxlen;
                         if(copy_to_user(oldval, table->data, len))
                                 return -EFAULT;
-                        if(put_user(0, ((char __user *) oldval) + len))
-                                return -EFAULT;
                         if(put_user(len, oldlenp))
                                 return -EFAULT;
                 }
@@ -2223,7 +2221,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                         len--;
                 ((char *) table->data)[len] = 0;
         }
-        return 0;
+        return 1;
 }
 
 /*