Staging: intel_sst: return -EFAULT if copy_to_user() fails
authorDan Carpenter <error27@gmail.com>
Fri, 15 Oct 2010 03:44:07 +0000 (05:44 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 15 Oct 2010 22:41:36 +0000 (15:41 -0700)
copy_to_user() returns the number of bytes remaining to be copied but we
want to return an error code.  And that error code is -EFAULT not -EIO.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/intel_sst/intel_sst_app_interface.c

index 1429386a1c67392b74be2399368720577a90716d..b92ce377b1023aaab321e8fddd2c9bc0d5e70614 100644 (file)
@@ -861,6 +861,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                                str_info->src = SST_DRV;
                                retval = copy_to_user(&str_param->stream_id,
                                                &retval, sizeof(__u32));
+                               if (retval)
+                                       retval = -EFAULT;
                        } else {
                                if (retval == -SST_ERR_INVALID_PARAMS)
                                        retval = -EINVAL;
@@ -934,7 +936,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                retval = copy_to_user((struct snd_sst_vol *)arg,
                                                &get_vol, sizeof(get_vol));
                if (retval) {
-                       retval = -EIO;
+                       retval = -EFAULT;
                        break;
                }
                /*sst_print_get_vol_info(str_id, &get_vol);*/