Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[karo-tx-linux.git] / sound / pci / asihpi / hpioctl.c

diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 7396ac54e99f552d303a3d2ab3964f52debdd0bc..62895a719fcbcce841b05f44fce0a90813d70477 100644 (file)
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -121,11 +121,17 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg;
 
        /* Read the message and response pointers from user space.  */
-       get_user(puhm, &phpi_ioctl_data->phm);
-       get_user(puhr, &phpi_ioctl_data->phr);
+       if (get_user(puhm, &phpi_ioctl_data->phm) ||
+           get_user(puhr, &phpi_ioctl_data->phr)) {
+               err = -EFAULT;
+               goto out;
+       }
 
        /* Now read the message size and data from user space.  */
-       get_user(hm->h.size, (u16 __user *)puhm);
+       if (get_user(hm->h.size, (u16 __user *)puhm)) {
+               err = -EFAULT;
+               goto out;
+       }
        if (hm->h.size > sizeof(*hm))
                hm->h.size = sizeof(*hm);
 
@@ -138,7 +144,10 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                goto out;
        }
 
-       get_user(res_max_size, (u16 __user *)puhr);
+       if (get_user(res_max_size, (u16 __user *)puhr)) {
+               err = -EFAULT;
+               goto out;
+       }
        /* printk(KERN_INFO "user response size %d\n", res_max_size); */
        if (res_max_size < sizeof(struct hpi_response_header)) {
                HPI_DEBUG_LOG(WARNING, "small res size %d\n", res_max_size);
@@ -464,9 +473,7 @@ void __init asihpi_init(void)
 
        memset(adapters, 0, sizeof(adapters));
 
-       printk(KERN_INFO "ASIHPI driver %d.%02d.%02d\n",
-               HPI_VER_MAJOR(HPI_VER), HPI_VER_MINOR(HPI_VER),
-               HPI_VER_RELEASE(HPI_VER));
+       printk(KERN_INFO "ASIHPI driver " HPI_VER_STRING "\n");
 
        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                HPI_SUBSYS_DRIVER_LOAD);