staging: gasket: avoid copy to user on error in coherent alloc config

gasket_config_coherent_allocator() on error return the error to caller
without copying a possibly-update DMA address back to userspace.

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c
index 1b164ac7a049605670067f1f0fcc9e10132726c4..8cf094b90cdb0748e738aa8e57ee78589f734b53 100644 (file)
--- a/drivers/staging/gasket/gasket_ioctl.c
+++ b/drivers/staging/gasket/gasket_ioctl.c
@@ -441,8 +441,10 @@ static int gasket_config_coherent_allocator(
                        gasket_dev, ibuf.size, &ibuf.dma_address,
                        ibuf.page_table_index);
        }
+       if (ret)
+               return ret;
        if (copy_to_user(argp, &ibuf, sizeof(ibuf)))
                return -EFAULT;
 
-       return ret;
+       return 0;
 }